Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp6399452imu; Wed, 14 Nov 2018 00:27:24 -0800 (PST) X-Google-Smtp-Source: AJdET5dNeDhz4hcLuhDF6x+ezGCvdmnkRFfCWizg3DRxRSxgqf4IVcmE3vbFVyU4tTbuD27gvkMI X-Received: by 2002:a62:c60a:: with SMTP id m10-v6mr1001814pfg.15.1542184044783; Wed, 14 Nov 2018 00:27:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542184044; cv=none; d=google.com; s=arc-20160816; b=gfUmadxk0YmAZeUNGJ0eTNH7LqMWAKjeXBq2/bP60Hv2GSrANodb7awSF6MNhE5Fza q7mQIsn/wKMwpVQhKlSUBoM3D6YRwBq3rKCqnFbzNw+BFZENLlMg0ozGriy5SU8KOnLS snkPsiXe0VvJxkbBchqv0AtYSrPwR1WU3xzwUGDF6SnRPneWvoYPUgOZaPT3eyihdu6k UABWzbV5ujl58GCg1Uyl1VmNJz3bSuznyqxCiTHtLDb11lhlCjOXKT3dm8zr7ynF3h3W tunjSavROFQBRrF9XJ5VxQAmWotq6x3H3zElBCrUlD7yJ7KLwT+Jo2KRC4vGgpoMyjwA dejQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=KxEzdPbCgOAnoVb+pNDePzx38mzO3g1jPd1yHEiZ77o=; b=LV+OfkaNM0O4c90e2fQLA4At/eIMfksy8yKSmntTigj7A5dpsWlBCNsckVAZv4qMDf mqjAcwgNeTTbDVU0vl/Dd5GqWHqLJbhtEA2MDa5n5vFWUvDN6aWFuDSvYZnIH4NwnUjK hevJJfjLn1Sz7vtHA0OlFB5beOKNm6MyXsEHqculjASWQKLhIr9MXCiTO4rAnxSAUlWv L0UtGEmVl1WARMIylps68oGxDk0ULLcTvFein556NWuom2YMSpJBClX9kknRwk4XV8WH GQAJjoSKHoADFmYyL9y5B1d4eeAiBV7LLd+WYZoLIKvZRJvziR4LN+fm7vPPmp2f13Ub Vrrg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@infradead.org header.s=bombadil.20170209 header.b=gjEeFTTs; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id x74si405406pfe.23.2018.11.14.00.27.10; Wed, 14 Nov 2018 00:27:24 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=fail header.i=@infradead.org header.s=bombadil.20170209 header.b=gjEeFTTs; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733202AbeKNS1T (ORCPT + 99 others); Wed, 14 Nov 2018 13:27:19 -0500 Received: from bombadil.infradead.org ([198.137.202.133]:50222 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732043AbeKNS1T (ORCPT ); Wed, 14 Nov 2018 13:27:19 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type: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=KxEzdPbCgOAnoVb+pNDePzx38mzO3g1jPd1yHEiZ77o=; b=gjEeFTTsNC8YRTaP1PevyNvXQv +cT3S6IUppEiWjo2+D2mhdxx3JH2ZrqeDAgB53adE3pZnJUBvBGAqLWQT5iwNbAnK1iHd+/UD8EmN pDlOWh1RdWZNfNi/KatFgeQipwbAumSDLWi54oHNxvMvr98D9U1eVwlNvhbOR6y1P2YAJE8dZJu2r ILAdoyjT98Hc/Dd8+mZYsW7KHa/aKHWagr012hvd9G0T/a1gu1EL0nvTLLSgqo+AlkUvPOjNX9ti/ KwYn9IgNswpdYtI21Q9FND2ORFJ9UtgdJwyZOfLPVUDUACwkE0nO4bEnVxf76avebvHvgBwdYSz3G FXFlgKdg==; Received: from 089144211136.atnat0020.highway.a1.net ([89.144.211.136] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.90_1 #2 (Red Hat Linux)) id 1gMqTc-00059o-CE; Wed, 14 Nov 2018 08:24:44 +0000 From: Christoph Hellwig To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman Cc: linuxppc-dev@lists.ozlabs.org, iommu@lists.linux-foundation.org, linux-mm@kvack.org, linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 32/34] powerpc/dma: remove get_dma_offset Date: Wed, 14 Nov 2018 09:23:12 +0100 Message-Id: <20181114082314.8965-33-hch@lst.de> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181114082314.8965-1-hch@lst.de> References: <20181114082314.8965-1-hch@lst.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Just fold the calculation into __phys_to_dma/__dma_to_phys as those are the only places that should know about it. Signed-off-by: Christoph Hellwig Acked-by: Benjamin Herrenschmidt --- arch/powerpc/include/asm/dma-direct.h | 8 ++++++-- arch/powerpc/include/asm/dma-mapping.h | 16 ---------------- 2 files changed, 6 insertions(+), 18 deletions(-) diff --git a/arch/powerpc/include/asm/dma-direct.h b/arch/powerpc/include/asm/dma-direct.h index 92d8aed86422..a2912b47102c 100644 --- a/arch/powerpc/include/asm/dma-direct.h +++ b/arch/powerpc/include/asm/dma-direct.h @@ -13,11 +13,15 @@ static inline bool dma_capable(struct device *dev, dma_addr_t addr, size_t size) static inline dma_addr_t __phys_to_dma(struct device *dev, phys_addr_t paddr) { - return paddr + get_dma_offset(dev); + if (!dev) + return paddr + PCI_DRAM_OFFSET; + return paddr + dev->archdata.dma_offset; } static inline phys_addr_t __dma_to_phys(struct device *dev, dma_addr_t daddr) { - return daddr - get_dma_offset(dev); + if (!dev) + return daddr - PCI_DRAM_OFFSET; + return daddr - dev->archdata.dma_offset; } #endif /* ASM_POWERPC_DMA_DIRECT_H */ diff --git a/arch/powerpc/include/asm/dma-mapping.h b/arch/powerpc/include/asm/dma-mapping.h index 93e57e28be28..c70f55d2f5e0 100644 --- a/arch/powerpc/include/asm/dma-mapping.h +++ b/arch/powerpc/include/asm/dma-mapping.h @@ -43,22 +43,6 @@ static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus) return NULL; } -/* - * get_dma_offset() - * - * Get the dma offset on configurations where the dma address can be determined - * from the physical address by looking at a simple offset. Direct dma and - * swiotlb use this function, but it is typically not used by implementations - * with an iommu. - */ -static inline dma_addr_t get_dma_offset(struct device *dev) -{ - if (dev) - return dev->archdata.dma_offset; - - return PCI_DRAM_OFFSET; -} - static inline void set_dma_offset(struct device *dev, dma_addr_t off) { if (dev) -- 2.19.1