Message ID | 20181114082314.8965-28-hch@lst.de (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <owner-linux-mm@kvack.org> 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 4CE0114DB for <patchwork-linux-mm@patchwork.kernel.org>; Wed, 14 Nov 2018 08:25:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 41ABE2A654 for <patchwork-linux-mm@patchwork.kernel.org>; Wed, 14 Nov 2018 08:25:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 358892B020; Wed, 14 Nov 2018 08:25:00 +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 C10672A654 for <patchwork-linux-mm@patchwork.kernel.org>; Wed, 14 Nov 2018 08:24:59 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 129BD6B0291; Wed, 14 Nov 2018 03:24:44 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 07FAF6B0293; Wed, 14 Nov 2018 03:24:43 -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 E3ECF6B0294; Wed, 14 Nov 2018 03:24:43 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pl1-f197.google.com (mail-pl1-f197.google.com [209.85.214.197]) by kanga.kvack.org (Postfix) with ESMTP id 9A6616B0291 for <linux-mm@kvack.org>; Wed, 14 Nov 2018 03:24:43 -0500 (EST) Received: by mail-pl1-f197.google.com with SMTP id w7-v6so11549792plp.9 for <linux-mm@kvack.org>; Wed, 14 Nov 2018 00:24:43 -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=R+NsCdiJ6OR25IsWnbvVao2HBLLVxx/Amdmkx6kSLEU=; b=P+9B4KfxwK05xWSPH6UiTC00fcDLHHBGskb4Ekf4ivTrk30KpwPG6BcxhHy9c1G2UV nfbtGjYUx+C/viHs3a3bpSTUjhi3Nzfw7WzgvpDpaqRTO1CTYEEiOO06xvoE3BKsy419 MHEQHX5Mm9dVala5Lsp53WdFAi8WsFpIxr7QPJjZKU9re6mOHeTKhiCbMa/MYG9+u49N DQj2k5YP5TAEmTwzTXcDMhL+T5khpzTFLmxyjEfZ9OGOBKiiXFT78fIQwwPhfFkJG+XG T6IY/YgiflU5uUBYjr21+CNSVE+iWtmIXDzRI5V7Wb7uoGw76SKnDQgEc6ARY9GEJEMM 6H9Q== X-Gm-Message-State: AGRZ1gI05GI9/fjp8172hCIZi69xE5/yIRA0efTfOF2RREYkcZ4rgYxH DG+4lNy2oV0nR8dWFxUHOmQVLmfFRKcZnNhooY8v5BdwgzN1Kwxjf2Sv7Zgn5kht7p6/zZSYytL Pa6mFFASW+pctnIL+c3AUvdh93sPSItoLHiptRCtmqtd9F/gA6N7J0KeuoAwGoWQ= X-Received: by 2002:a17:902:9a44:: with SMTP id x4-v6mr944053plv.121.1542183883298; Wed, 14 Nov 2018 00:24:43 -0800 (PST) X-Google-Smtp-Source: AJdET5fzWGigZLVuGIqISOGivRQdXntletGqWzEv3Mwn5bow1oKxgMoG+O6BJsbuUHcaWJlHWPwi X-Received: by 2002:a17:902:9a44:: with SMTP id x4-v6mr944029plv.121.1542183882648; Wed, 14 Nov 2018 00:24:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542183882; cv=none; d=google.com; s=arc-20160816; b=skiuC0hJXWtLaJdKUkdi9iVnHUx1Z1VvzThmePHxeRAJVgkenLnfrXw2X5YwR9HKX1 /YZhqeEuXt/j5Z5RnXBygrRrjYlCjr6DfvOyeQyJEapJ3BOvEq/0r75Xb4dDTXrEzwkI XvlFEpV0llhNRNkU0QhJNSZuSXji+8UbSsvPYKoH2Wva66WjG8vrjeWinhuy+dnPNWtn f1TQlJQcuTfsE+q284kLw3Nlk7BZmNYDs2rlwfYWTlK3MZrcgcYW/frACrbPWJdukO0j aOJumfsmsnqc2AcqOixs3VAT3NvIEFD/MP2HmZY2XiCJ5Gsb4JpHemfUtsbzlDyefaCo HMTA== 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=R+NsCdiJ6OR25IsWnbvVao2HBLLVxx/Amdmkx6kSLEU=; b=d6l1PZN1lQwC3KwdLLYc94+MPntr0Bk9YbOUsZeArZ6gC30+UrjeesTzhQJkNKNO1W QKxqnR4ubP5ab3+CkBpyE3IWVsaTSiXTGEXHqQtgrfTSIz7N0LZqzyHqzXgjfuMzUkWT 6t4OZJeEDdO67FpBjp2XdnTczqC/kWoLNCJGKmlwnIgOzgw42cQ+B5VKMp0RV+fXQzbm DSn9rsGqlGZLCsY/dMIYOfodiAsN4Q784CzwNBUlhFty/eIacLEEcHa/U8FQeufGBymi 1qd+3R4WcVMahF2ghRsprv0PGyN9hTZ6y0ejXuqCreClA5T1ohIxAErreScdJxqD4RD8 Ocpw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b=qm89D7lG; 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 1-v6si26874695pls.0.2018.11.14.00.24.42 for <linux-mm@kvack.org> (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Nov 2018 00:24:42 -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=qm89D7lG; 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=R+NsCdiJ6OR25IsWnbvVao2HBLLVxx/Amdmkx6kSLEU=; b=qm89D7lGX6PXs+rUtwta8QxDfO IHa4yBi0H94R4fQioUbPJnG7W3bdM2bJsGn+Z4WB6hXyNHCkErz1AcESeqYKsCsVwrMIKQjrmyw1T DBtya5l/1LQsPhETUS4u2Wwg7vKZSgpnhsb+HXP0gc+P8iJPQiRjHzypBf/1XZDz9HfPNUCwwePYE zqCh/v4oQn/5EqKRxggkkgvBYFtGlylpFENabb9oBRgjA+cnqEMbDNDH1qEY0NCAplzzKfGKI97TY 9NQ2K+gal8BpXqbucBz/+BhX7IP2mRPlZK141+hDOC84JWwAtJrjWiGp/BnkaZCepjvyytLo+TWwi BTceVB3w==; 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 1gMqTO-000553-Jy; Wed, 14 Nov 2018 08:24:31 +0000 From: Christoph Hellwig <hch@lst.de> To: Benjamin Herrenschmidt <benh@kernel.crashing.org>, Paul Mackerras <paulus@samba.org>, Michael Ellerman <mpe@ellerman.id.au> 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 27/34] powerpc/fsl_pci: simplify fsl_pci_dma_set_mask Date: Wed, 14 Nov 2018 09:23:07 +0100 Message-Id: <20181114082314.8965-28-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 <hch@infradead.org> 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: <linux-mm.kvack.org> X-Virus-Scanned: ClamAV using ClamSMTP |
Series |
[01/34] powerpc: use mm zones more sensibly
|
expand
|
diff --git a/arch/powerpc/sysdev/fsl_pci.c b/arch/powerpc/sysdev/fsl_pci.c index f136567a5ed5..296ffabc9386 100644 --- a/arch/powerpc/sysdev/fsl_pci.c +++ b/arch/powerpc/sysdev/fsl_pci.c @@ -143,7 +143,7 @@ static int fsl_pci_dma_set_mask(struct device *dev, u64 dma_mask) * mapping that allows addressing any RAM address from across PCI. */ if (dev_is_pci(dev) && dma_mask >= pci64_dma_offset * 2 - 1) { - set_dma_ops(dev, &dma_nommu_ops); + dev->bus_dma_mask = 0; set_dma_offset(dev, pci64_dma_offset); } @@ -403,10 +403,6 @@ static void setup_pci_atmu(struct pci_controller *hose) out_be32(&pci->piw[win_idx].piwar, piwar); } - /* - * install our own dma_set_mask handler to fixup dma_ops - * and dma_offset - */ ppc_md.dma_set_mask = fsl_pci_dma_set_mask; pr_info("%pOF: Setup 64-bit PCI DMA window\n", hose->dn);
swiotlb will only bounce buffer the effectice dma address for the device is smaller than the actual DMA range. Instead of flipping between the swiotlb and nommu ops for FSL SOCs that have the second outbound window just don't set the bus dma_mask in this case. Signed-off-by: Christoph Hellwig <hch@lst.de> --- arch/powerpc/sysdev/fsl_pci.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)