Skip to content

Commit 97cb1fa

Browse files
rmurphy-armwilldeacon
authored andcommitted
iommu/arm-smmu: Retire probe deferral workaround
This reverts commit 229e6ee. 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 <[email protected]> Link: https://lore.kernel.org/r/4167c5dfa052d4c8bb780f0a30af63dcfc4ce6c1.1733406914.git.robin.murphy@arm.com Signed-off-by: Will Deacon <[email protected]>
1 parent 7d83513 commit 97cb1fa

File tree

1 file changed

+0
-11
lines changed

1 file changed

+0
-11
lines changed

drivers/iommu/arm/arm-smmu/arm-smmu.c

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1437,17 +1437,6 @@ static struct iommu_device *arm_smmu_probe_device(struct device *dev)
14371437
goto out_free;
14381438
} else {
14391439
smmu = arm_smmu_get_by_fwnode(fwspec->iommu_fwnode);
1440-
1441-
/*
1442-
* Defer probe if the relevant SMMU instance hasn't finished
1443-
* probing yet. This is a fragile hack and we'd ideally
1444-
* avoid this race in the core code. Until that's ironed
1445-
* out, however, this is the most pragmatic option on the
1446-
* table.
1447-
*/
1448-
if (!smmu)
1449-
return ERR_PTR(dev_err_probe(dev, -EPROBE_DEFER,
1450-
"smmu dev has not bound yet\n"));
14511440
}
14521441

14531442
ret = -EINVAL;

0 commit comments

Comments
 (0)