From patchwork Wed Nov 14 08:23:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 10682147 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 6389D14DB for ; Wed, 14 Nov 2018 08:24:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5A1622AFA3 for ; Wed, 14 Nov 2018 08:24:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4E7F82B1A1; Wed, 14 Nov 2018 08:24:49 +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 B15C02AFA3 for ; Wed, 14 Nov 2018 08:24:48 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C1FCA6B028B; Wed, 14 Nov 2018 03:24:36 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id B7E116B028C; Wed, 14 Nov 2018 03:24:36 -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 9D0C76B028D; Wed, 14 Nov 2018 03:24:36 -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 4E6F96B028B for ; Wed, 14 Nov 2018 03:24:36 -0500 (EST) Received: by mail-pf1-f197.google.com with SMTP id a24-v6so12593966pfn.12 for ; Wed, 14 Nov 2018 00:24:36 -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=DX9cMG1u8d0vd6WPvXO0Apsoz04fpG8sch9Xg4PpRUk=; b=peRJiFJOAVPrAYDC5ZR2a5jeM1Mpr2argKmE1M9PxCA6Y8nETYlsK3fxrixFGgwDiS 9bQtXqsXsS9HPJ7sVvJVG/Xes+EtPYYNjKRr6lCLErnjH1Yw/f/DlpYxIAHArlEwL4/T YLFF5kNkG1wQgSlAPH9CbF9OrbDLBmSrxbo9NpH9LGr8zxLtgmO1/ZTRnNzcq/Mm8R4N TU5W/2+AdnIu+pMrY44/0uW3NjcVwlX13S9WBMwMDgJc8qudeiiUzni8/DxOuD8+o6pj Lml1p59aDD5Ce1z0TLVshmIxwQekdg9w9XyCOtYbNVqxX+MDLTxOnGEqyLxxCKueAMk6 D2ZA== X-Gm-Message-State: AGRZ1gIuW/veEfyv+XOpH1dbGXHlBgDSOineyv5C0siaApbtNsKfIeFj uYLymwisn1ey/HHjUnWWaGttC2thPTXQr5FopBkr2yjakAgbarQE68bBh3XFIycitg81kPfn6Ay 4IxhAaO9KVfhCOckR1MTolSQoj4jJLnypQx4N5+pCY9R4ZvozFj+c+yDUk0n+cgA= X-Received: by 2002:a17:902:aa84:: with SMTP id d4-v6mr987204plr.25.1542183875995; Wed, 14 Nov 2018 00:24:35 -0800 (PST) X-Google-Smtp-Source: AJdET5dlazMLyx/SRzWxtUM23FidyjXY9jKGH1CQal3is0bJuyJSU8OHcFo89g8aQKzlSUw3p2Fp X-Received: by 2002:a17:902:aa84:: with SMTP id d4-v6mr987172plr.25.1542183875133; Wed, 14 Nov 2018 00:24:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542183875; cv=none; d=google.com; s=arc-20160816; b=oIGkZQp8RPy6XNYTQiGLv8xzsV7YkUPI+mr2L5Wi/NarTvqdCNCrJ7/iNr6Ctn7N/9 Ek38dOOMgfBHAZPpbwHxJ49BavOeZk84vyHQcA8y/zSEo4Y6ero+PZOw+SjhbERSbFAK iZnPMm8Jy+ax4KxqwFdo+y9Eg5huvOOgufaxJomr6I4FYOgt2uekFgHCE0zbRzSSdCaJ 3vkVODZK2rxDlFLtWc6d3UwDEoGgf4lb0p7Wt/C4CFtSKjB1Di5hsVyNxMPGWLzvUEd2 /rE0hGc8Uc/xuXDe7N/HIFDA1qfRHcYrng9cM+K6XSfsK8DP77Q7XF1CDjUm48rB7qZV /67Q== 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=DX9cMG1u8d0vd6WPvXO0Apsoz04fpG8sch9Xg4PpRUk=; b=uR6VD1U1iX3/+oo/l7gvWCpTV9O7INEAnHCtqrZCm0xNb+oCnFr8nE+8PDSNW7XgRY 1PJV+cZB0Rk2H+UBcibWTzV5Z2aW9q3hYuv4Dkelc8Bh14P/3SWjWXEtS5jpD/6iXq1A /ts+fYP1B2ViNQQexRtr65VG3mWkDex5QkYtoK2kP9HjXnQmUBJbyNxSpOF4Ji3j2skR bJaLmb6KPON6wjIDmLNrdRoxfedts3AxO/LC5LNO3ejTwQ0MwG/3o/ZwKSshzqIf2zLO 5ujQ7eN7XhfHW+AMco2PTW3+l/d6zPqwnwD6Scw3NT5Pg2P+cmNgm3sgLApLtx7DRZsa 3pHQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b=a9p5CATE; 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 d16-v6si22556505pgd.555.2018.11.14.00.24.35 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Nov 2018 00:24:35 -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=a9p5CATE; 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=DX9cMG1u8d0vd6WPvXO0Apsoz04fpG8sch9Xg4PpRUk=; b=a9p5CATEfjbNCYg4gN/oz1Innm 0JbOLjPOGZIswPlPuiM/WeHKbo/5QBzli76XFZB0AT8oSU7ouFdEF9uc9+FZwdxXdvonAfgP2iUZ5 3zYSHUf8+0z5m/CYd1CyhRinhJvoFiw4XAL6ixTHCAJNqo9axNSHFc9dQ7rBNLzNvGdhvsXkBPyFD azhTB/Qz8Z88trurty002NXRZr/oqdjIfvlZKVg9/KudfQHT7UCpmgOIsg5difJ7n5OUc7i4/ohiZ peH30Zu6Uvsb0Pj2OYMNDsxJ7o0M7JnwL3gviIdDAKuWoCuAwGcH5icGuaqVc0MS6DoqdxnwWFC05 tOywm6UA==; 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 1gMqTJ-000533-10; Wed, 14 Nov 2018 08:24:25 +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 25/34] powerpc/dma: remove max_direct_dma_addr Date: Wed, 14 Nov 2018 09:23:05 +0100 Message-Id: <20181114082314.8965-26-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 The max_direct_dma_addr duplicates the bus_dma_mask field in struct device. Use the generic field instead. Signed-off-by: Christoph Hellwig --- arch/powerpc/include/asm/device.h | 3 --- arch/powerpc/include/asm/dma-direct.h | 4 +--- arch/powerpc/kernel/dma-swiotlb.c | 20 -------------------- arch/powerpc/kernel/dma.c | 5 ++--- arch/powerpc/sysdev/fsl_pci.c | 3 +-- 5 files changed, 4 insertions(+), 31 deletions(-) diff --git a/arch/powerpc/include/asm/device.h b/arch/powerpc/include/asm/device.h index 3814e1c2d4bc..a130be13ee83 100644 --- a/arch/powerpc/include/asm/device.h +++ b/arch/powerpc/include/asm/device.h @@ -38,9 +38,6 @@ struct dev_archdata { #ifdef CONFIG_IOMMU_API void *iommu_domain; #endif -#ifdef CONFIG_SWIOTLB - dma_addr_t max_direct_dma_addr; -#endif #ifdef CONFIG_PPC64 struct pci_dn *pci_data; #endif diff --git a/arch/powerpc/include/asm/dma-direct.h b/arch/powerpc/include/asm/dma-direct.h index 7702875aabb7..e00ab5d0612d 100644 --- a/arch/powerpc/include/asm/dma-direct.h +++ b/arch/powerpc/include/asm/dma-direct.h @@ -5,9 +5,7 @@ static inline bool dma_capable(struct device *dev, dma_addr_t addr, size_t size) { #ifdef CONFIG_SWIOTLB - struct dev_archdata *sd = &dev->archdata; - - if (sd->max_direct_dma_addr && addr + size > sd->max_direct_dma_addr) + if (dev->bus_dma_mask && addr + size > dev->bus_dma_mask) return false; #endif diff --git a/arch/powerpc/kernel/dma-swiotlb.c b/arch/powerpc/kernel/dma-swiotlb.c index 38a2c9f5ab54..62caa16b91a9 100644 --- a/arch/powerpc/kernel/dma-swiotlb.c +++ b/arch/powerpc/kernel/dma-swiotlb.c @@ -24,21 +24,6 @@ unsigned int ppc_swiotlb_enable; -static u64 swiotlb_powerpc_get_required(struct device *dev) -{ - u64 end, mask, max_direct_dma_addr = dev->archdata.max_direct_dma_addr; - - end = memblock_end_of_DRAM(); - if (max_direct_dma_addr && end > max_direct_dma_addr) - end = max_direct_dma_addr; - end += get_dma_offset(dev); - - mask = 1ULL << (fls64(end) - 1); - mask += mask - 1; - - return mask; -} - /* * At the moment, all platforms that use this code only require * swiotlb to be used if we're operating on HIGHMEM. Since @@ -60,22 +45,17 @@ const struct dma_map_ops powerpc_swiotlb_dma_ops = { .sync_sg_for_cpu = swiotlb_sync_sg_for_cpu, .sync_sg_for_device = swiotlb_sync_sg_for_device, .mapping_error = dma_direct_mapping_error, - .get_required_mask = swiotlb_powerpc_get_required, }; static int ppc_swiotlb_bus_notify(struct notifier_block *nb, unsigned long action, void *data) { struct device *dev = data; - struct dev_archdata *sd; /* We are only intereted in device addition */ if (action != BUS_NOTIFY_ADD_DEVICE) return 0; - sd = &dev->archdata; - sd->max_direct_dma_addr = 0; - /* May need to bounce if the device can't address all of DRAM */ if ((dma_get_mask(dev) + 1) < memblock_end_of_DRAM()) set_dma_ops(dev, &powerpc_swiotlb_dma_ops); diff --git a/arch/powerpc/kernel/dma.c b/arch/powerpc/kernel/dma.c index f9f51fc505a1..59f38ca3975c 100644 --- a/arch/powerpc/kernel/dma.c +++ b/arch/powerpc/kernel/dma.c @@ -30,11 +30,10 @@ static u64 __maybe_unused get_pfn_limit(struct device *dev) { u64 pfn = (dev->coherent_dma_mask >> PAGE_SHIFT) + 1; - struct dev_archdata __maybe_unused *sd = &dev->archdata; #ifdef CONFIG_SWIOTLB - if (sd->max_direct_dma_addr && dev->dma_ops == &powerpc_swiotlb_dma_ops) - pfn = min_t(u64, pfn, sd->max_direct_dma_addr >> PAGE_SHIFT); + if (dev->bus_dma_mask && dev->dma_ops == &powerpc_swiotlb_dma_ops) + pfn = min_t(u64, pfn, dev->bus_dma_mask >> PAGE_SHIFT); #endif return pfn; diff --git a/arch/powerpc/sysdev/fsl_pci.c b/arch/powerpc/sysdev/fsl_pci.c index 561f97d698cc..f136567a5ed5 100644 --- a/arch/powerpc/sysdev/fsl_pci.c +++ b/arch/powerpc/sysdev/fsl_pci.c @@ -117,9 +117,8 @@ static u64 pci64_dma_offset; static void pci_dma_dev_setup_swiotlb(struct pci_dev *pdev) { struct pci_controller *hose = pci_bus_to_host(pdev->bus); - struct dev_archdata *sd = &pdev->dev.archdata; - sd->max_direct_dma_addr = + pdev->dev.bus_dma_mask = hose->dma_window_base_cur + hose->dma_window_size; }