From patchwork Tue Oct 9 13:24:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 10632577 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 93E7C112B for ; Tue, 9 Oct 2018 13:27:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8CC14289DF for ; Tue, 9 Oct 2018 13:27:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 816B928A5D; Tue, 9 Oct 2018 13:27:45 +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 173ED289DF for ; Tue, 9 Oct 2018 13:27:45 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BB8016B0294; Tue, 9 Oct 2018 09:26:42 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id B4AA66B0298; Tue, 9 Oct 2018 09:26:42 -0400 (EDT) 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 9E70F6B0299; Tue, 9 Oct 2018 09:26:42 -0400 (EDT) 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 47C316B0294 for ; Tue, 9 Oct 2018 09:26:42 -0400 (EDT) Received: by mail-pl1-f197.google.com with SMTP id f5-v6so975523plf.11 for ; Tue, 09 Oct 2018 06:26:42 -0700 (PDT) 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=rhvZ9hpGPuuxCEIVPRN0AfR1n9umfTu+Rj50rDnMvn0=; b=rQZNtocuSJCvcRe3C30o7BXhxlixGMi9aWwcpRNND10kdtgQz2HlQlwNveX+mTdOZ3 rnB+1yu1aeqA91YDQG4wozdgq1/1yjtlKKkBAtXoXifwH30nt4r9OmO+JraXnyN8qQQY QfV1WwfbnXhXWE2XxvkkJddhRyUeBGbrpJ2dPnpNoFYE9DONfBi/L3N7wARfddwSg7KV bgC94BVfwyw1fFy+kfSGRFfEBFXsgjaL1YesSeH/TopG+Ax+CnRQs0N6pdmPG9lUsos/ fNvvmnRxdXga+CUx4CVaTy+fVW7haKascwooaDyJXNIaNL+HVJiXEjTuiGlHvPUxOq9u R5NA== X-Gm-Message-State: ABuFfohfpXoyCuyWqze/VUi+rbFuZtJRiXqlQfEZqdWzgi/5dMvkpU7h 1DVN314hRkKLHdBUOKqESw5yPXB9irCzsv1FdpHJAeKMqALpTBr+02aGWfXV5sl334wA8Mwomaf 7PRvlOZ42NKLHWr7NLRqf08nBdQ7iICwjzaDY7wcVtfGUK+OmEG6sheDvMAk/puU= X-Received: by 2002:a62:85cb:: with SMTP id m72-v6mr29892401pfk.173.1539091601989; Tue, 09 Oct 2018 06:26:41 -0700 (PDT) X-Google-Smtp-Source: ACcGV61o4CUzvr+qOFimcY74DNpZEdfMLI5A9gXSbe+vZHyalQBobPF5jBg3BlWf2/D9ImecM4uT X-Received: by 2002:a62:85cb:: with SMTP id m72-v6mr29892358pfk.173.1539091601216; Tue, 09 Oct 2018 06:26:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1539091601; cv=none; d=google.com; s=arc-20160816; b=McOT2wGocRFJ/9LQurC9Nfc/vnxUNJWIdg0VU6EmWdnlGSfnNCbLaAj07auWOIxaAr +y33EkZpCdf+Vxzqb0HjiuNDPytYfr9xVZmotZ8asEoGPxH/iRNkv57lbSPd1pcugABx CA3Yoh0x0G+WtwyFaBOaqNx5Ng7/vH0+9Ie5BZ/q09ZkVAA4/VObr1lbFOtBsa/043Dy gSzMDTjvI3DKc+oYWUvYjxW676eO76CObESLsHQE7tQm8nFrI4yyLNlcXtUsClzrLKQT 18JYpV5JDY7znDleUIQP0CT5XqucnsldfpbyeFpQTEsn4BWSftQrTE05d1PbES3qVRZj YAAg== 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=rhvZ9hpGPuuxCEIVPRN0AfR1n9umfTu+Rj50rDnMvn0=; b=X7l6UHM2xM5mUExAWq3bQt0ZQQz5Q2WD1Xqz1MT+D45CFKNBbsAmLvqXgt6x+GPutu GezLBV241qZm4s7ocMvb93lrFg03G1begXPYY98PjX1VzVa3hgiMzMgS+Eb3F0gIXumk ezf4g2L3tX8CaFFN66TuPJIJyUuHYCbhV3+AeE4QR6g3aOIq9GeQkNFX1zD15uPcEtgV 6PCA653pLOMU6m3MuZpfcXvpng0EQXdkDstbRF11oc6aMGNGUaRXCPdIna2lK+CBpnON sd2Lin8s+0+XWUuFm5Hngui7kpevijoSeWzto3gr6DwDWxgv5/r18MH0rD3EN2ivd6pS rbAQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b=tIPTZV00; spf=pass (google.com: best guess record for domain of batv+39c443e67938b060f200+5525+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom=BATV+39c443e67938b060f200+5525+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 16-v6si27379086pfc.21.2018.10.09.06.26.41 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 09 Oct 2018 06:26:41 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of batv+39c443e67938b060f200+5525+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=tIPTZV00; spf=pass (google.com: best guess record for domain of batv+39c443e67938b060f200+5525+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom=BATV+39c443e67938b060f200+5525+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=rhvZ9hpGPuuxCEIVPRN0AfR1n9umfTu+Rj50rDnMvn0=; b=tIPTZV00fcQtIlC3PL5dfu7G1m s5PDg5sM2GO4v6FDj1h95I9EvzJjKhy78N1Yhl963NGJ4q8l7M87quNsuK6TAcgA0FnZkGF7L6M3R sCXfhaSIG9gmRbeTC/mrYMcjNtOU4MquxVUF8qEcF7ld+tvHiWlAt9EXHLeCdfpKQHo9oI1uQk7sW 1QwOxcMBAVRSMC8O5QBWT9AMk5Dow2eUCHWUHIlPtgFmKULPrfJzl8dIGklp5FLEcm9HmMcOp8vFM foaJpKDlE/sSsnoiUr0dtaoS8rtZpJeSOljP95oiUU5jlbFYNSjqQFIZTYuFsR56h+0aGs1p+g0Fp Fa6712tg==; Received: from clnet-p19-102.ikbnet.co.at ([83.175.77.102] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.90_1 #2 (Red Hat Linux)) id 1g9s1Y-0001VV-M9; Tue, 09 Oct 2018 13:26:09 +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 26/33] powerpc/fsl_pci: simplify fsl_pci_dma_set_mask Date: Tue, 9 Oct 2018 15:24:53 +0200 Message-Id: <20181009132500.17643-27-hch@lst.de> X-Mailer: git-send-email 2.19.0 In-Reply-To: <20181009132500.17643-1-hch@lst.de> References: <20181009132500.17643-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 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 --- arch/powerpc/sysdev/fsl_pci.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) 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);