Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp6399200imu; Wed, 14 Nov 2018 00:27:01 -0800 (PST) X-Google-Smtp-Source: AJdET5fEWMaO4f7oIuDakUxBSr/G8dOzb5fyjuFxGUueNJ5t0kw1VAQcu4cS7Pgh82J5GsUo8Ica X-Received: by 2002:a63:554b:: with SMTP id f11mr903899pgm.37.1542184021336; Wed, 14 Nov 2018 00:27:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542184021; cv=none; d=google.com; s=arc-20160816; b=wfYdLRRn251P8SSsS3L+EALD6YpSLYs4u9+Xx99mJzAewLhoF919KLyg9B7wgnzIp1 juZDncts+G4IMr+dayUkCMjoFoC3H534BxpCSZuZq5bXRPBv9p0FN8EC/qFxEtRsgoj9 F6d/CBauoq7ky2WbYQp0q1ZDXCJ0VaBk3TBjpHhTz+7icGP8EjwbTIBr38K0z8Ux5f8t CRLV/kbIEjSWCEPRQxrbw1SJNsyF+MH4vsfpQtDjkaSzWNMCYag23FiZvxJgtZg34Kpk R15BiwsrqDok2l1GhEjWzFBoQrmO15wqS9zgJFiuRI1mCmWDhzPuz8tHaIcFHr+YHpqt 7eWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=R+NsCdiJ6OR25IsWnbvVao2HBLLVxx/Amdmkx6kSLEU=; b=izMzqyaifn9SCBbHcg0XyFz+w7TstSUJytI1KslXBpcN5wyBrx+LksD3kREaqI1v0Y DBPiJETfwxpiyISB7YrH/CBVP+DFP4UacPbeyS5JIaNpiMe1McpMfAx0jKv5/2BbBLVk tnOStTP7f0G4ApLyrORRlyiyc9TFSdnS9rIn8xX68a63ySSIGzM8ZvNTccLILuVjH5XJ ybf9I+a8GIGa0fCCdFpDDjNjXDvBe2XbpkUwwLyfo0WnfYkrF9WZAL9jY6FugC61goQW mUs6w+23opF8XEXVT8Vzd3jWYPz2t73yMGcZnfHE0XqmXBoMzHOtnyd2Bvq+rKxBX9IE 63Kg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@infradead.org header.s=bombadil.20170209 header.b=qm89D7lG; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p12si12827273pgj.56.2018.11.14.00.26.46; Wed, 14 Nov 2018 00:27:01 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=fail header.i=@infradead.org header.s=bombadil.20170209 header.b=qm89D7lG; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733010AbeKNS0z (ORCPT + 99 others); Wed, 14 Nov 2018 13:26:55 -0500 Received: from bombadil.infradead.org ([198.137.202.133]:50004 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728391AbeKNS0y (ORCPT ); Wed, 14 Nov 2018 13:26:54 -0500 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 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 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 by bombadil.infradead.org. See http://www.infradead.org/rpr.html Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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); -- 2.19.1