From mboxrd@z Thu Jan 1 00:00:00 1970 From: Robin Murphy Subject: Re: [PATCH 02/22] arm64: rename swiotlb_dma_ops Date: Wed, 10 Jan 2018 12:13:39 +0000 Message-ID: <4564e50d-7e52-7b72-7c95-d4acda92da0c@arm.com> References: <20180110080932.14157-1-hch@lst.de> <20180110080932.14157-3-hch@lst.de> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii"; Format="flowed" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <20180110080932.14157-3-hch-jcswGhMUV9g@public.gmane.org> Content-Language: en-GB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: iommu-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org Errors-To: iommu-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org To: Christoph Hellwig , iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org Cc: linux-arch-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-mips-6z/3iImG2C8G8FEW9MqTrA@public.gmane.org, Michal Simek , linux-ia64-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, =?UTF-8?Q?Christian_K=c3=b6nig?= , x86-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Konrad Rzeszutek Wilk , Guan Xuetao , linuxppc-dev-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org List-Id: linux-arch.vger.kernel.org On 10/01/18 08:09, Christoph Hellwig wrote: > We'll need that name for a generic implementation soon. Reviewed-by: Robin Murphy > Signed-off-by: Christoph Hellwig > --- > arch/arm64/mm/dma-mapping.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/arm64/mm/dma-mapping.c b/arch/arm64/mm/dma-mapping.c > index f3a637b98487..6840426bbe77 100644 > --- a/arch/arm64/mm/dma-mapping.c > +++ b/arch/arm64/mm/dma-mapping.c > @@ -368,7 +368,7 @@ static int __swiotlb_dma_mapping_error(struct device *hwdev, dma_addr_t addr) > return 0; > } > > -static const struct dma_map_ops swiotlb_dma_ops = { > +static const struct dma_map_ops arm64_swiotlb_dma_ops = { > .alloc = __dma_alloc, > .free = __dma_free, > .mmap = __swiotlb_mmap, > @@ -923,7 +923,7 @@ void arch_setup_dma_ops(struct device *dev, u64 dma_base, u64 size, > const struct iommu_ops *iommu, bool coherent) > { > if (!dev->dma_ops) > - dev->dma_ops = &swiotlb_dma_ops; > + dev->dma_ops = &arm64_swiotlb_dma_ops; > > dev->archdata.dma_coherent = coherent; > __iommu_setup_dma_ops(dev, dma_base, size, iommu); > From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from usa-sjc-mx-foss1.foss.arm.com ([217.140.101.70]:41044 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964994AbeAJMNn (ORCPT ); Wed, 10 Jan 2018 07:13:43 -0500 Subject: Re: [PATCH 02/22] arm64: rename swiotlb_dma_ops References: <20180110080932.14157-1-hch@lst.de> <20180110080932.14157-3-hch@lst.de> From: Robin Murphy Message-ID: <4564e50d-7e52-7b72-7c95-d4acda92da0c@arm.com> Date: Wed, 10 Jan 2018 12:13:39 +0000 MIME-Version: 1.0 In-Reply-To: <20180110080932.14157-3-hch@lst.de> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-GB Content-Transfer-Encoding: 7bit Sender: linux-arch-owner@vger.kernel.org List-ID: To: Christoph Hellwig , iommu@lists.linux-foundation.org Cc: linux-arch@vger.kernel.org, linux-mips@linux-mips.org, Michal Simek , linux-ia64@vger.kernel.org, =?UTF-8?Q?Christian_K=c3=b6nig?= , x86@kernel.org, linux-kernel@vger.kernel.org, Konrad Rzeszutek Wilk , Guan Xuetao , linuxppc-dev@lists.ozlabs.org, linux-arm-kernel@lists.infradead.org Message-ID: <20180110121339.3CvWY7PmiUB6F6j8tp-wRUucLFPj_r1k08Znrm4KWEs@z> On 10/01/18 08:09, Christoph Hellwig wrote: > We'll need that name for a generic implementation soon. Reviewed-by: Robin Murphy > Signed-off-by: Christoph Hellwig > --- > arch/arm64/mm/dma-mapping.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/arm64/mm/dma-mapping.c b/arch/arm64/mm/dma-mapping.c > index f3a637b98487..6840426bbe77 100644 > --- a/arch/arm64/mm/dma-mapping.c > +++ b/arch/arm64/mm/dma-mapping.c > @@ -368,7 +368,7 @@ static int __swiotlb_dma_mapping_error(struct device *hwdev, dma_addr_t addr) > return 0; > } > > -static const struct dma_map_ops swiotlb_dma_ops = { > +static const struct dma_map_ops arm64_swiotlb_dma_ops = { > .alloc = __dma_alloc, > .free = __dma_free, > .mmap = __swiotlb_mmap, > @@ -923,7 +923,7 @@ void arch_setup_dma_ops(struct device *dev, u64 dma_base, u64 size, > const struct iommu_ops *iommu, bool coherent) > { > if (!dev->dma_ops) > - dev->dma_ops = &swiotlb_dma_ops; > + dev->dma_ops = &arm64_swiotlb_dma_ops; > > dev->archdata.dma_coherent = coherent; > __iommu_setup_dma_ops(dev, dma_base, size, iommu); >