From: Robin Murphy <robin.murphy@arm.com> To: joro@8bytes.org Cc: will@kernel.org, iommu@lists.linux.dev, linux-arm-kernel@lists.infradead.org, baolu.lu@linux.intel.com, kevin.tian@intel.com, suravee.suthikulpanit@amd.com, vasant.hegde@amd.com, mjrosato@linux.ibm.com, schnelle@linux.ibm.com, linux-kernel@vger.kernel.org Subject: [PATCH v4 14/16] iommu/tegra-smmu: Clean up bus_set_iommu() Date: Mon, 15 Aug 2022 17:20:15 +0100 [thread overview] Message-ID: <13bb6baa6c4d74e95a12529e4eb1ddfb3885c3b5.1660572783.git.robin.murphy@arm.com> (raw) In-Reply-To: <cover.1660572783.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> --- v4: No change 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 2a8de975fe63..5b1af40221ec 100644 --- a/drivers/iommu/tegra-smmu.c +++ b/drivers/iommu/tegra-smmu.c @@ -1083,8 +1083,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. @@ -1138,32 +1138,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.36.1.dirty
WARNING: multiple messages have this Message-ID (diff)
From: Robin Murphy <robin.murphy@arm.com> To: joro@8bytes.org Cc: will@kernel.org, iommu@lists.linux.dev, linux-arm-kernel@lists.infradead.org, baolu.lu@linux.intel.com, kevin.tian@intel.com, suravee.suthikulpanit@amd.com, vasant.hegde@amd.com, mjrosato@linux.ibm.com, schnelle@linux.ibm.com, linux-kernel@vger.kernel.org Subject: [PATCH v4 14/16] iommu/tegra-smmu: Clean up bus_set_iommu() Date: Mon, 15 Aug 2022 17:20:15 +0100 [thread overview] Message-ID: <13bb6baa6c4d74e95a12529e4eb1ddfb3885c3b5.1660572783.git.robin.murphy@arm.com> (raw) In-Reply-To: <cover.1660572783.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> --- v4: No change 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 2a8de975fe63..5b1af40221ec 100644 --- a/drivers/iommu/tegra-smmu.c +++ b/drivers/iommu/tegra-smmu.c @@ -1083,8 +1083,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. @@ -1138,32 +1138,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.36.1.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-08-15 16:22 UTC|newest] Thread overview: 60+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-08-15 16:20 [PATCH v4 00/16] iommu: retire bus_set_iommu() Robin Murphy 2022-08-15 16:20 ` Robin Murphy 2022-08-15 16:20 ` [PATCH v4 01/16] iommu/vt-d: Handle race between registration and device probe Robin Murphy 2022-08-15 16:20 ` Robin Murphy 2022-08-15 16:20 ` [PATCH v4 02/16] iommu/amd: " Robin Murphy 2022-08-15 16:20 ` Robin Murphy 2022-08-15 16:20 ` [PATCH v4 03/16] iommu/s390: Fail probe for non-PCI devices Robin Murphy 2022-08-15 16:20 ` Robin Murphy 2022-08-15 16:20 ` [PATCH v4 04/16] iommu: Always register bus notifiers Robin Murphy 2022-08-15 16:20 ` Robin Murphy 2022-08-18 7:34 ` Tian, Kevin 2022-08-18 7:34 ` Tian, Kevin 2022-09-07 18:50 ` Saravana Kannan 2022-09-07 18:50 ` Saravana Kannan 2022-09-07 20:27 ` Robin Murphy 2022-09-07 20:27 ` Robin Murphy 2022-08-15 16:20 ` [PATCH v4 05/16] iommu: Move bus setup to IOMMU device registration Robin Murphy 2022-08-15 16:20 ` Robin Murphy 2022-10-06 14:01 ` Jon Hunter 2022-10-06 14:01 ` Jon Hunter 2022-10-06 15:27 ` Robin Murphy 2022-10-06 15:27 ` Robin Murphy 2022-10-06 17:12 ` Thierry Reding 2022-10-06 17:12 ` Thierry Reding 2022-10-06 18:43 ` Dmitry Osipenko 2022-10-06 18:43 ` Dmitry Osipenko 2022-10-18 6:13 ` Jon Hunter 2022-10-18 6:13 ` Jon Hunter 2022-10-18 21:12 ` Dmitry Osipenko 2022-10-18 21:12 ` Dmitry Osipenko 2022-10-12 16:28 ` Alex Williamson 2022-10-12 16:28 ` Alex Williamson 2022-10-13 1:08 ` Baolu Lu 2022-10-13 1:08 ` Baolu Lu 2022-08-15 16:20 ` [PATCH v4 06/16] iommu/amd: Clean up bus_set_iommu() Robin Murphy 2022-08-15 16:20 ` Robin Murphy 2022-08-15 16:20 ` [PATCH v4 07/16] iommu/arm-smmu: " Robin Murphy 2022-08-15 16:20 ` Robin Murphy 2022-08-15 16:20 ` [PATCH v4 08/16] iommu/arm-smmu-v3: " Robin Murphy 2022-08-15 16:20 ` Robin Murphy 2022-08-15 16:20 ` [PATCH v4 09/16] iommu/dart: " Robin Murphy 2022-08-15 16:20 ` Robin Murphy 2022-08-15 16:20 ` [PATCH v4 10/16] iommu/exynos: " Robin Murphy 2022-08-15 16:20 ` Robin Murphy 2022-08-15 16:20 ` [PATCH v4 11/16] iommu/ipmmu-vmsa: " Robin Murphy 2022-08-15 16:20 ` Robin Murphy 2022-08-16 0:25 ` kernel test robot 2022-08-16 0:25 ` kernel test robot 2022-08-15 16:20 ` [PATCH v4 12/16] iommu/mtk: " Robin Murphy 2022-08-15 16:20 ` Robin Murphy 2022-08-15 16:20 ` [PATCH v4 13/16] iommu/omap: " Robin Murphy 2022-08-15 16:20 ` Robin Murphy 2022-08-15 16:20 ` Robin Murphy [this message] 2022-08-15 16:20 ` [PATCH v4 14/16] iommu/tegra-smmu: " Robin Murphy 2022-08-15 16:20 ` [PATCH v4 15/16] iommu/virtio: " Robin Murphy 2022-08-15 16:20 ` Robin Murphy 2022-08-15 16:20 ` [PATCH v4 16/16] iommu: " Robin Murphy 2022-08-15 16:20 ` Robin Murphy 2022-09-07 12:27 ` [PATCH v4 00/16] iommu: retire bus_set_iommu() Joerg Roedel 2022-09-07 12:27 ` Joerg Roedel
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=13bb6baa6c4d74e95a12529e4eb1ddfb3885c3b5.1660572783.git.robin.murphy@arm.com \ --to=robin.murphy@arm.com \ --cc=baolu.lu@linux.intel.com \ --cc=iommu@lists.linux.dev \ --cc=joro@8bytes.org \ --cc=kevin.tian@intel.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=mjrosato@linux.ibm.com \ --cc=schnelle@linux.ibm.com \ --cc=suravee.suthikulpanit@amd.com \ --cc=vasant.hegde@amd.com \ --cc=will@kernel.org \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.