From mboxrd@z Thu Jan 1 00:00:00 1970 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751447AbeABQoc (ORCPT + 1 other); Tue, 2 Jan 2018 11:44:32 -0500 Received: from usa-sjc-mx-foss1.foss.arm.com ([217.140.101.70]:42070 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751128AbeABQo1 (ORCPT ); Tue, 2 Jan 2018 11:44:27 -0500 Subject: Re: [PATCH 31/67] dma-direct: make dma_direct_{alloc, free} available to other implementations To: Christoph Hellwig , iommu@lists.linux-foundation.org Cc: linux-mips@linux-mips.org, linux-ia64@vger.kernel.org, linux-sh@vger.kernel.org, sparclinux@vger.kernel.org, Guan Xuetao , linux-arch@vger.kernel.org, linux-s390@vger.kernel.org, linux-c6x-dev@linux-c6x.org, linux-hexagon@vger.kernel.org, x86@kernel.org, linux-snps-arc@lists.infradead.org, adi-buildroot-devel@lists.sourceforge.net, linux-m68k@lists.linux-m68k.org, patches@groups.riscv.org, linux-metag@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Michal Simek , linux-parisc@vger.kernel.org, linux-cris-kernel@axis.com, linux-kernel@vger.kernel.org, linux-alpha@vger.kernel.org, linuxppc-dev@lists.ozlabs.org References: <20171229081911.2802-1-hch@lst.de> <20171229081911.2802-32-hch@lst.de> From: Vladimir Murzin Message-ID: Date: Tue, 2 Jan 2018 16:44:21 +0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.2.1 MIME-Version: 1.0 In-Reply-To: <20171229081911.2802-32-hch@lst.de> Content-Type: text/plain; charset=utf-8 Content-Language: ru Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Return-Path: On 29/12/17 08:18, Christoph Hellwig wrote: > So that they don't need to indirect through the operation vector. > > Signed-off-by: Christoph Hellwig > --- > arch/arm/mm/dma-mapping-nommu.c | 9 +++------ > include/linux/dma-direct.h | 5 +++++ > lib/dma-direct.c | 6 +++--- > 3 files changed, 11 insertions(+), 9 deletions(-) > > diff --git a/arch/arm/mm/dma-mapping-nommu.c b/arch/arm/mm/dma-mapping-nommu.c > index 49e9831dc0f1..b4cf3e4e9d4a 100644 > --- a/arch/arm/mm/dma-mapping-nommu.c > +++ b/arch/arm/mm/dma-mapping-nommu.c > @@ -11,7 +11,7 @@ > > #include > #include > -#include > +#include > #include > > #include > @@ -39,7 +39,6 @@ static void *arm_nommu_dma_alloc(struct device *dev, size_t size, > unsigned long attrs) > > { > - const struct dma_map_ops *ops = &dma_direct_ops; > void *ret; > > /* > @@ -48,7 +47,7 @@ static void *arm_nommu_dma_alloc(struct device *dev, size_t size, > */ > > if (attrs & DMA_ATTR_NON_CONSISTENT) > - return ops->alloc(dev, size, dma_handle, gfp, attrs); > + return dma_direct_alloc(dev, size, dma_handle, gfp, attrs); > > ret = dma_alloc_from_global_coherent(size, dma_handle); > > @@ -70,10 +69,8 @@ static void arm_nommu_dma_free(struct device *dev, size_t size, > void *cpu_addr, dma_addr_t dma_addr, > unsigned long attrs) > { > - const struct dma_map_ops *ops = &dma_direct_ops; > - > if (attrs & DMA_ATTR_NON_CONSISTENT) { > - ops->free(dev, size, cpu_addr, dma_addr, attrs); > + dma_direct_free(dev, size, cpu_addr, dma_addr, attrs); > } else { > int ret = dma_release_from_global_coherent(get_order(size), > cpu_addr); > diff --git a/include/linux/dma-direct.h b/include/linux/dma-direct.h > index 10e924b7cba7..4788bf0bf683 100644 > --- a/include/linux/dma-direct.h > +++ b/include/linux/dma-direct.h > @@ -38,4 +38,9 @@ static inline void dma_mark_clean(void *addr, size_t size) > } > #endif /* CONFIG_ARCH_HAS_DMA_MARK_CLEAN */ > > +void *dma_direct_alloc(struct device *dev, size_t size, dma_addr_t *dma_handle, > + gfp_t gfp, unsigned long attrs); > +void dma_direct_free(struct device *dev, size_t size, void *cpu_addr, > + dma_addr_t dma_addr, unsigned long attrs); > + > #endif /* _LINUX_DMA_DIRECT_H */ > diff --git a/lib/dma-direct.c b/lib/dma-direct.c > index f8467cb3d89a..7e913728e099 100644 > --- a/lib/dma-direct.c > +++ b/lib/dma-direct.c > @@ -33,8 +33,8 @@ static bool dma_coherent_ok(struct device *dev, phys_addr_t phys, size_t size) > return phys_to_dma(dev, phys) + size <= dev->coherent_dma_mask; > } > > -static void *dma_direct_alloc(struct device *dev, size_t size, > - dma_addr_t *dma_handle, gfp_t gfp, unsigned long attrs) > +void *dma_direct_alloc(struct device *dev, size_t size, dma_addr_t *dma_handle, > + gfp_t gfp, unsigned long attrs) > { > unsigned int count = PAGE_ALIGN(size) >> PAGE_SHIFT; > int page_order = get_order(size); > @@ -71,7 +71,7 @@ static void *dma_direct_alloc(struct device *dev, size_t size, > return page_address(page); > } > > -static void dma_direct_free(struct device *dev, size_t size, void *cpu_addr, > +void dma_direct_free(struct device *dev, size_t size, void *cpu_addr, > dma_addr_t dma_addr, unsigned long attrs) > { > unsigned int count = PAGE_ALIGN(size) >> PAGE_SHIFT; > Reviewed-by: Vladimir Murzin Thanks Vladimir