Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965170AbeAJLIg (ORCPT + 1 other); Wed, 10 Jan 2018 06:08:36 -0500 Received: from foss.arm.com ([217.140.101.70]:39924 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752381AbeAJLIc (ORCPT ); Wed, 10 Jan 2018 06:08:32 -0500 Subject: Re: [PATCH 10/33] arm64: don't override dma_max_pfn 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, Konrad Rzeszutek Wilk , linux-snps-arc@lists.infradead.org, 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: <20180110080027.13879-1-hch@lst.de> <20180110080027.13879-11-hch@lst.de> From: Robin Murphy Message-ID: <115563c4-7929-a68c-459a-89d787051053@arm.com> Date: Wed, 10 Jan 2018 11:08:27 +0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.5.0 MIME-Version: 1.0 In-Reply-To: <20180110080027.13879-11-hch@lst.de> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-GB Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Return-Path: On 10/01/18 08:00, Christoph Hellwig wrote: > The generic version now takes dma_pfn_offset into account, so there is no > more need for an architecture override. Reviewed-by: Robin Murphy > Signed-off-by: Christoph Hellwig > --- > arch/arm64/include/asm/dma-mapping.h | 9 --------- > 1 file changed, 9 deletions(-) > > diff --git a/arch/arm64/include/asm/dma-mapping.h b/arch/arm64/include/asm/dma-mapping.h > index 0df756b24863..eada887a93bf 100644 > --- a/arch/arm64/include/asm/dma-mapping.h > +++ b/arch/arm64/include/asm/dma-mapping.h > @@ -76,14 +76,5 @@ static inline void dma_mark_clean(void *addr, size_t size) > { > } > > -/* Override for dma_max_pfn() */ > -static inline unsigned long dma_max_pfn(struct device *dev) > -{ > - dma_addr_t dma_max = (dma_addr_t)*dev->dma_mask; > - > - return (ulong)dma_to_phys(dev, dma_max) >> PAGE_SHIFT; > -} > -#define dma_max_pfn(dev) dma_max_pfn(dev) > - > #endif /* __KERNEL__ */ > #endif /* __ASM_DMA_MAPPING_H */ >