From patchwork Wed Nov 14 08:23:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 10682167 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 428DA14BA for ; Wed, 14 Nov 2018 08:25:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 333542A654 for ; Wed, 14 Nov 2018 08:25:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2715A2B020; Wed, 14 Nov 2018 08:25:19 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B0B4E2A654 for ; Wed, 14 Nov 2018 08:25:18 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CDE9D6B02A2; Wed, 14 Nov 2018 03:25:00 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id C8E246B02A4; Wed, 14 Nov 2018 03:25:00 -0500 (EST) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B2EC46B02A5; Wed, 14 Nov 2018 03:25:00 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pf1-f197.google.com (mail-pf1-f197.google.com [209.85.210.197]) by kanga.kvack.org (Postfix) with ESMTP id 6A97B6B02A2 for ; Wed, 14 Nov 2018 03:25:00 -0500 (EST) Received: by mail-pf1-f197.google.com with SMTP id d6-v6so12610437pfn.19 for ; Wed, 14 Nov 2018 00:25:00 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=gs0aCGds6+81gR/+PXMKNZWTWIfFyqBOSBsPAco2SO0=; b=L90/8vEk37IZhQn0bGVz6fU1DKSrUPQjq+/UqLuaqGovdnoaRQFYEfKGU6OATyVVrp 9N2nvOSMFym9JV19TDjEEerTbt/edeN795pfEb/ICBiu4Ov79lwpb9GGg3Rmtzs4CVUG rTdWWjKsNm4/eOCVTK3hrSFSOas37tVtPjZp+HoeVKsjQA7oMQpb2p08fLP/mVjwRpCi shSSKUVllHL8aHNrTXAPMDek2WPnUdoz2RWpCXs6yfF/+ApxpXhSAs9nR1nl3IQ/LXlI TEwNA3kCDFb02x13D/kpkM1x9TNkpL059GkxE0eHP3Ka+zx9x3pFRTyRlL2vewitBTgA fi6w== X-Gm-Message-State: AGRZ1gJCBENAwweWNvLji3R1BioPs38FS+LtWyeKZRQLg/rXRe/sIqmt 6SnWPmkCzvnEId3gkP1PzaD3uwp2VzTmwN9r74QPpvT+o9g3Ej40QMstiwc8rwq5GZSleC+3AwG ZjA7OuTgsPxklsjVK40YBnl/1VRxKJuCvZnh96W0psr7NNXmXl4PWOS3ajih/u1w= X-Received: by 2002:a63:151f:: with SMTP id v31mr888792pgl.34.1542183900111; Wed, 14 Nov 2018 00:25:00 -0800 (PST) X-Google-Smtp-Source: AJdET5eex1ytLgsLLA86/+jo2dFczWZruM25/HVVOjq54ffosziO+zcZqRZ7ggKbKveQVFADW7up X-Received: by 2002:a63:151f:: with SMTP id v31mr888762pgl.34.1542183899397; Wed, 14 Nov 2018 00:24:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542183899; cv=none; d=google.com; s=arc-20160816; b=BTAVytKh7LLdBRZtkM0WNiwok3CHVwXDvuo1XjCOZUI9+GSRq5TLkjY4m6Cmn9NSNC PEiDf9TYzEM8AddAOHhpqbBixB4I9yVgWYz8gmDijRJTeInP7T3CQdFsFkiAiDPokAWR Ol/P7XUqoGI3dMT3c60GzortJmFnArZPYI+CZ8sib5u8ivMVbCXjfzuPjqSabeHd0jc2 EGftbhsLFVXKktmdPnRFYjQzISmjOwvy/SornLTjUMId5mQfv+Do5JxxH1PC/re2g/Ez 95S/e/L/RdZMieP5NJnJUGu+dWSiN03JM0jXpttMzewoNN5RVs6tz/IT4wXc61IE0mt3 waYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=gs0aCGds6+81gR/+PXMKNZWTWIfFyqBOSBsPAco2SO0=; b=04RF4EXomHigh3A3CUB9dMaK+Rs03DgUsVyatVi2xe7VZYdcaHOeo0DuKdUNLsk4Ay uGbHE7u0EP422nyBq019/F9JhAs29pnzrXC3ESFO6DAw+XzqA2APwxtypuUHNRbfJu5e 3Z/BODBSueMUX3KwZ9z7Rj9UiE5WR7dQWc+FsYivlDkqI7suSqMrk0qb7wBVfxv5VC6Q BK1s63AzvyaDZplA1SB3Msw3UyYoljZkQzYfLhTP9mVxEE0NjPaicEQAWpQc5PFq3gPb Gaj7Wj9GgzKVD807Jn09RRA9YAIfSyXZqbaBmTm2cV6ikL3pAfnHCSyFygvXGm/tQa/G 2Pyw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b=V7wkM6Tr; spf=pass (google.com: best guess record for domain of batv+ddbc6e1cf1a82b64ebec+5561+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom=BATV+ddbc6e1cf1a82b64ebec+5561+infradead.org+hch@bombadil.srs.infradead.org Received: from bombadil.infradead.org (bombadil.infradead.org. [2607:7c80:54:e::133]) by mx.google.com with ESMTPS id 37si21801145pgw.590.2018.11.14.00.24.59 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Nov 2018 00:24:59 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of batv+ddbc6e1cf1a82b64ebec+5561+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) client-ip=2607:7c80:54:e::133; Authentication-Results: mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b=V7wkM6Tr; spf=pass (google.com: best guess record for domain of batv+ddbc6e1cf1a82b64ebec+5561+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom=BATV+ddbc6e1cf1a82b64ebec+5561+infradead.org+hch@bombadil.srs.infradead.org 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 X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP 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