Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933771AbeALNZZ (ORCPT + 1 other); Fri, 12 Jan 2018 08:25:25 -0500 Received: from mail-qk0-f193.google.com ([209.85.220.193]:43934 "EHLO mail-qk0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932976AbeALNZV (ORCPT ); Fri, 12 Jan 2018 08:25:21 -0500 X-Google-Smtp-Source: ACJfBouk3vWdR/QVdwcmVsk86Avh+Neu4OLcm71KZ2LWfSHzENA3SP5X9sdazYG6SoZLxVDzEs89wA== Date: Fri, 12 Jan 2018 08:25:17 -0500 From: Konrad Rzeszutek Wilk To: Christoph Hellwig Cc: iommu@lists.linux-foundation.org, Michal Simek , Guan Xuetao , Christian =?iso-8859-1?Q?K=F6nig?= , linux-arm-kernel@lists.infradead.org, linux-ia64@vger.kernel.org, linux-mips@linux-mips.org, linuxppc-dev@lists.ozlabs.org, x86@kernel.org, linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 04/22] powerpc: rename swiotlb_dma_ops Message-ID: <20180112132516.GD26900@localhost.localdomain> References: <20180110080932.14157-1-hch@lst.de> <20180110080932.14157-5-hch@lst.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20180110080932.14157-5-hch@lst.de> User-Agent: Mutt/1.9.1 (2017-09-22) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Return-Path: On Wed, Jan 10, 2018 at 09:09:14AM +0100, Christoph Hellwig wrote: > We'll need that name for a generic implementation soon. > Reviewed-by: Konrad Rzeszutek Wilk > Signed-off-by: Christoph Hellwig > --- > arch/powerpc/include/asm/swiotlb.h | 2 +- > arch/powerpc/kernel/dma-swiotlb.c | 4 ++-- > arch/powerpc/kernel/dma.c | 2 +- > arch/powerpc/sysdev/fsl_pci.c | 2 +- > 4 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/arch/powerpc/include/asm/swiotlb.h b/arch/powerpc/include/asm/swiotlb.h > index 9341ee804d19..f65ecf57b66c 100644 > --- a/arch/powerpc/include/asm/swiotlb.h > +++ b/arch/powerpc/include/asm/swiotlb.h > @@ -13,7 +13,7 @@ > > #include > > -extern const struct dma_map_ops swiotlb_dma_ops; > +extern const struct dma_map_ops powerpc_swiotlb_dma_ops; > > extern unsigned int ppc_swiotlb_enable; > int __init swiotlb_setup_bus_notifier(void); > diff --git a/arch/powerpc/kernel/dma-swiotlb.c b/arch/powerpc/kernel/dma-swiotlb.c > index f1e99b9cee97..506ac4fafac5 100644 > --- a/arch/powerpc/kernel/dma-swiotlb.c > +++ b/arch/powerpc/kernel/dma-swiotlb.c > @@ -46,7 +46,7 @@ static u64 swiotlb_powerpc_get_required(struct device *dev) > * map_page, and unmap_page on highmem, use normal dma_ops > * for everything else. > */ > -const struct dma_map_ops swiotlb_dma_ops = { > +const struct dma_map_ops powerpc_swiotlb_dma_ops = { > .alloc = __dma_nommu_alloc_coherent, > .free = __dma_nommu_free_coherent, > .mmap = dma_nommu_mmap_coherent, > @@ -89,7 +89,7 @@ static int ppc_swiotlb_bus_notify(struct notifier_block *nb, > > /* May need to bounce if the device can't address all of DRAM */ > if ((dma_get_mask(dev) + 1) < memblock_end_of_DRAM()) > - set_dma_ops(dev, &swiotlb_dma_ops); > + set_dma_ops(dev, &powerpc_swiotlb_dma_ops); > > return NOTIFY_DONE; > } > diff --git a/arch/powerpc/kernel/dma.c b/arch/powerpc/kernel/dma.c > index 76079841d3d0..da20569de9d4 100644 > --- a/arch/powerpc/kernel/dma.c > +++ b/arch/powerpc/kernel/dma.c > @@ -33,7 +33,7 @@ static u64 __maybe_unused get_pfn_limit(struct device *dev) > struct dev_archdata __maybe_unused *sd = &dev->archdata; > > #ifdef CONFIG_SWIOTLB > - if (sd->max_direct_dma_addr && dev->dma_ops == &swiotlb_dma_ops) > + if (sd->max_direct_dma_addr && dev->dma_ops == &powerpc_swiotlb_dma_ops) > pfn = min_t(u64, pfn, sd->max_direct_dma_addr >> PAGE_SHIFT); > #endif > > diff --git a/arch/powerpc/sysdev/fsl_pci.c b/arch/powerpc/sysdev/fsl_pci.c > index e4d0133bbeeb..61e07c78d64f 100644 > --- a/arch/powerpc/sysdev/fsl_pci.c > +++ b/arch/powerpc/sysdev/fsl_pci.c > @@ -118,7 +118,7 @@ static void setup_swiotlb_ops(struct pci_controller *hose) > { > if (ppc_swiotlb_enable) { > hose->controller_ops.dma_dev_setup = pci_dma_dev_setup_swiotlb; > - set_pci_dma_ops(&swiotlb_dma_ops); > + set_pci_dma_ops(&powerpc_swiotlb_dma_ops); > } > } > #else > -- > 2.14.2 >