From patchwork Wed Mar 21 06:55:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nipun Gupta X-Patchwork-Id: 888574 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-tegra-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="UPyFy4Kx"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 405gZR6HjRz9s0n for ; Wed, 21 Mar 2018 17:56:31 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751714AbeCUG4P (ORCPT ); Wed, 21 Mar 2018 02:56:15 -0400 Received: from mail-ve1eur01on0047.outbound.protection.outlook.com ([104.47.1.47]:3180 "EHLO EUR01-VE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751661AbeCUG4K (ORCPT ); Wed, 21 Mar 2018 02:56:10 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=pTU/o7/+sYzd7Ei++D/McuII5JcM/Vo5HlDTK3Oy7GQ=; b=UPyFy4KxKKghvQmfrFm2/3g2zqnPDNYua4TyJYMZa5pqG/5BO4fkBtovdEYYuDdR3fsNjjj57wRPSQvF6J9FZ/SZ0A2RpHr8Bsv66x30jzesAffamvaezfN6llk3hil1al6F0j9zaUHp1gLMOgt20cyZcqopF70ysf+591FVq48= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=nipun.gupta@nxp.com; Received: from b27504-OptiPlex-790.ap.freescale.net (14.142.187.166) by VI1PR0401MB2431.eurprd04.prod.outlook.com (2603:10a6:800:2a::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.588.14; Wed, 21 Mar 2018 06:55:58 +0000 From: Nipun Gupta To: robin.murphy@arm.com, hch@lst.de, linux@armlinux.org.uk, gregkh@linuxfoundation.org, m.szyprowski@samsung.com Cc: bhelgaas@google.com, zajec5@gmail.com, andy.gross@linaro.org, david.brown@linaro.org, dan.j.williams@intel.com, vinod.koul@intel.com, thierry.reding@gmail.com, robh+dt@kernel.org, frowand.list@gmail.com, jarkko.sakkinen@linux.intel.com, rafael.j.wysocki@intel.com, dmitry.torokhov@gmail.com, johan@kernel.org, msuchanek@suse.de, linux-kernel@vger.kernel.org, iommu@lists.linux-foundation.org, linux-wireless@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-soc@vger.kernel.org, dmaengine@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-tegra@vger.kernel.org, devicetree@vger.kernel.org, linux-pci@vger.kernel.org, bharat.bhushan@nxp.com, leoyang.li@nxp.com, Nipun Gupta Subject: [PATCH v2 1/2] dma-mapping: move dma configuration to bus infrastructure Date: Wed, 21 Mar 2018 12:25:22 +0530 Message-Id: <1521615323-4752-1-git-send-email-nipun.gupta@nxp.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1520868292-2479-1-git-send-email-nipun.gupta@nxp.com> References: <1520868292-2479-1-git-send-email-nipun.gupta@nxp.com> MIME-Version: 1.0 X-Originating-IP: [14.142.187.166] X-ClientProxiedBy: BM1PR01CA0090.INDPRD01.PROD.OUTLOOK.COM (2603:1096:b00:1::30) To VI1PR0401MB2431.eurprd04.prod.outlook.com (2603:10a6:800:2a::24) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 1c035eef-e2f5-45c4-84cc-08d58ef8d059 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(4534165)(7168020)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:VI1PR0401MB2431; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0401MB2431; 3:5Vn0cNTwmbYoXPXVq2J4O5diJq/ZbkIcKJw8Orj4OWt9VSVJB1YJrnDq31yEPN97w+sVLN1s61Z/mInqaLne+RA3VRd6AXd95pjZh2K5r7j2L640TNbJOgPPJGLkmnnKoIVGQtjJ9c1nbd5cHjoTJEF5WcnGZte6Zx67nZ8df4gj+Mo9ReIYBVMpk5/AIPwxHD2QtX+1mTnbiJmpUgjDOcdb3CYk4vUBUn92pnSPYRyVPa1z3UMCQU6XFpFhdjy3; 25:qUz1z1YVT/jSAdb2tcv4bXoUtpqrZBeqd6UwvsgFNPyRJ8hgS+hE/tevP6/DrLXRqFe2OVCfYqgA/z5MQY9bCfRj1P1dlhOIrVObEABnozy8Qk37+IABc3MLxT4jcQj6OzKNemjf+5bF/WZgHPLbZHi9gyLE2vytejhUQvg6+PKpsPmifeA+peYxtILQL4+Q2D/J9d3vE4D8W+Hs8EpsxL17IbUVTlI5bpzM8bguiSU81u+2E5OqvtYA+S5R95EC+BrjXa99iAY2nRDeXuuneASYJ3AQLfcmu3/UjjhSxhtwPxuYACq/z8NHIy9Vuymib2sr9UVNzSj9gb8fSwBHmA==; 31:mCG7BwaZ9PVhZ3VADlmne7eR9Fd66qIhPYtKEfvfotQJlcptpVOzZHi7dNU5zF7Q/zb+yYYXw/YorZn3k1mLQhxmRK6MGHYMvlcmDJqj+yXNZl7MGf+Hm1wAMNsnWMAfZ2b4vlSsLfatgVFNL84alOm6Pyd1M1VNZbzsZ38ZNUeLQRkTXf/8rH98pQkKrieofpqzstD1dOdTq8jCotOlNtcpUdOKBcVAuTJFCNyM2jU= X-MS-TrafficTypeDiagnostic: VI1PR0401MB2431: X-Microsoft-Exchange-Diagnostics: 1; VI1PR0401MB2431; 20:zUXEj6RYUGWXMk6fATyz9dNJRvfc8uEcrV3kTUtNNPCGh6iSkK1+Y1efbcaxi8MvSnyrlQOpMiqtXvTsqC7cYpRnA0rbdO7h856D1x313OFeziauU9ylOlR6owJ8KWxfByQR7hGP807RnK/f/m/B8QVfC5TXD0Se/F+yLdm2/+06dAe58ILZtVGlfTRPHpq72+QL5N0RxUKWbSnzsTRqNg1lt0DrhBhbu5DDLGZLTF98tzMyvlz86iS6d8BbfqlPZNIPflvK9ozUyOYKK638axL++pRSuzrxIKRNb4cYoHUSLUKIh2w773ZWX7y4nnK/FPObyaHIKtNVsaUP7cG5eAIPdG9HB4HwrAORUhamyuVVhWZ3gTJih2nxzw3e1m2me2D4ClyRjUX8a+koLwJJt8GW25AuzUOqkrBhwDU2fr3CpmJnX8VFQXmck6WXcV3QlERuDsSs7a1mmg6KL3BJLHejDhWyKTWyKYyt63n2lTfckwbuoTPSy+pXBJZ5YhjH; 4:KaVWg1xJDVGTSYHg2JsXvPdy2Azg/ShilX2MKwuhkqU98U7cszh08mg80SB5xeiPJN7DNM+77TM3ZalgnTIQu3pAJf9xtcOrEmzF97+MHwASvdxVgOAR8F78ckcNiZq2Aj5SvctQAcF6YEioxvfjWy3mq3XtgIKHSpiuXkyPoTAS8CU/7CSVmyVK4vkK1XKlYQottH2sXV38JtnjVSqEZptTcbg1gULsIY93du6RgI4A3JjSbrYKTMJnpv3/zvAwOQyMHyw+HiptVPAF1/AJ68FS+B+YniR/byegb2CXxLYqTqiF5lvOQUiWG71J0J/a X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(10201501046)(93006095)(93001095)(3231221)(944501244)(52105095)(3002001)(6055026)(6041310)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123560045)(20161123562045)(6072148)(201708071742011); SRVR:VI1PR0401MB2431; BCL:0; PCL:0; RULEID:; SRVR:VI1PR0401MB2431; X-Forefront-PRVS: 0618E4E7E1 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(396003)(366004)(346002)(376002)(39380400002)(39860400002)(189003)(199004)(50226002)(2950100002)(7736002)(966005)(4326008)(86362001)(36756003)(8676002)(81166006)(478600001)(6486002)(316002)(81156014)(66066001)(305945005)(47776003)(6666003)(2906002)(8936002)(5009440100003)(6116002)(97736004)(16586007)(3846002)(186003)(52116002)(51416003)(76176011)(5890100001)(105586002)(39060400002)(53936002)(106356001)(48376002)(59450400001)(6512007)(5660300001)(16526019)(25786009)(68736007)(386003)(55236004)(6506007)(26005)(6306002)(7416002)(50466002)(110426004)(357404004); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR0401MB2431; H:b27504-OptiPlex-790.ap.freescale.net; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: 1; VI1PR0401MB2431; 23:l7aYbUVgCn7K/eSx4mDbqPcBjv4i1YOyvhKnrRBSMRoDP0yKWiTle3jt0dZDl10v/XQmc01BFTN7NCmgGLf+hmGENkIb2XsYU6eLkSeAeONueUxk+mrZ3pJRlqX1PlfT5DVqX/1sRuQQymwlym7ZKrTOWAzM7VedgWGkJrh13oSDxzg9QMQt6YU4Bj0RpOaYgU9kq1rAKNmMoDhvMmHjx32DqZembiZfMqRZ3Ywy6bDWsdhcITPfM7xJJ8isZ8OZsK8E+32SuiFs8ZLawRDcpDFvyRuXMXYL2VxTPVt053tmRQxvXOcBKY++/wzgWJ2FmHsuWxrAGQNf2uI+tQgFvutnU5yT41QjASHLxjRpPLoZsSxryoUM2SW01jvpPd8aMSiuy3ScxuJxyq6ko/3209VAZXJMb0d2b2HbEcY4Z6mhhtXLEL8Ap81XKNoqhh+i3rdLjMgJETjLLZmzGJTk3qYy1BEjlPv9pIirxE7gHbqoF/o0Uh0dehXTo4OmNWRFsAYQRo2xF2TvhzmM3rvu9oIqG2UckKML/V8uCon+/o6XG5/A2vc6VmfcWW0jVa2yqFIjlmfjHRLIkpl8hUnBmilH8OO0XDy/RLTR1yOTRTIIRJiT26g0JRjXJ1+/zLwD1U5ja4SUhQSYrqlzp/olNjPk65XYQlZbeVGf3eEBLi/FCpeMlZTOsvgmGISCMM4UMjXdrdEGmmVI83RAtAjSyrw9WUGXSgAipkVkC50FwoHWUEA9KMhZed0Y9CPTIW/DcLzQwmGjc9lpfycsX41uE6w8eJu17Bf5kHwDFCy8c4O5EBgVvXLOr5FjS2oyPhR0NnE8CyCDKx/EexZqSMNohAfQ8KJveNS+Y3RB6gwgdQGQEP+xZhUvgXu+COaI3nKcR0cjiQWvoJ767Ocherb0nbF+sKTZGG8mC/uIvdJUHyJSOf2ASxzA/2+7+KNUmbOUkuWFgFG4r8PoytuhSnPQilj9R1O7FSI71qgYAScb/myPsKmKkFexyNs86ZPe8xaa0PYmdqeHCRneQX6uiqWM5wh5qA121E/dyL199lv5ZLOsndHYhiN2KjNO8QCOGCWfq9M0L/oublcxt49r+7xl9F2THmCXyKz6JZfp2l43VCtsFUk9Sm692WTLPlDj20GVx2oSRDVvcJJy8Nof9yZgquyGA2qAg3IpG/yLoN7EnP5O2SQkFfjkY1sH+0qf9Ihk9p5vudZonvySMRD9gVhjlKTAxbetwhZr5RSGTN7L+x5mByIbV0X/9cTe91IyllAAXNeHXPvJdNjDQ/9BHQuq+hf3LcuRQmEENH1OgUsHWEE= X-Microsoft-Antispam-Message-Info: mDVW7Om5BFwy4rB+OChEloPV91fCdUlML0sVF4OpuMSywGa2S8pFmTGCwt6qBJTYDc9h7ntQ+PyR7FbVps9LX3N0tGozZu0lDV2mI26zabdzU4jOQxNm+Ttbx6DwJFcM7HlG0EvXlbLMrlX9/op6pjatDLGO8fX0imIPA1IcmdfXDcXkC+rfeoJfkj2nXnVT X-Microsoft-Exchange-Diagnostics: 1; VI1PR0401MB2431; 6:9c3BIwYoq1L3l90653NYlfdyHxPKO/FuVSDCIaO+0PZkYD3/yhzsI4k2LQRfC/Who2WAG2JcSmOTS46nItA8l83rsIFCAdhxJG2MwDMA1Gj8BC8itp1budjTFHWGSGFfwt+nFC/Qnfo9ZZugIEXGYhzn3t3L1Fv3YDpQBxS9IHLBP6a0I8nzxXvE9WVxep32+7TJ0CPkyr6O0fPU1KHqOFbHXIbYCkZmMrIPIcODOSfix1la0JErNZq4cXxt5vHycYjLichfFY5dwT9D8vOa0rXntahkQ5Fkv4NisQfelb71MR1S48lT8JVy6WY5zPe2ihe6ee0qbzatjIOS2g8PSuTYBmRI8a9PE3ol7G/Ww6w=; 5:ea6FcYrvHzKPjMQfuzezgGHOsGOZsn9qZ1WqFp5GvZNsoJpB7VXo/NcJVoQ7vPZGKa+b9YG3WXXxW7zUJdkZg7N9ghrfd/61HRU2v9H3q2DPyPep8yx10IVpAMyhIKksFlYi/0YcticUrbZUCWzEDmHye+FgTD9Rh1g/ffSzX2g=; 24:m+CTGBRYMInPMZ5/+xP3XPd1D+GKpYnPp2XAN/2qkp/Dco7ZavoEPOHnLodbVDHmyPRXQQifpD8viPQyds983Huu63BHj7TG2BYhB61GPzs=; 7:peFTycMMn+lATLXzm7AySuTJw3AZw1UvFZHxpNKdFmWWMZAAdChDC2I5CMtkQ6sZ48APCyfokwkkSdIUPHeCIGg61pCE5c83WcRb/bQVixr0nnV0cRe5K30zaUIFRcGHP9oA+FeGD+NCBmif+6SrWUWpCTVbj1AXvLAp+cldxGd33d54IyeqGIyHH+2aMkPoSDcgEhC6W7TYb2Gx9K+8mah3++2o41q8l26WmlmJ6X2zgn4osH5wxYINgsXqMN4C SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Mar 2018 06:55:58.0728 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1c035eef-e2f5-45c4-84cc-08d58ef8d059 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0401MB2431 Sender: linux-tegra-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org It's bus specific aspect to map a given device on the bus and relevant firmware description of its DMA configuration. So, this change introduces '/dma_configure/' as bus callback giving flexibility to busses for implementing its own dma configuration function. The change eases the addition of new busses w.r.t. adding the dma configuration functionality. This patch also updates the PCI, Platform, ACPI and host1x bus to use new introduced callbacks. Suggested-by: Christoph Hellwig Signed-off-by: Nipun Gupta Reviewed-by: Greg Kroah-Hartman --- - The patches are based on the comments on: https://patchwork.kernel.org/patch/10259087/ Changes in v2: - Do not have dma_deconfigure callback - Have '/dma_common_configure/' API to provide a common DMA configuration which can be used by busses if it suits them. - Platform and ACPI bus to use '/dma_common_configure/' in '/dma_configure/' callback. - Updated commit message - Updated pci_dma_configure API with changes suggested by Robin drivers/amba/bus.c | 7 +++++++ drivers/base/dma-mapping.c | 35 +++++++++++++++-------------------- drivers/base/platform.c | 6 ++++++ drivers/gpu/host1x/bus.c | 9 +++++++++ drivers/pci/pci-driver.c | 32 ++++++++++++++++++++++++++++++++ include/linux/device.h | 4 ++++ include/linux/dma-mapping.h | 1 + 7 files changed, 74 insertions(+), 20 deletions(-) diff --git a/drivers/amba/bus.c b/drivers/amba/bus.c index 594c228..2fa1e8b 100644 --- a/drivers/amba/bus.c +++ b/drivers/amba/bus.c @@ -20,6 +20,7 @@ #include #include #include +#include #include @@ -171,6 +172,11 @@ static int amba_pm_runtime_resume(struct device *dev) } #endif /* CONFIG_PM */ +static int amba_dma_configure(struct device *dev) +{ + return dma_common_configure(dev); +} + static const struct dev_pm_ops amba_pm = { .suspend = pm_generic_suspend, .resume = pm_generic_resume, @@ -194,6 +200,7 @@ struct bus_type amba_bustype = { .dev_groups = amba_dev_groups, .match = amba_match, .uevent = amba_uevent, + .dma_configure = amba_dma_configure, .pm = &amba_pm, .force_dma = true, }; diff --git a/drivers/base/dma-mapping.c b/drivers/base/dma-mapping.c index 3b11835..48f9af0 100644 --- a/drivers/base/dma-mapping.c +++ b/drivers/base/dma-mapping.c @@ -331,38 +331,33 @@ void dma_common_free_remap(void *cpu_addr, size_t size, unsigned long vm_flags) #endif /* - * Common configuration to enable DMA API use for a device + * Common configuration to enable DMA API use for a device. + * A bus can use this function in its 'dma_configure' callback, if + * suitable for the bus. */ -#include - -int dma_configure(struct device *dev) +int dma_common_configure(struct device *dev) { - struct device *bridge = NULL, *dma_dev = dev; enum dev_dma_attr attr; int ret = 0; - if (dev_is_pci(dev)) { - bridge = pci_get_host_bridge_device(to_pci_dev(dev)); - dma_dev = bridge; - if (IS_ENABLED(CONFIG_OF) && dma_dev->parent && - dma_dev->parent->of_node) - dma_dev = dma_dev->parent; - } - - if (dma_dev->of_node) { - ret = of_dma_configure(dev, dma_dev->of_node); - } else if (has_acpi_companion(dma_dev)) { - attr = acpi_get_dma_attr(to_acpi_device_node(dma_dev->fwnode)); + if (dev->of_node) { + ret = of_dma_configure(dev, dev->of_node); + } else if (has_acpi_companion(dev)) { + attr = acpi_get_dma_attr(to_acpi_device_node(dev->fwnode)); if (attr != DEV_DMA_NOT_SUPPORTED) ret = acpi_dma_configure(dev, attr); } - if (bridge) - pci_put_host_bridge_device(bridge); - return ret; } +int dma_configure(struct device *dev) +{ + if (dev->bus->dma_configure) + return dev->bus->dma_configure(dev); + + return 0; +} void dma_deconfigure(struct device *dev) { of_dma_deconfigure(dev); diff --git a/drivers/base/platform.c b/drivers/base/platform.c index f1bf7b3..d2d5891 100644 --- a/drivers/base/platform.c +++ b/drivers/base/platform.c @@ -1130,6 +1130,11 @@ int platform_pm_restore(struct device *dev) #endif /* CONFIG_HIBERNATE_CALLBACKS */ +static int platform_dma_configure(struct device *dev) +{ + return dma_common_configure(dev); +} + static const struct dev_pm_ops platform_dev_pm_ops = { .runtime_suspend = pm_generic_runtime_suspend, .runtime_resume = pm_generic_runtime_resume, @@ -1141,6 +1146,7 @@ struct bus_type platform_bus_type = { .dev_groups = platform_dev_groups, .match = platform_match, .uevent = platform_uevent, + .dma_configure = platform_dma_configure, .pm = &platform_dev_pm_ops, .force_dma = true, }; diff --git a/drivers/gpu/host1x/bus.c b/drivers/gpu/host1x/bus.c index 88a3558..fa9896d 100644 --- a/drivers/gpu/host1x/bus.c +++ b/drivers/gpu/host1x/bus.c @@ -314,6 +314,14 @@ static int host1x_device_match(struct device *dev, struct device_driver *drv) return strcmp(dev_name(dev), drv->name) == 0; } +static int host1x_dma_configure(struct device *dev) +{ + if (dev->of_node) + return of_dma_configure(dev, dev->of_node); + + return 0; +} + static const struct dev_pm_ops host1x_device_pm_ops = { .suspend = pm_generic_suspend, .resume = pm_generic_resume, @@ -326,6 +334,7 @@ static int host1x_device_match(struct device *dev, struct device_driver *drv) struct bus_type host1x_bus_type = { .name = "host1x", .match = host1x_device_match, + .dma_configure = host1x_dma_configure, .pm = &host1x_device_pm_ops, .force_dma = true, }; diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c index 3bed6be..b473a4c 100644 --- a/drivers/pci/pci-driver.c +++ b/drivers/pci/pci-driver.c @@ -18,6 +18,8 @@ #include #include #include +#include +#include #include "pci.h" struct pci_dynid { @@ -1522,6 +1524,35 @@ static int pci_bus_num_vf(struct device *dev) return pci_num_vf(to_pci_dev(dev)); } +/** + * pci_dma_configure - Setup DMA configuration + * @dev: ptr to dev structure + * + * Function to update PCI devices's DMA configuration using the same + * info from the OF node or ACPI node of host bridge's parent (if any). + */ +static int pci_dma_configure(struct device *dev) +{ + struct device *bridge; + enum dev_dma_attr attr; + int ret = 0; + + bridge = pci_get_host_bridge_device(to_pci_dev(dev)); + + if (IS_ENABLED(CONFIG_OF) && bridge->parent && + bridge->parent->of_node) { + ret = of_dma_configure(dev, bridge->parent->of_node); + } else if (has_acpi_companion(bridge)) { + attr = acpi_get_dma_attr(to_acpi_device_node(bridge->fwnode)); + if (attr != DEV_DMA_NOT_SUPPORTED) + ret = acpi_dma_configure(dev, attr); + } + + pci_put_host_bridge_device(bridge); + + return ret; +} + struct bus_type pci_bus_type = { .name = "pci", .match = pci_bus_match, @@ -1534,6 +1565,7 @@ struct bus_type pci_bus_type = { .drv_groups = pci_drv_groups, .pm = PCI_PM_OPS_PTR, .num_vf = pci_bus_num_vf, + .dma_configure = pci_dma_configure, .force_dma = true, }; EXPORT_SYMBOL(pci_bus_type); diff --git a/include/linux/device.h b/include/linux/device.h index b093405..1832d90 100644 --- a/include/linux/device.h +++ b/include/linux/device.h @@ -88,6 +88,8 @@ extern int __must_check bus_create_file(struct bus_type *, * @resume: Called to bring a device on this bus out of sleep mode. * @num_vf: Called to find out how many virtual functions a device on this * bus supports. + * @dma_configure: Called to setup DMA configuration on a device on + this bus. * @pm: Power management operations of this bus, callback the specific * device driver's pm-ops. * @iommu_ops: IOMMU specific operations for this bus, used to attach IOMMU @@ -130,6 +132,8 @@ struct bus_type { int (*num_vf)(struct device *dev); + int (*dma_configure)(struct device *dev); + const struct dev_pm_ops *pm; const struct iommu_ops *iommu_ops; diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h index eb9eab4..c15986b 100644 --- a/include/linux/dma-mapping.h +++ b/include/linux/dma-mapping.h @@ -761,6 +761,7 @@ void *dma_mark_declared_memory_occupied(struct device *dev, } #endif /* CONFIG_HAVE_GENERIC_DMA_COHERENT */ +int dma_common_configure(struct device *dev); #ifdef CONFIG_HAS_DMA int dma_configure(struct device *dev); void dma_deconfigure(struct device *dev); From patchwork Wed Mar 21 06:55:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nipun Gupta X-Patchwork-Id: 888576 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-tegra-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="vXHtFH6l"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 405gZX5Z4Sz9s0t for ; Wed, 21 Mar 2018 17:56:36 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751552AbeCUG4e (ORCPT ); Wed, 21 Mar 2018 02:56:34 -0400 Received: from mail-ve1eur01on0051.outbound.protection.outlook.com ([104.47.1.51]:18743 "EHLO EUR01-VE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751753AbeCUG4Z (ORCPT ); Wed, 21 Mar 2018 02:56:25 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=7gTQp27VhQEorgvP76OLbB7MxPSdzM8+uND9L3ssi3I=; b=vXHtFH6lWCg2pzJGMsYZ3f5LwSHKyRMrjQxdETh0Icvd+NmZSgR/8omimjWJsSqVuBhguBO9s0UI7T48a8ElcJkhuHs72Y77mRpjdn1fZX4+gazKf5ud/d/w6wOxqqvrnGlGnYrvspMyFz55AQoCiQ71903becz0LmZnDA+2smU= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=nipun.gupta@nxp.com; Received: from b27504-OptiPlex-790.ap.freescale.net (14.142.187.166) by VI1PR0401MB2431.eurprd04.prod.outlook.com (2603:10a6:800:2a::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.588.14; Wed, 21 Mar 2018 06:56:13 +0000 From: Nipun Gupta To: robin.murphy@arm.com, hch@lst.de, linux@armlinux.org.uk, gregkh@linuxfoundation.org, m.szyprowski@samsung.com Cc: bhelgaas@google.com, zajec5@gmail.com, andy.gross@linaro.org, david.brown@linaro.org, dan.j.williams@intel.com, vinod.koul@intel.com, thierry.reding@gmail.com, robh+dt@kernel.org, frowand.list@gmail.com, jarkko.sakkinen@linux.intel.com, rafael.j.wysocki@intel.com, dmitry.torokhov@gmail.com, johan@kernel.org, msuchanek@suse.de, linux-kernel@vger.kernel.org, iommu@lists.linux-foundation.org, linux-wireless@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-soc@vger.kernel.org, dmaengine@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-tegra@vger.kernel.org, devicetree@vger.kernel.org, linux-pci@vger.kernel.org, bharat.bhushan@nxp.com, leoyang.li@nxp.com, Nipun Gupta Subject: [PATCH v2 2/2] drivers: remove force dma flag from buses Date: Wed, 21 Mar 2018 12:25:23 +0530 Message-Id: <1521615323-4752-2-git-send-email-nipun.gupta@nxp.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1521615323-4752-1-git-send-email-nipun.gupta@nxp.com> References: <1520868292-2479-1-git-send-email-nipun.gupta@nxp.com> <1521615323-4752-1-git-send-email-nipun.gupta@nxp.com> MIME-Version: 1.0 X-Originating-IP: [14.142.187.166] X-ClientProxiedBy: BM1PR01CA0090.INDPRD01.PROD.OUTLOOK.COM (2603:1096:b00:1::30) To VI1PR0401MB2431.eurprd04.prod.outlook.com (2603:10a6:800:2a::24) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: ff77168e-31dd-4874-7e0b-08d58ef8d9ae X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(4534165)(7168020)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:VI1PR0401MB2431; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0401MB2431; 3:MWaCYzr9H/+fHV89eLRQi1UFbqagGJHw/Zu6kGsrXlmrO+0HD2MvI8Ex6j3IdrS099SfTEP89NPd6aBs/UMHtFbz4xgjMgXP8Hx0Scvx8P/ANo5vOhD45w0Z6BLF5UduYg4hNJ70neypRlxuHRlJP7ePCEaXSuG4eattZPZeXV8/4D5Zeawt2/4wXWwVbWrDxV0yigFsOxiFmhINn7OzXXhxtARbg+EvyQYx2b7kVsKj9ikR2mCdTjtem3UfJxtv; 25:MMiUq+vaJhD8ZwQ3DfqJnRzrsaSqnEJDvnbwo5a2O/6Un5yUAZZdud5So1Jv3+oW6mFWGfQn3az4lJH00/arVK/uCt83Kfx1pJhJ8Y2qkp2Qd+DlPRK+1O/G61/J2MuZcbT3u+zFaKsuOnyMkqNP1wMTll70VT3yWoc9di2mPdehF9Un3JEJSiBu1dv8GwVYVcyO7t7VZmNQH8GK+WYeov8DAwmKz9H+aGDe7hwNjgdSHmC1vG+lqMaqGsCtsUJI4WOIayyuUilM/QVE0PgEfjmXQg+bNyLoWm1UMMGhzNH4jB4WXcHznyLo9SZaCUTrVPOpWx1yom0FRF1cL70PUA==; 31:DKjS02ULAlR+VQ2g36MYWpNWxFKGXaN7OgqdhwDHHkqvl7/0McRm7CFm3akmmwo+vduhrMvzay/Oz3QfjWpJk/qM2VmDq3WGx5O00MXzStyr/0+GOAu3KVsEDB/KjjCw59opiPHW19t5Z+g7OCyrDjF420yHygHOKJIDEM5zSO3yiz612PxdaDSxQTs/hVgpZ77R9goNrQnhbYWkitkCeTfmOoHx9if4CfOs+AeV5GM= X-MS-TrafficTypeDiagnostic: VI1PR0401MB2431: X-Microsoft-Exchange-Diagnostics: 1; VI1PR0401MB2431; 20:oc5+pZq3rMt6lZXeUmO3t5L22H4yT/sed1ja15wdMis07j7g6wINs0Zw7z37FAEAMWne3m/MxN43Pqx7Dp9KGIpQTJWLhBtFN950uw3diar5akHaFbuTzsBS4I/hfra5TuNzXgpgQgde41ALtv94Sdg9snyUTs2mej7eUccc4Er4bvgG+Bl4gokZhfjQBWo13TzpBqkBCS1EzzM98xXPE1vQg1lWSRhZ5CGc3yh9jXaSG4YnOPtDbSLZjibh47YsTkICH4VV+AgwiDOj8Hoj99zgHYh6/mBXn0bgjGynH/ZAUjOXam3hYwXAC49thGH+enzrJ0nIgJ965vvhFFqYVoHW+t4XrIyjriY5W27g0M3ehxp1qs8Cgn8KX0Qmo9keYLFFvdvuL9iUf1OwjmVrVt2B0Uvjq5QbJqziCdTJ6MpRdfmq7B/vqaQm+wPkjkgY6hUNuEsFkiWOj6DNO3vwRsolLV3poof4Sr7YRLTFayiWyKr+L79TG5yLjRTjjd79; 4:W024Nckfg/HKGhLJbobdSCSmF0PXcFDG8DebMP3IUkBbSP36qmA4hC+FEzmItppHb7NvH0VQ5JnnZVR0DxjtvWJOYvZByy3eyzghvxbHjyd4sJ+SrgcN2HpjU4e/gLllYl5a3GOIrdKEh9GwqOQ9A3g3KZBmHQMhrRauaQXtT7evWQL2VOKpV9m4Hwj/Qj1lKXOMBXAMl4TgIStc46dgVaHvdO081kEbnUyMMu4l6NpocHMCt4ArN3OV/iRXDTQXonrc8K68O/1Ct9CRfqqoEcsdkHT9en6Rq+/3m3jdS7DbFiAzzjecLoaFG+JAHCJm X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(10201501046)(93006095)(93001095)(3231221)(944501244)(52105095)(3002001)(6055026)(6041310)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123560045)(20161123562045)(6072148)(201708071742011); SRVR:VI1PR0401MB2431; BCL:0; PCL:0; RULEID:; SRVR:VI1PR0401MB2431; X-Forefront-PRVS: 0618E4E7E1 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(396003)(366004)(346002)(376002)(39380400002)(39860400002)(189003)(199004)(50226002)(2950100002)(575784001)(7736002)(4326008)(86362001)(36756003)(8676002)(81166006)(478600001)(6486002)(316002)(81156014)(66066001)(305945005)(47776003)(6666003)(2906002)(8936002)(5009440100003)(6116002)(97736004)(16586007)(3846002)(186003)(52116002)(51416003)(76176011)(105586002)(39060400002)(53936002)(106356001)(48376002)(59450400001)(6512007)(5660300001)(16526019)(25786009)(68736007)(386003)(55236004)(6506007)(26005)(7416002)(50466002)(110426004)(357404004); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR0401MB2431; H:b27504-OptiPlex-790.ap.freescale.net; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: 1; VI1PR0401MB2431; 23:dFOXCo+/7BRvjKxNzyUgDnGpZ1yJBDVXBjy14d+qd7pTWLG8429IPvaSnNUNQEksx1Lv0glMvxMseO2l1XtV4YTthtImfqKA3CmPPch/+pm/zLRsczeptLqkzUl+FueJJ86VH3boKPOwccl4scz0BfuViFr2+yIR2IPOxfIGibUviHLW8T42Chlj0+BPUJciqeOodTbXhVhfMhj8WP4JjKTvqod33CTnwyi1032dkx7b6QPy8eIki7+Dv+ChlwsCnpgIMNrfIW+trMzxQwCwnyJGqt68Vk0UBm498YacM2ylcoMBFOBX05xf4IXMXIQUd4bL15p0jcb3rU0BXLrI2wAjsC/hY6LCyfxjTuEFQai49QCDDC7KkyyHDsUOwoiYa/OJ3YtiAeRATFx6BSpAlKshYH339gNGTeZaSflLy9WR3yZPAs9ZXf6hVlsmvMueEQ7XyC5TuMquI/0H6B/nUPrZTR8mky3Mz5GZGoYFfH3lGVl6lsv+dOdNjZAPhJEnEQJ11Fm7T43BqLtJPSCV0t8JExVKBd5Gjd2J/b9ysIq/Mr5gPnWrF30T65okfcLQuNzqFqTf3FPbjpLgmo8eFy5dpgVAirK84zI205qsaVA2qcAlpPRSVCVncLQdrPynPKpd/a/vPgK4QCii5E87zCzd+PRs/SFHnG+NKhk0p9BKQ11o9qdBnViGP3dUHUl+UuZ4JE77COe/Z6Z0VSA/5xemqlyxa5Zpy1Xh29Z5w4ZAaPjYQYgBSsreKkls26GHJV1iL1+1m37ZAozYK/hIp1xVuZD3b3U4S+xjiiiyw8V0kIhoggeD1pKAPlnv8YACj8PKZvLOwjTkR57A7BExViPj494yiXV/4LlNDw6AizqKkcgonY/kua5XxWLIAYhfKun5jMjbTAX0p1m5PiHp++sg0vSU/WVMImQsO93hAoI99VI5bGOKTjTXuUcjpnv5ntR9qg9dBxrjt3DslkXSBBttTb7ADHc5qZVxfRn/GKs3Hyo0IDuki0Ji4Q1ITT6eZ5t5k6z7T7KN4K7hwhXohmVEAt4uUPppTwI0HputkK8c9eUIyEMvHa50ezFoT6nBJFMBb9mrUn8fTEacWhphKwvvFGzndpCLayXLHOr4W7QlFTH4+ZL0cV2Hi1isPVbZuPnsIg1+9wnyJjyg8Ruw2bkbe4lUrNrojpfK+OX444eIZwglge2YTFYcIDdpKnjeJSqCYI+l9ItspgeNMKF33fL8Pm8bfv/m/o8lzWv7J1/cPoqdJ+1anYSN4k/dZeXE X-Microsoft-Antispam-Message-Info: bI+KolipytNHdISI9fx45I4Dz0W/jErzQmot2AaV+jZrBWe+//MOCZeSdaE1YCLMBUUur0XnOv9dyoEYQVtEwoTPDVXt9JM6FlAh4RsTkL1+79bhCENd1afuh4YnlC1Fvtki1A4a2KLvKZ/RbCKChG1npfOfCOvvtzdLOZSpEsCHzsDSFRxDOUEvMsyeagxk X-Microsoft-Exchange-Diagnostics: 1; VI1PR0401MB2431; 6:Kn02l5zuJbUurOOSVo4KnLCUBftJpOrIY844LEAFBIS2ZfNMe5E09KaDA4UF+9wReTlBo6AAP6960MLKVp3l5rRR70w000zXTyFvlV3TPafhd2TNyzl/46Yk0iLoFIG8IsKK/rzjyQkL07fRyHVftf4/DtlC8P5awP4iIXeNNLWXJt0pMQFuihd67CINELq1TI4xdqi4xF5gYYjBtZBefb1wSjcgFYU/QVn2ZxYjIejSI5bzbNxGapklshQOtj6B6sn+LxPZ8BXUGc88wBNzMPHo58bzl/BIEGc9O5n+8SmKB0I+lTp4beLVQNDUA+W+T/cqN8aKfjThbAtxBTohl3dmyTPaG7wJlmVfwWE/9LE=; 5:zYEC1cWxOuZp839hQwchLf4KP/0VGrFDg3fu+tuK6qEoQ8Cu3aBEnKuqwsxtD2adiC049lUWX4tDLZqe5X5k2KAgj36DvdQG07jUJYwZRp4VbKRNIClmQvjrAmADZ7x3UeiRvkE4YEIidBWQ6vIzC/3uF+6LzNXQYg9D3qhS2qU=; 24:hX3IP41pkQPJ3huy2ySlXkSjyAtTQecVx/VxoE0Czeo+nBdnNxqojptNB37UguAul8uCjM42tUAVBw4FXi39dTmpu9CO2kaGj9O+Ou9lY0U=; 7:LobF48mogWvRQOwbgLooU0DZv/Le+bt2aU0TWyjLxklNQpKJWAAXbwpKKp5eBSBhxfmvSDv6CfR4/Qmi/mDZCinnKOOl2buiWh3lvM4GDFS4HZiRiOuf4SxdtF3bPblY05kWeWgkr7lySighq2+fq5WhuJIp+mdHr8ovN/zYWrTLTVxxJmA8h27ccjHT1rpr+WMQhUKutB3cBoNYM9LJj3bQXUJbGvofQWlQOgaPs/iAOn48xfrrbQ7pxG4puqYj SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Mar 2018 06:56:13.9324 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ff77168e-31dd-4874-7e0b-08d58ef8d9ae X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0401MB2431 Sender: linux-tegra-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org With each bus implementing its own DMA configuration callback, there is no need for bus to explicitly have force_dma in its global structure. This patch modifies of_dma_configure API to accept an input parameter which specifies if implicit DMA configuration is required even when it is not described by the firmware. Signed-off-by: Nipun Gupta --- Changes in v2: - This is a new change suggested by Robin and Christoph and is added to the series. drivers/amba/bus.c | 3 +-- drivers/base/dma-mapping.c | 4 ++-- drivers/base/platform.c | 3 +-- drivers/bcma/main.c | 2 +- drivers/dma/qcom/hidma_mgmt.c | 2 +- drivers/gpu/host1x/bus.c | 5 ++--- drivers/of/device.c | 6 ++++-- drivers/of/of_reserved_mem.c | 2 +- drivers/pci/pci-driver.c | 3 +-- include/linux/device.h | 4 ---- include/linux/dma-mapping.h | 2 +- include/linux/of_device.h | 4 +++- 12 files changed, 18 insertions(+), 22 deletions(-) diff --git a/drivers/amba/bus.c b/drivers/amba/bus.c index 2fa1e8b..1d58348 100644 --- a/drivers/amba/bus.c +++ b/drivers/amba/bus.c @@ -174,7 +174,7 @@ static int amba_pm_runtime_resume(struct device *dev) static int amba_dma_configure(struct device *dev) { - return dma_common_configure(dev); + return dma_common_configure(dev, true); } static const struct dev_pm_ops amba_pm = { @@ -202,7 +202,6 @@ struct bus_type amba_bustype = { .uevent = amba_uevent, .dma_configure = amba_dma_configure, .pm = &amba_pm, - .force_dma = true, }; static int __init amba_init(void) diff --git a/drivers/base/dma-mapping.c b/drivers/base/dma-mapping.c index 48f9af0..03f8584 100644 --- a/drivers/base/dma-mapping.c +++ b/drivers/base/dma-mapping.c @@ -335,13 +335,13 @@ void dma_common_free_remap(void *cpu_addr, size_t size, unsigned long vm_flags) * A bus can use this function in its 'dma_configure' callback, if * suitable for the bus. */ -int dma_common_configure(struct device *dev) +int dma_common_configure(struct device *dev, bool force_dma) { enum dev_dma_attr attr; int ret = 0; if (dev->of_node) { - ret = of_dma_configure(dev, dev->of_node); + ret = of_dma_configure(dev, dev->of_node, force_dma); } else if (has_acpi_companion(dev)) { attr = acpi_get_dma_attr(to_acpi_device_node(dev->fwnode)); if (attr != DEV_DMA_NOT_SUPPORTED) diff --git a/drivers/base/platform.c b/drivers/base/platform.c index d2d5891..154707c 100644 --- a/drivers/base/platform.c +++ b/drivers/base/platform.c @@ -1132,7 +1132,7 @@ int platform_pm_restore(struct device *dev) static int platform_dma_configure(struct device *dev) { - return dma_common_configure(dev); + return dma_common_configure(dev, true); } static const struct dev_pm_ops platform_dev_pm_ops = { @@ -1148,7 +1148,6 @@ struct bus_type platform_bus_type = { .uevent = platform_uevent, .dma_configure = platform_dma_configure, .pm = &platform_dev_pm_ops, - .force_dma = true, }; EXPORT_SYMBOL_GPL(platform_bus_type); diff --git a/drivers/bcma/main.c b/drivers/bcma/main.c index e6986c7..fc1f4ac 100644 --- a/drivers/bcma/main.c +++ b/drivers/bcma/main.c @@ -207,7 +207,7 @@ static void bcma_of_fill_device(struct device *parent, core->irq = bcma_of_get_irq(parent, core, 0); - of_dma_configure(&core->dev, node); + of_dma_configure(&core->dev, node, false); } unsigned int bcma_core_irq(struct bcma_device *core, int num) diff --git a/drivers/dma/qcom/hidma_mgmt.c b/drivers/dma/qcom/hidma_mgmt.c index 000c7019..d64edeb 100644 --- a/drivers/dma/qcom/hidma_mgmt.c +++ b/drivers/dma/qcom/hidma_mgmt.c @@ -398,7 +398,7 @@ static int __init hidma_mgmt_of_populate_channels(struct device_node *np) } of_node_get(child); new_pdev->dev.of_node = child; - of_dma_configure(&new_pdev->dev, child); + of_dma_configure(&new_pdev->dev, child, true); /* * It is assumed that calling of_msi_configure is safe on * platforms with or without MSI support. diff --git a/drivers/gpu/host1x/bus.c b/drivers/gpu/host1x/bus.c index fa9896d..211eb6b 100644 --- a/drivers/gpu/host1x/bus.c +++ b/drivers/gpu/host1x/bus.c @@ -317,7 +317,7 @@ static int host1x_device_match(struct device *dev, struct device_driver *drv) static int host1x_dma_configure(struct device *dev) { if (dev->of_node) - return of_dma_configure(dev, dev->of_node); + return of_dma_configure(dev, dev->of_node, true); return 0; } @@ -336,7 +336,6 @@ struct bus_type host1x_bus_type = { .match = host1x_device_match, .dma_configure = host1x_dma_configure, .pm = &host1x_device_pm_ops, - .force_dma = true, }; static void __host1x_device_del(struct host1x_device *device) @@ -425,7 +424,7 @@ static int host1x_device_add(struct host1x *host1x, device->dev.bus = &host1x_bus_type; device->dev.parent = host1x->dev; - of_dma_configure(&device->dev, host1x->dev->of_node); + of_dma_configure(&device->dev, host1x->dev->of_node, true); err = host1x_device_parse_dt(device, driver); if (err < 0) { diff --git a/drivers/of/device.c b/drivers/of/device.c index 064c818..33d8551 100644 --- a/drivers/of/device.c +++ b/drivers/of/device.c @@ -76,6 +76,8 @@ int of_device_add(struct platform_device *ofdev) * of_dma_configure - Setup DMA configuration * @dev: Device to apply DMA configuration * @np: Pointer to OF node having DMA configuration + * @force_dma: Whether device is to be set up by of_dma_configure() even if + * DMA capability is not explicitly described by firmware. * * Try to get devices's DMA configuration from DT and update it * accordingly. @@ -84,7 +86,7 @@ int of_device_add(struct platform_device *ofdev) * can use a platform bus notifier and handle BUS_NOTIFY_ADD_DEVICE events * to fix up DMA configuration. */ -int of_dma_configure(struct device *dev, struct device_node *np) +int of_dma_configure(struct device *dev, struct device_node *np, bool force_dma) { u64 dma_addr, paddr, size = 0; int ret; @@ -100,7 +102,7 @@ int of_dma_configure(struct device *dev, struct device_node *np) * DMA configuration regardless of whether "dma-ranges" is * correctly specified or not. */ - if (!dev->bus->force_dma) + if (!force_dma) return ret == -ENODEV ? 0 : ret; dma_addr = offset = 0; diff --git a/drivers/of/of_reserved_mem.c b/drivers/of/of_reserved_mem.c index 9a4f4246..895c83e 100644 --- a/drivers/of/of_reserved_mem.c +++ b/drivers/of/of_reserved_mem.c @@ -353,7 +353,7 @@ int of_reserved_mem_device_init_by_idx(struct device *dev, /* ensure that dma_ops is set for virtual devices * using reserved memory */ - of_dma_configure(dev, np); + of_dma_configure(dev, np, true); dev_info(dev, "assigned reserved memory node %s\n", rmem->name); } else { diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c index b473a4c..b15637a 100644 --- a/drivers/pci/pci-driver.c +++ b/drivers/pci/pci-driver.c @@ -1541,7 +1541,7 @@ static int pci_dma_configure(struct device *dev) if (IS_ENABLED(CONFIG_OF) && bridge->parent && bridge->parent->of_node) { - ret = of_dma_configure(dev, bridge->parent->of_node); + ret = of_dma_configure(dev, bridge->parent->of_node, true); } else if (has_acpi_companion(bridge)) { attr = acpi_get_dma_attr(to_acpi_device_node(bridge->fwnode)); if (attr != DEV_DMA_NOT_SUPPORTED) @@ -1566,7 +1566,6 @@ struct bus_type pci_bus_type = { .pm = PCI_PM_OPS_PTR, .num_vf = pci_bus_num_vf, .dma_configure = pci_dma_configure, - .force_dma = true, }; EXPORT_SYMBOL(pci_bus_type); diff --git a/include/linux/device.h b/include/linux/device.h index 1832d90..92c530e 100644 --- a/include/linux/device.h +++ b/include/linux/device.h @@ -98,8 +98,6 @@ extern int __must_check bus_create_file(struct bus_type *, * @p: The private data of the driver core, only the driver core can * touch this. * @lock_key: Lock class key for use by the lock validator - * @force_dma: Assume devices on this bus should be set up by dma_configure() - * even if DMA capability is not explicitly described by firmware. * * A bus is a channel between the processor and one or more devices. For the * purposes of the device model, all devices are connected via a bus, even if @@ -140,8 +138,6 @@ struct bus_type { struct subsys_private *p; struct lock_class_key lock_key; - - bool force_dma; }; extern int __must_check bus_register(struct bus_type *bus); diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h index c15986b..3dba3e6 100644 --- a/include/linux/dma-mapping.h +++ b/include/linux/dma-mapping.h @@ -761,7 +761,7 @@ void *dma_mark_declared_memory_occupied(struct device *dev, } #endif /* CONFIG_HAVE_GENERIC_DMA_COHERENT */ -int dma_common_configure(struct device *dev); +int dma_common_configure(struct device *dev, bool force_dma); #ifdef CONFIG_HAS_DMA int dma_configure(struct device *dev); void dma_deconfigure(struct device *dev); diff --git a/include/linux/of_device.h b/include/linux/of_device.h index 8da5a1b..b0be3a5 100644 --- a/include/linux/of_device.h +++ b/include/linux/of_device.h @@ -55,7 +55,9 @@ static inline struct device_node *of_cpu_device_node_get(int cpu) return of_node_get(cpu_dev->of_node); } -int of_dma_configure(struct device *dev, struct device_node *np); +int of_dma_configure(struct device *dev, + struct device_node *np, + bool force_dma); void of_dma_deconfigure(struct device *dev); #else /* CONFIG_OF */