From: Robin Murphy <robin.murphy@arm.com>
To: joro@8bytes.org, will@kernel.org
Cc: jean-philippe@linaro.org, mjrosato@linux.ibm.com,
sven@svenpeter.dev, zhang.lyra@gmail.com, robdclark@gmail.com,
linux-kernel@vger.kernel.org, iommu@lists.linux-foundation.org,
thierry.reding@gmail.com, linux-arm-kernel@lists.infradead.org,
gerald.schaefer@linux.ibm.com, baolu.lu@linux.intel.com,
yong.wu@mediatek.com, m.szyprowski@samsung.com
Subject: [PATCH 02/13] iommu: Move bus setup to IOMMU device registration
Date: Thu, 14 Apr 2022 13:42:31 +0100 [thread overview]
Message-ID: <e607a32be8e84c56d65160902f4bd3fb434ee9d3.1649935679.git.robin.murphy@arm.com> (raw)
In-Reply-To: <cover.1649935679.git.robin.murphy@arm.com>
Move the bus setup to iommu_device_register(). This should allow
bus_iommu_probe() to be correctly replayed for multiple IOMMU instances,
and leaves bus_set_iommu() as a glorfied no-op to be cleaned up next.
Note that although the handling of errors from bus_iommu_probe() looks
inadequate, it is merely preserving the well-established existing
behaviour. This could be improved in future - probably combined with
equivalent cleanup for iommu_device_unregister() - but that isn't a
priority right now.
Signed-off-by: Robin Murphy <robin.murphy@arm.com>
---
drivers/iommu/iommu.c | 50 ++++++++++++++++++++++---------------------
1 file changed, 26 insertions(+), 24 deletions(-)
diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
index 13e1a8bd5435..51205c33c426 100644
--- a/drivers/iommu/iommu.c
+++ b/drivers/iommu/iommu.c
@@ -175,6 +175,14 @@ static int __init iommu_subsys_init(void)
}
subsys_initcall(iommu_subsys_init);
+static int remove_iommu_group(struct device *dev, void *data)
+{
+ if (dev->iommu && dev->iommu->iommu_dev == data)
+ iommu_release_device(dev);
+
+ return 0;
+}
+
/**
* iommu_device_register() - Register an IOMMU hardware instance
* @iommu: IOMMU handle for the instance
@@ -197,6 +205,22 @@ int iommu_device_register(struct iommu_device *iommu,
spin_lock(&iommu_device_lock);
list_add_tail(&iommu->list, &iommu_device_list);
spin_unlock(&iommu_device_lock);
+
+ for (int i = 0; i < ARRAY_SIZE(iommu_buses); i++) {
+ struct bus_type *bus = iommu_buses[i];
+ const struct iommu_ops *bus_ops = bus->iommu_ops;
+ int err;
+
+ WARN_ON(bus_ops && bus_ops != ops);
+ bus->iommu_ops = ops;
+ err = bus_iommu_probe(bus);
+ if (err) {
+ bus_for_each_dev(bus, NULL, iommu, remove_iommu_group);
+ bus->iommu_ops = bus_ops;
+ return err;
+ }
+ }
+
return 0;
}
EXPORT_SYMBOL_GPL(iommu_device_register);
@@ -1654,13 +1678,6 @@ static int probe_iommu_group(struct device *dev, void *data)
return ret;
}
-static int remove_iommu_group(struct device *dev, void *data)
-{
- iommu_release_device(dev);
-
- return 0;
-}
-
static int iommu_bus_notifier(struct notifier_block *nb,
unsigned long action, void *data)
{
@@ -1883,27 +1900,12 @@ static int iommu_bus_init(struct bus_type *bus)
*/
int bus_set_iommu(struct bus_type *bus, const struct iommu_ops *ops)
{
- int err;
-
- if (ops == NULL) {
- bus->iommu_ops = NULL;
- return 0;
- }
-
- if (bus->iommu_ops != NULL)
+ if (bus->iommu_ops && ops && bus->iommu_ops != ops)
return -EBUSY;
bus->iommu_ops = ops;
- /* Do IOMMU specific setup for this bus-type */
- err = bus_iommu_probe(bus);
- if (err) {
- /* Clean up */
- bus_for_each_dev(bus, NULL, NULL, remove_iommu_group);
- bus->iommu_ops = NULL;
- }
-
- return err;
+ return 0;
}
EXPORT_SYMBOL_GPL(bus_set_iommu);
--
2.28.0.dirty
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2022-04-14 12:45 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CGME20220414124252eucas1p1f2d8689ef5d281ea70d619888108d2fe@eucas1p1.samsung.com>
2022-04-14 12:42 ` [PATCH 00/13] iommu: Retire bus_set_iommu() Robin Murphy
2022-04-14 12:42 ` [PATCH 01/13] iommu: Always register bus notifiers Robin Murphy
2022-04-14 12:42 ` Robin Murphy [this message]
2022-04-16 0:04 ` [PATCH 02/13] iommu: Move bus setup to IOMMU device registration Lu Baolu
2022-04-18 22:09 ` Robin Murphy
2022-04-18 23:37 ` Lu Baolu
2022-04-19 7:20 ` Robin Murphy
2022-04-19 10:13 ` Lu Baolu
2022-04-23 8:01 ` Lu Baolu
2022-04-23 8:37 ` Robin Murphy
2022-04-23 8:51 ` Lu Baolu
2022-04-23 9:00 ` Lu Baolu
2022-04-23 9:41 ` Lu Baolu
2022-04-22 18:37 ` Krishna Reddy
2022-04-22 19:02 ` Robin Murphy
2022-04-14 12:42 ` [PATCH 03/13] iommu/amd: Clean up bus_set_iommu() Robin Murphy
2022-04-14 12:42 ` [PATCH 04/13] iommu/arm-smmu: " Robin Murphy
2022-04-19 14:40 ` Will Deacon
2022-04-20 16:05 ` Robin Murphy
2022-04-21 8:33 ` Will Deacon
2022-04-14 12:42 ` [PATCH 05/13] iommu/arm-smmu-v3: " Robin Murphy
2022-04-19 14:42 ` Will Deacon
2022-04-14 12:42 ` [PATCH 06/13] iommu/dart: " Robin Murphy
2022-04-15 14:28 ` Sven Peter
2022-04-14 12:42 ` [PATCH 07/13] iommu/exynos: " Robin Murphy
2022-04-14 12:42 ` [PATCH 08/13] iommu/ipmmu-vmsa: " Robin Murphy
2022-04-14 12:42 ` [PATCH 09/13] iommu/mtk: " Robin Murphy
2022-04-14 12:42 ` [PATCH 10/13] iommu/omap: " Robin Murphy
2022-04-14 12:42 ` [PATCH 11/13] iommu/tegra-smmu: " Robin Murphy
2022-04-14 12:42 ` [PATCH 12/13] iommu/virtio: " Robin Murphy
2022-04-21 17:12 ` Jean-Philippe Brucker
2022-04-21 19:44 ` Robin Murphy
2022-04-14 12:42 ` [PATCH 13/13] iommu: " Robin Murphy
2022-04-14 21:00 ` [PATCH 00/13] iommu: Retire bus_set_iommu() Marek Szyprowski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=e607a32be8e84c56d65160902f4bd3fb434ee9d3.1649935679.git.robin.murphy@arm.com \
--to=robin.murphy@arm.com \
--cc=baolu.lu@linux.intel.com \
--cc=gerald.schaefer@linux.ibm.com \
--cc=iommu@lists.linux-foundation.org \
--cc=jean-philippe@linaro.org \
--cc=joro@8bytes.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=m.szyprowski@samsung.com \
--cc=mjrosato@linux.ibm.com \
--cc=robdclark@gmail.com \
--cc=sven@svenpeter.dev \
--cc=thierry.reding@gmail.com \
--cc=will@kernel.org \
--cc=yong.wu@mediatek.com \
--cc=zhang.lyra@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).