Commit e8e683ae authored Jan 07, 2019 by Robin Murphy Committed by Joerg Roedel Jan 11, 2019

iommu/of: Fix probe-deferral



Whilst iommu_probe_device() does check for non-NULL ops as the previous
code did, it does not do so in the same order relative to the other
checks, and as a result means that -EPROBE_DEFER returned by of_xlate()
(plus any real error condition too) gets overwritten with -EINVAL and
leads to various misbehaviour.

Reinstate the original logic, but without implicitly relying on ops
being set to infer !err as the initial condition (now that the validity
of ops for its own sake is checked elsewhere).

Fixes: 641fb0ef ("iommu/of: Don't call iommu_ops->add_device directly")
Signed-off-by: Robin Murphy <robin.murphy@arm.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>

parent bfeffd15

drivers/iommu/of_iommu.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -224,7 +224,7 @@ const struct iommu_ops of_iommu_configure(struct device dev,
		* If we have reason to believe the IOMMU driver missed the initial
		* probe for dev, replay it to get things in order.
		*/
		if (dev->bus && !device_iommu_mapped(dev))
		if (!err && dev->bus && !device_iommu_mapped(dev))
		err = iommu_probe_device(dev);

		/* Ignore all other errors apart from EPROBE_DEFER */

Admin message