From patchwork Wed Nov 14 08:23:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 10682143 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 1BB6314BA for ; Wed, 14 Nov 2018 08:24:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1195B2AFA3 for ; Wed, 14 Nov 2018 08:24:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 03D772B1A1; Wed, 14 Nov 2018 08:24:44 +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 8AA772AFA3 for ; Wed, 14 Nov 2018 08:24:43 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2F4E36B0288; Wed, 14 Nov 2018 03:24:34 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 27E336B0289; Wed, 14 Nov 2018 03:24:34 -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 1258E6B028A; Wed, 14 Nov 2018 03:24:34 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pl1-f200.google.com (mail-pl1-f200.google.com [209.85.214.200]) by kanga.kvack.org (Postfix) with ESMTP id B6B4E6B0288 for ; Wed, 14 Nov 2018 03:24:33 -0500 (EST) Received: by mail-pl1-f200.google.com with SMTP id b4-v6so8721101plb.3 for ; Wed, 14 Nov 2018 00:24:33 -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=ojn3hRaifuiWPVnO+cN83IVjVfWmL3wmTfXzmmsF6EI=; b=RYVde6aAC6vh3sbl4EC5sbl+fdGzklKT8gyY/hwxjVvarjHsSA0a6GdoKYdmJDszAR s3SS3zyLn9b+ro5+l1sbTgLbdXh2PE84PI6jUW+8erXkNUCWYAXz5GAS/TDfF0HSndb+ zpHjcudLJ/h+OWM2gbchu34KsCJpLAeHjFFkAaQlcYQV5dbFie28nuAcPLY+6n8FEquR 5qTnrDk/+yarcoAcSFOWCIi1qBZ44ue86O29odYFpcIh32Tx7vqKs3r/l4UreT64Es7N SM3QGjmQrygv89USVHFtPw85D20Kg5q9c0tlzFibfp0Gtk5Un+d3smkT9wg87N/lqhuf M2mg== X-Gm-Message-State: AGRZ1gLKfJQxfO2v+XfGelei/S1hYapBMZeB3WcM7i7DL+YE1/UEwHlS m3URk/w6T2ZVExHQ/ZlO2mRzBhBZ9nnc4ygdS4vRXPCwL4MsNdhFNveXm6WwPmwqJ0tRYWhfaOu tBs6S+cPEe919xB8VEdQ3UsUqf8jzVZ8nBNi2LUYQvfTkOKK9LnDtzcFUBnq9jLk= X-Received: by 2002:a17:902:ab83:: with SMTP id f3-v6mr953004plr.122.1542183873414; Wed, 14 Nov 2018 00:24:33 -0800 (PST) X-Google-Smtp-Source: AJdET5fLVPtd3CQZlLqedo8SxxrN6mRIOMK0LLD+fPOTi0rf+s6T6uEqdGAW/IzzIdkjNHd1wKJ/ X-Received: by 2002:a17:902:ab83:: with SMTP id f3-v6mr952970plr.122.1542183872700; Wed, 14 Nov 2018 00:24:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542183872; cv=none; d=google.com; s=arc-20160816; b=0WoXw1+DS49tx7grOWB9mKfeGCQrDuhnLW065tc+6Fc4wQBGOKzR0syF77BCt4auYZ tVifH8lrr7VGFn8Vw+yfYsCmqjR4UmDjjFGVgEKGxMxnZIaFS5pghS1RVMQktkdoGi8n PbAU01Y9z335XVSASIJRNuVrqNAoUODQ9L9DwA7XBY7FPDQJmcFD75eAqcnvxyIwg1YH 8znMKB+gGfXxCxZ+D8J0dIuJgnjoe2A/EemB/nv1MBceYOJWiLPcFsm4Q8IbSoBl9bJ1 hIFiNqTUCYIaKiVriCAaMlOJpnubGbvpn33XMo2IipImsxKOm0OKqKlPuaYoe25aeU5r YLIw== 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=ojn3hRaifuiWPVnO+cN83IVjVfWmL3wmTfXzmmsF6EI=; b=PwrmKHcH5eGYzSwv/OfbkyWF+8PkaiwjK967ivWEQmHnrGdICrAY+d8MBFnoUBUA96 YLSUFl6VEhjybF87DJK/1kxJzrzcY+NDXMHjSI6CPNoAo4eElR3lYZc0wKjKeiZCuwmR MlStfJRukncuzrpcZYhBUXwIZunu/nFYAo2NwMrgqTveML3nawoVeGT4YV3qDNMV+EWN pMH+gMT5DRWct6HjX7CIW8grBTkYgdrblx34GYZGWxvgE/WGvfbYBnG3pfPhb+7aswrp 5os4+PbKGEHV+/vm4ALJTM+mFf+NrqHWcHyUqK2+Cfz1S/KCKseRLOXaGjDqVEf8LPpB B1gA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b=VhtqkC1O; 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 62-v6si23916225ply.423.2018.11.14.00.24.32 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Nov 2018 00:24:32 -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=VhtqkC1O; 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=ojn3hRaifuiWPVnO+cN83IVjVfWmL3wmTfXzmmsF6EI=; b=VhtqkC1OiXLcx+lQyQiJ/IVIry TWPJ6ZrQmqmN7ksFo8aGFKWuiUosXXhsbRbrbLnfbpJa3hKLvLoyc8CjCkrkdWHOwww6RatpYrwT3 wz/SqNb/QArO1gcLQzU9Oxd70PegNiwuyZvqav1hQ89XBxLD23r1EvIzb9mC9f5cuvftF2Iv/3bh1 DVQkjsVD5N6LrHantJGheNQQP7ueiQmFgvSZuk+6rVD5cX162hmehiGgfpNrgLiN8zAJDsmajz/52 /yk0r/u6JCE6U2qiGzi2g5DvuZlCQIrsdIW0RmdUF2zpcTS//lzHOVpzl1r8TwPDhoH/reBvaTkPN LNxatDaA==; 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 1gMqTG-000524-79; Wed, 14 Nov 2018 08:24:22 +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 24/34] powerpc/dma: move pci_dma_dev_setup_swiotlb to fsl_pci.c Date: Wed, 14 Nov 2018 09:23:04 +0100 Message-Id: <20181114082314.8965-25-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 pci_dma_dev_setup_swiotlb is only used by the fsl_pci code, and closely related to it, so fsl_pci.c seems like a better place for it. Signed-off-by: Christoph Hellwig --- arch/powerpc/include/asm/swiotlb.h | 2 -- arch/powerpc/kernel/dma-swiotlb.c | 11 ----------- arch/powerpc/sysdev/fsl_pci.c | 9 +++++++++ 3 files changed, 9 insertions(+), 13 deletions(-) diff --git a/arch/powerpc/include/asm/swiotlb.h b/arch/powerpc/include/asm/swiotlb.h index f65ecf57b66c..26a0f12b835b 100644 --- a/arch/powerpc/include/asm/swiotlb.h +++ b/arch/powerpc/include/asm/swiotlb.h @@ -18,8 +18,6 @@ extern const struct dma_map_ops powerpc_swiotlb_dma_ops; extern unsigned int ppc_swiotlb_enable; int __init swiotlb_setup_bus_notifier(void); -extern void pci_dma_dev_setup_swiotlb(struct pci_dev *pdev); - #ifdef CONFIG_SWIOTLB void swiotlb_detect_4g(void); #else diff --git a/arch/powerpc/kernel/dma-swiotlb.c b/arch/powerpc/kernel/dma-swiotlb.c index 678811abccfc..38a2c9f5ab54 100644 --- a/arch/powerpc/kernel/dma-swiotlb.c +++ b/arch/powerpc/kernel/dma-swiotlb.c @@ -63,17 +63,6 @@ const struct dma_map_ops powerpc_swiotlb_dma_ops = { .get_required_mask = swiotlb_powerpc_get_required, }; -void pci_dma_dev_setup_swiotlb(struct pci_dev *pdev) -{ - struct pci_controller *hose; - struct dev_archdata *sd; - - hose = pci_bus_to_host(pdev->bus); - sd = &pdev->dev.archdata; - sd->max_direct_dma_addr = - hose->dma_window_base_cur + hose->dma_window_size; -} - static int ppc_swiotlb_bus_notify(struct notifier_block *nb, unsigned long action, void *data) { diff --git a/arch/powerpc/sysdev/fsl_pci.c b/arch/powerpc/sysdev/fsl_pci.c index 918be816b097..561f97d698cc 100644 --- a/arch/powerpc/sysdev/fsl_pci.c +++ b/arch/powerpc/sysdev/fsl_pci.c @@ -114,6 +114,15 @@ static struct pci_ops fsl_indirect_pcie_ops = static u64 pci64_dma_offset; #ifdef CONFIG_SWIOTLB +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 = + hose->dma_window_base_cur + hose->dma_window_size; +} + static void setup_swiotlb_ops(struct pci_controller *hose) { if (ppc_swiotlb_enable) {