Skip to content

Commit 73d2f10

Browse files
rmurphy-armjoergroedel
authored andcommitted
iommu: Don't warn prematurely about dodgy probes
The warning for suspect probe conditions inadvertently got moved too early in a prior respin - it happened to work out OK for fwspecs, but in general still needs to be after the ops->probe_device call so drivers which filter devices for themselves have a chance to do that. Signed-off-by: Robin Murphy <[email protected]> Fixes: bcb81ac ("iommu: Get DT/ACPI parsing into the proper probe path") Link: https://lore.kernel.org/r/72a4853e7ef36e7c1c4ca171ed4ed8e1a463a61a.1741791691.git.robin.murphy@arm.com Signed-off-by: Joerg Roedel <[email protected]>
1 parent bcb81ac commit 73d2f10

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

drivers/iommu/iommu.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -441,12 +441,6 @@ static int iommu_init_device(struct device *dev)
441441
ret = -ENODEV;
442442
goto err_free;
443443
}
444-
/*
445-
* And if we do now see any replay calls, they would indicate someone
446-
* misusing the dma_configure path outside bus code.
447-
*/
448-
if (dev->driver)
449-
dev_WARN(dev, "late IOMMU probe at driver bind, something fishy here!\n");
450444

451445
if (!try_module_get(ops->owner)) {
452446
ret = -EINVAL;
@@ -569,6 +563,12 @@ static int __iommu_probe_device(struct device *dev, struct list_head *group_list
569563
ret = iommu_init_device(dev);
570564
if (ret)
571565
return ret;
566+
/*
567+
* And if we do now see any replay calls, they would indicate someone
568+
* misusing the dma_configure path outside bus code.
569+
*/
570+
if (dev->driver)
571+
dev_WARN(dev, "late IOMMU probe at driver bind, something fishy here!\n");
572572

573573
group = dev->iommu_group;
574574
gdev = iommu_group_alloc_device(group, dev);

0 commit comments

Comments
 (0)