From patchwork Mon Dec 4 16:36:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 844316 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=infradead.org header.i=@infradead.org header.b="aoYSdwX6"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yr9XL4BWFz9sNr for ; Tue, 5 Dec 2017 03:37:38 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753115AbdLDQgI (ORCPT ); Mon, 4 Dec 2017 11:36:08 -0500 Received: from bombadil.infradead.org ([65.50.211.133]:33323 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752959AbdLDQgD (ORCPT ); Mon, 4 Dec 2017 11:36:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=References:In-Reply-To:Message-Id: Date:Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=4cdVq1WsJPdLN8m3rv5GkH4HcAWJpLXxQfk840qmbmg=; b=aoYSdwX6BuZCbvP6n3ZjxTgON uTO3lbFJtbfqejMbjJNUnByq0ML+1IfnIN/1z4nrI3WGht1WiGyIlpgGZ9GO92ABCq9+H+WBf3ox4 ojWeM0sbqWB6E34BHGpUQY4k06TRPrTIWLLaDRmR5tUPdXrVCAIOJ7VsTEn1VJwrc6jrJsI1AzPvM pa+doTanE6J9vqzOp3hpJrvp0zamY6bsX2L3Kfezht2n0yie4vMzhFI+3ujN44Afm0kFxFiAZGOes XtskQdlIm92bozKV7yzQ83bFyxu3b0/H2naQcuzV8VBRYhGd8MPGx7hTSmrxYKhUTJ+T8gTNuItxQ OvVDbYCsA==; Received: from rap-us.hgst.com ([199.255.44.250] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.87 #1 (Red Hat Linux)) id 1eLtis-0004ef-Js; Mon, 04 Dec 2017 16:36:02 +0000 From: Christoph Hellwig To: iommu@lists.linux-foundation.org, linux-arch@vger.kernel.org, linux-block@vger.kernel.org, netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org Subject: [PATCH 2/3] arm64: don't override dma_max_pfn Date: Mon, 4 Dec 2017 08:36:00 -0800 Message-Id: <20171204163601.3055-3-hch@lst.de> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20171204163601.3055-1-hch@lst.de> References: <20171204163601.3055-1-hch@lst.de> X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The generic version now takes dma_pfn_offset into account, so there is no more need for an architecture override. 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 */