Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp6398527imu; Wed, 14 Nov 2018 00:26:05 -0800 (PST) X-Google-Smtp-Source: AJdET5dztxpPfm9BBtLB+eqp0UwPFPgOT9uYL9naLhjGQIGFqXQ2kdc1xMmuUS3ba90r6CnKGmzl X-Received: by 2002:a62:1d87:: with SMTP id d129-v6mr682943pfd.47.1542183965700; Wed, 14 Nov 2018 00:26:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542183965; cv=none; d=google.com; s=arc-20160816; b=ouH98sryWuyBzJQFVKlLx0WceVRuLyV8LNQXsLcJx9hvPq3rX4CpAa1Rr6Rx/0XmdL 4H7DxXsm7btwQCF2Z/RLifWe1yUHQ/AFi44Mpi02Vd7XZVVYg+R3C+mxCb9xY2pPYLT7 VtPdBM4gD1S2bgHTREYXjZ0fazk1VnEcgb83wxYO5MsjckGy+CXhrekXIK+xaeFQhM5l v+9irvjK08ovXMEDlZOkxmEhOJViCSmFDZRskK4AS69jncF/QV6lzB6cps+EPF9gOUIU aBVH0sBiAuHdcsVyQydboXYvbz43uvk9Rbu+vw83T7PBpMD+O9fFsY8EBsxoJKhvsT0J o3WA== 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=gs0aCGds6+81gR/+PXMKNZWTWIfFyqBOSBsPAco2SO0=; b=sOVtX3HM7cvQHNjcKNlPcu3rCLZbFR1H1UnuC+fXgdVRXfcVxtWKA3Ozmw/7Oft644 NkesSOkLOglXCD5vTmip+/9ZtZBz3DL3LlLfLK2IAHZrJPsjGE8UxEznIZLromkiuRMU B1znszHOqJt7ti2zhoMST4Un3EX3DY5YtHKB9zl5yWQKOIotHzdeEcgpSZOJ4/4B1+2F pJwQ35HXqkoKe+jlngGAi5+sL28K+zQY8hefwzgTf2P+b/dZ+lmYrTNLZRPQ+UGwgLqP j7cAc+Gxk/WbT57oNg0ov0I663J9f2TgsK3NttAWKmkKgM7sgCZ3gvh2WvTOty8YwVoO 28og== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@infradead.org header.s=bombadil.20170209 header.b=V7wkM6Tr; 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 r7-v6si22687995plo.100.2018.11.14.00.25.50; Wed, 14 Nov 2018 00:26:05 -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=V7wkM6Tr; 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 S1733151AbeKNS1L (ORCPT + 99 others); Wed, 14 Nov 2018 13:27:11 -0500 Received: from bombadil.infradead.org ([198.137.202.133]:50172 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732043AbeKNS1L (ORCPT ); Wed, 14 Nov 2018 13:27:11 -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=gs0aCGds6+81gR/+PXMKNZWTWIfFyqBOSBsPAco2SO0=; b=V7wkM6TrweynuLod+0U9Ct1L3O sMcOiTS3Fy5EYpPZKF/QIjxl9ODq2FXdSLyHmvdrg1+CTV9+5970iCeVSBqFsV5IDCzQjUJKOsjRL UfU5Io/Os304isG74+dQlEz5qWPhIbF8mmifzoXfIq8wOwSvPy7BNw/a7xBzxypEOhyU1hRhTXn5K 3TNNk6a0smlsBK+l30O5AaeRWymZRBAm3VjWncNSfFfHHEpspB/lEGu6yVi71kjjSBOX5EIsZiLga ivTR+Z67NYcgNN4LyGUgTBkssiDgXM8qsBIJV41YpnhB+Yx4HIzR6SxBGbudl8muItvTwAYZJ+j/n zf0By9kw==; 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 1gMqTU-000564-3u; Wed, 14 Nov 2018 08:24:36 +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 29/34] powerpc/dma: use phys_to_dma instead of get_dma_offset Date: Wed, 14 Nov 2018 09:23:09 +0100 Message-Id: <20181114082314.8965-30-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 Use the standard portable helper instead of the powerpc specific one, which is about to go away. Signed-off-by: Christoph Hellwig Acked-by: Benjamin Herrenschmidt --- arch/powerpc/kernel/dma.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/powerpc/kernel/dma.c b/arch/powerpc/kernel/dma.c index cf0ae0b3fb24..5c83a34f288f 100644 --- a/arch/powerpc/kernel/dma.c +++ b/arch/powerpc/kernel/dma.c @@ -6,7 +6,7 @@ */ #include -#include +#include #include #include #include @@ -42,7 +42,7 @@ static u64 __maybe_unused get_pfn_limit(struct device *dev) int dma_nommu_dma_supported(struct device *dev, u64 mask) { #ifdef CONFIG_PPC64 - u64 limit = get_dma_offset(dev) + (memblock_end_of_DRAM() - 1); + u64 limit = phys_to_dma(dev, (memblock_end_of_DRAM() - 1)); /* Limit fits in the mask, we are good */ if (mask >= limit) @@ -100,7 +100,7 @@ void *__dma_nommu_alloc_coherent(struct device *dev, size_t size, return NULL; ret = page_address(page); memset(ret, 0, size); - *dma_handle = __pa(ret) + get_dma_offset(dev); + *dma_handle = phys_to_dma(dev,__pa(ret)); return ret; } @@ -139,7 +139,7 @@ int dma_nommu_map_sg(struct device *dev, struct scatterlist *sgl, int i; for_each_sg(sgl, sg, nents, i) { - sg->dma_address = sg_phys(sg) + get_dma_offset(dev); + sg->dma_address = phys_to_dma(dev, sg_phys(sg)); sg->dma_length = sg->length; if (attrs & DMA_ATTR_SKIP_CPU_SYNC) @@ -170,7 +170,7 @@ dma_addr_t dma_nommu_map_page(struct device *dev, struct page *page, if (!(attrs & DMA_ATTR_SKIP_CPU_SYNC)) __dma_sync_page(page, offset, size, dir); - return page_to_phys(page) + offset + get_dma_offset(dev); + return phys_to_dma(dev, page_to_phys(page)) + offset; } #ifdef CONFIG_NOT_COHERENT_CACHE -- 2.19.1