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 11/13] iommu/tegra-smmu: Clean up bus_set_iommu()
Date: Thu, 14 Apr 2022 13:42:40 +0100 [thread overview]
Message-ID: <6f70390dadc0fe0adcfa9caf99d57f1442b48e47.1649935679.git.robin.murphy@arm.com> (raw)
In-Reply-To: <cover.1649935679.git.robin.murphy@arm.com>
Stop calling bus_set_iommu() since it's now unnecessary, and simplify
the probe failure path accordingly.
Signed-off-by: Robin Murphy <robin.murphy@arm.com>
---
drivers/iommu/tegra-smmu.c | 29 ++++++-----------------------
1 file changed, 6 insertions(+), 23 deletions(-)
diff --git a/drivers/iommu/tegra-smmu.c b/drivers/iommu/tegra-smmu.c
index 1fea68e551f1..2e4d2e4c65bb 100644
--- a/drivers/iommu/tegra-smmu.c
+++ b/drivers/iommu/tegra-smmu.c
@@ -1086,8 +1086,8 @@ struct tegra_smmu *tegra_smmu_probe(struct device *dev,
/*
* This is a bit of a hack. Ideally we'd want to simply return this
- * value. However the IOMMU registration process will attempt to add
- * all devices to the IOMMU when bus_set_iommu() is called. In order
+ * value. However iommu_device_register() will attempt to add
+ * all devices to the IOMMU before we get that far. In order
* not to rely on global variables to track the IOMMU instance, we
* set it here so that it can be looked up from the .probe_device()
* callback via the IOMMU device's .drvdata field.
@@ -1141,32 +1141,15 @@ struct tegra_smmu *tegra_smmu_probe(struct device *dev,
return ERR_PTR(err);
err = iommu_device_register(&smmu->iommu, &tegra_smmu_ops, dev);
- if (err)
- goto remove_sysfs;
-
- err = bus_set_iommu(&platform_bus_type, &tegra_smmu_ops);
- if (err < 0)
- goto unregister;
-
-#ifdef CONFIG_PCI
- err = bus_set_iommu(&pci_bus_type, &tegra_smmu_ops);
- if (err < 0)
- goto unset_platform_bus;
-#endif
+ if (err) {
+ iommu_device_sysfs_remove(&smmu->iommu);
+ return ERR_PTR(err);
+ }
if (IS_ENABLED(CONFIG_DEBUG_FS))
tegra_smmu_debugfs_init(smmu);
return smmu;
-
-unset_platform_bus: __maybe_unused;
- bus_set_iommu(&platform_bus_type, NULL);
-unregister:
- iommu_device_unregister(&smmu->iommu);
-remove_sysfs:
- iommu_device_sysfs_remove(&smmu->iommu);
-
- return ERR_PTR(err);
}
void tegra_smmu_remove(struct tegra_smmu *smmu)
--
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:49 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 ` [PATCH 02/13] iommu: Move bus setup to IOMMU device registration Robin Murphy
2022-04-16 0:04 ` 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 ` Robin Murphy [this message]
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=6f70390dadc0fe0adcfa9caf99d57f1442b48e47.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).