]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
iommu/arm-smmu: Retire probe deferral workaround
authorRobin Murphy <robin.murphy@arm.com>
Thu, 5 Dec 2024 16:33:56 +0000 (16:33 +0000)
committerWill Deacon <will@kernel.org>
Mon, 9 Dec 2024 22:46:53 +0000 (22:46 +0000)
This reverts commit 229e6ee43d2a160a1592b83aad620d6027084aad.

Now that the fundamental ordering issue between arm_smmu_get_by_fwnode()
and iommu_device_register() is resolved, the race condition for client
probe no longer exists either, so retire the specific workaround.

Signed-off-by: Robin Murphy <robin.murphy@arm.com>
Link: https://lore.kernel.org/r/4167c5dfa052d4c8bb780f0a30af63dcfc4ce6c1.1733406914.git.robin.murphy@arm.com
Signed-off-by: Will Deacon <will@kernel.org>
drivers/iommu/arm/arm-smmu/arm-smmu.c

index 0949f2734e5de71efbac80f828ad496aca52fa9b..79afc92e1d8b984dd35c469a3f283ad0c78f3d26 100644 (file)
@@ -1437,17 +1437,6 @@ static struct iommu_device *arm_smmu_probe_device(struct device *dev)
                        goto out_free;
        } else {
                smmu = arm_smmu_get_by_fwnode(fwspec->iommu_fwnode);
-
-               /*
-                * Defer probe if the relevant SMMU instance hasn't finished
-                * probing yet. This is a fragile hack and we'd ideally
-                * avoid this race in the core code. Until that's ironed
-                * out, however, this is the most pragmatic option on the
-                * table.
-                */
-               if (!smmu)
-                       return ERR_PTR(dev_err_probe(dev, -EPROBE_DEFER,
-                                               "smmu dev has not bound yet\n"));
        }
 
        ret = -EINVAL;