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, suravee.suthikulpanit@amd.com, vasant.hegde@amd.com, mjrosato@linux.ibm.com, gerald.schaefer@linux.ibm.com, schnelle@linux.ibm.com, linux-s390@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 07/15] iommu/arm-smmu-v3: Clean up bus_set_iommu() Date: Tue, 5 Jul 2022 18:08:30 +0100 [thread overview] Message-ID: <d329c45c3e67432d1d10e4a96f8e8eb5424b3eb7.1657034828.git.robin.murphy@arm.com> (raw) In-Reply-To: <cover.1657034827.git.robin.murphy@arm.com> Stop calling bus_set_iommu() since it's now unnecessary, and simplify the probe failure path accordingly. Acked-by: Will Deacon <will@kernel.org> Signed-off-by: Robin Murphy <robin.murphy@arm.com> --- v3: No change drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 53 +-------------------- 1 file changed, 2 insertions(+), 51 deletions(-) diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c index 88817a3376ef..8b7936095bec 100644 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c @@ -28,8 +28,6 @@ #include <linux/pci-ats.h> #include <linux/platform_device.h> -#include <linux/amba/bus.h> - #include "arm-smmu-v3.h" #include "../../iommu-sva-lib.h" @@ -3698,43 +3696,6 @@ static unsigned long arm_smmu_resource_size(struct arm_smmu_device *smmu) return SZ_128K; } -static int arm_smmu_set_bus_ops(struct iommu_ops *ops) -{ - int err; - -#ifdef CONFIG_PCI - if (pci_bus_type.iommu_ops != ops) { - err = bus_set_iommu(&pci_bus_type, ops); - if (err) - return err; - } -#endif -#ifdef CONFIG_ARM_AMBA - if (amba_bustype.iommu_ops != ops) { - err = bus_set_iommu(&amba_bustype, ops); - if (err) - goto err_reset_pci_ops; - } -#endif - if (platform_bus_type.iommu_ops != ops) { - err = bus_set_iommu(&platform_bus_type, ops); - if (err) - goto err_reset_amba_ops; - } - - return 0; - -err_reset_amba_ops: -#ifdef CONFIG_ARM_AMBA - bus_set_iommu(&amba_bustype, NULL); -#endif -err_reset_pci_ops: __maybe_unused; -#ifdef CONFIG_PCI - bus_set_iommu(&pci_bus_type, NULL); -#endif - return err; -} - static void __iomem *arm_smmu_ioremap(struct device *dev, resource_size_t start, resource_size_t size) { @@ -3840,27 +3801,17 @@ static int arm_smmu_device_probe(struct platform_device *pdev) ret = iommu_device_register(&smmu->iommu, &arm_smmu_ops, dev); if (ret) { dev_err(dev, "Failed to register iommu\n"); - goto err_sysfs_remove; + iommu_device_sysfs_remove(&smmu->iommu); + return ret; } - ret = arm_smmu_set_bus_ops(&arm_smmu_ops); - if (ret) - goto err_unregister_device; - return 0; - -err_unregister_device: - iommu_device_unregister(&smmu->iommu); -err_sysfs_remove: - iommu_device_sysfs_remove(&smmu->iommu); - return ret; } static int arm_smmu_device_remove(struct platform_device *pdev) { struct arm_smmu_device *smmu = platform_get_drvdata(pdev); - arm_smmu_set_bus_ops(NULL); iommu_device_unregister(&smmu->iommu); iommu_device_sysfs_remove(&smmu->iommu); arm_smmu_device_disable(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, suravee.suthikulpanit@amd.com, vasant.hegde@amd.com, mjrosato@linux.ibm.com, gerald.schaefer@linux.ibm.com, schnelle@linux.ibm.com, linux-s390@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 07/15] iommu/arm-smmu-v3: Clean up bus_set_iommu() Date: Tue, 5 Jul 2022 18:08:30 +0100 [thread overview] Message-ID: <d329c45c3e67432d1d10e4a96f8e8eb5424b3eb7.1657034828.git.robin.murphy@arm.com> (raw) In-Reply-To: <cover.1657034827.git.robin.murphy@arm.com> Stop calling bus_set_iommu() since it's now unnecessary, and simplify the probe failure path accordingly. Acked-by: Will Deacon <will@kernel.org> Signed-off-by: Robin Murphy <robin.murphy@arm.com> --- v3: No change drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 53 +-------------------- 1 file changed, 2 insertions(+), 51 deletions(-) diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c index 88817a3376ef..8b7936095bec 100644 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c @@ -28,8 +28,6 @@ #include <linux/pci-ats.h> #include <linux/platform_device.h> -#include <linux/amba/bus.h> - #include "arm-smmu-v3.h" #include "../../iommu-sva-lib.h" @@ -3698,43 +3696,6 @@ static unsigned long arm_smmu_resource_size(struct arm_smmu_device *smmu) return SZ_128K; } -static int arm_smmu_set_bus_ops(struct iommu_ops *ops) -{ - int err; - -#ifdef CONFIG_PCI - if (pci_bus_type.iommu_ops != ops) { - err = bus_set_iommu(&pci_bus_type, ops); - if (err) - return err; - } -#endif -#ifdef CONFIG_ARM_AMBA - if (amba_bustype.iommu_ops != ops) { - err = bus_set_iommu(&amba_bustype, ops); - if (err) - goto err_reset_pci_ops; - } -#endif - if (platform_bus_type.iommu_ops != ops) { - err = bus_set_iommu(&platform_bus_type, ops); - if (err) - goto err_reset_amba_ops; - } - - return 0; - -err_reset_amba_ops: -#ifdef CONFIG_ARM_AMBA - bus_set_iommu(&amba_bustype, NULL); -#endif -err_reset_pci_ops: __maybe_unused; -#ifdef CONFIG_PCI - bus_set_iommu(&pci_bus_type, NULL); -#endif - return err; -} - static void __iomem *arm_smmu_ioremap(struct device *dev, resource_size_t start, resource_size_t size) { @@ -3840,27 +3801,17 @@ static int arm_smmu_device_probe(struct platform_device *pdev) ret = iommu_device_register(&smmu->iommu, &arm_smmu_ops, dev); if (ret) { dev_err(dev, "Failed to register iommu\n"); - goto err_sysfs_remove; + iommu_device_sysfs_remove(&smmu->iommu); + return ret; } - ret = arm_smmu_set_bus_ops(&arm_smmu_ops); - if (ret) - goto err_unregister_device; - return 0; - -err_unregister_device: - iommu_device_unregister(&smmu->iommu); -err_sysfs_remove: - iommu_device_sysfs_remove(&smmu->iommu); - return ret; } static int arm_smmu_device_remove(struct platform_device *pdev) { struct arm_smmu_device *smmu = platform_get_drvdata(pdev); - arm_smmu_set_bus_ops(NULL); iommu_device_unregister(&smmu->iommu); iommu_device_sysfs_remove(&smmu->iommu); arm_smmu_device_disable(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-07-05 17:09 UTC|newest] Thread overview: 88+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-07-05 17:08 [PATCH v3 00/15] iommu: Retire bus_set_iommu() Robin Murphy 2022-07-05 17:08 ` Robin Murphy 2022-07-05 17:08 ` [PATCH v3 01/15] iommu/vt-d: Handle race between registration and device probe Robin Murphy 2022-07-05 17:08 ` Robin Murphy 2022-07-06 1:39 ` Baolu Lu 2022-07-06 1:39 ` Baolu Lu 2022-07-07 6:51 ` Tian, Kevin 2022-07-07 6:51 ` Tian, Kevin 2022-07-08 7:52 ` Baolu Lu 2022-07-08 7:52 ` Baolu Lu 2022-07-15 12:37 ` Robin Murphy 2022-07-15 12:37 ` Robin Murphy 2022-07-19 0:06 ` Lu Baolu 2022-07-19 0:06 ` Lu Baolu 2022-07-05 17:08 ` [PATCH v3 02/15] iommu/amd: " Robin Murphy 2022-07-05 17:08 ` Robin Murphy 2022-07-05 17:08 ` [PATCH v3 03/15] iommu: Always register bus notifiers Robin Murphy 2022-07-05 17:08 ` Robin Murphy 2022-07-06 1:53 ` Baolu Lu 2022-07-06 1:53 ` Baolu Lu 2022-07-06 13:43 ` Robin Murphy 2022-07-06 13:43 ` Robin Murphy 2022-07-07 0:20 ` Baolu Lu 2022-07-07 0:20 ` Baolu Lu 2022-07-07 6:34 ` Tian, Kevin 2022-07-07 6:34 ` Tian, Kevin 2022-07-07 9:38 ` Robin Murphy 2022-07-07 9:38 ` Robin Murphy 2022-07-07 6:31 ` Tian, Kevin 2022-07-07 6:31 ` Tian, Kevin 2022-07-07 9:58 ` Robin Murphy 2022-07-07 9:58 ` Robin Murphy 2022-07-08 5:50 ` Tian, Kevin 2022-07-08 5:50 ` Tian, Kevin 2022-07-05 17:08 ` [PATCH v3 04/15] iommu: Move bus setup to IOMMU device registration Robin Murphy 2022-07-05 17:08 ` Robin Murphy 2022-07-06 2:35 ` Baolu Lu 2022-07-06 2:35 ` Baolu Lu 2022-07-06 14:37 ` Robin Murphy 2022-07-06 14:37 ` Robin Murphy 2022-07-07 1:19 ` Baolu Lu 2022-07-07 1:19 ` Baolu Lu 2022-07-07 6:51 ` Tian, Kevin 2022-07-07 6:51 ` Tian, Kevin 2022-07-07 10:58 ` Robin Murphy 2022-07-07 10:58 ` Robin Murphy 2022-07-08 5:52 ` Tian, Kevin 2022-07-08 5:52 ` Tian, Kevin 2022-07-05 17:08 ` [PATCH v3 05/15] iommu/amd: Clean up bus_set_iommu() Robin Murphy 2022-07-05 17:08 ` Robin Murphy 2022-07-05 17:08 ` [PATCH v3 06/15] iommu/arm-smmu: " Robin Murphy 2022-07-05 17:08 ` Robin Murphy 2022-07-05 17:08 ` Robin Murphy [this message] 2022-07-05 17:08 ` [PATCH v3 07/15] iommu/arm-smmu-v3: " Robin Murphy 2022-07-05 17:08 ` [PATCH v3 08/15] iommu/dart: " Robin Murphy 2022-07-05 17:08 ` Robin Murphy 2022-07-05 17:08 ` [PATCH v3 09/15] iommu/exynos: " Robin Murphy 2022-07-05 17:08 ` Robin Murphy 2022-07-05 17:08 ` [PATCH v3 10/15] iommu/ipmmu-vmsa: " Robin Murphy 2022-07-05 17:08 ` Robin Murphy 2022-07-05 17:08 ` [PATCH v3 11/15] iommu/mtk: " Robin Murphy 2022-07-05 17:08 ` Robin Murphy 2022-07-05 17:08 ` [PATCH v3 12/15] iommu/omap: " Robin Murphy 2022-07-05 17:08 ` Robin Murphy 2022-07-05 17:08 ` [PATCH v3 13/15] iommu/tegra-smmu: " Robin Murphy 2022-07-05 17:08 ` Robin Murphy 2022-07-05 17:08 ` [PATCH v3 14/15] iommu/virtio: " Robin Murphy 2022-07-05 17:08 ` Robin Murphy 2022-07-05 17:08 ` [PATCH v3 15/15] iommu: " Robin Murphy 2022-07-05 17:08 ` Robin Murphy 2022-07-07 7:45 ` Tian, Kevin 2022-07-07 7:45 ` Tian, Kevin 2022-07-07 12:49 ` Matthew Rosato 2022-07-07 12:49 ` Matthew Rosato 2022-07-07 12:54 ` Matthew Rosato 2022-07-07 12:54 ` Matthew Rosato 2022-07-07 14:58 ` Robin Murphy 2022-07-07 14:58 ` Robin Murphy 2022-07-07 16:42 ` Matthew Rosato 2022-07-07 16:42 ` Matthew Rosato 2022-07-08 8:14 ` [PATCH] iommu/s390: fail probe for non-pci device Niklas Schnelle 2022-07-08 8:14 ` Niklas Schnelle 2022-07-08 8:17 ` [PATCH v3 00/15] iommu: Retire bus_set_iommu() Niklas Schnelle 2022-07-08 8:17 ` Niklas Schnelle 2022-07-15 13:12 ` Robin Murphy 2022-07-15 13:12 ` Robin Murphy 2022-07-21 7:17 ` Tian, Kevin 2022-07-21 7:17 ` Tian, Kevin
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=d329c45c3e67432d1d10e4a96f8e8eb5424b3eb7.1657034828.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.dev \ --cc=joro@8bytes.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-s390@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.