Re: [PATCH V4 2/4] iommu: of: Ignore all errors except EPROBE_DEFER
From: Laurent Pinchart <hidden>
Date: 2017-05-18 14:56:43
Also in:
linux-acpi, linux-arch, linux-arm-kernel, linux-arm-msm, linux-iommu, linux-pci, lkml
Hi Sricharan, Thank you for the patch. On Thursday 18 May 2017 20:24:15 Sricharan R wrote:
While deferring the probe of IOMMU masters, xlate and
add_device callbacks called from of_iommu_configure
can pass back error values like -ENODEV, which means
the IOMMU cannot be connected with that master for real
reasons. Before the IOMMU probe deferral, all such errors
were ignored. Now all those errors are propagated back,
killing the master's probe for such errors. Instead ignore
all the errors except EPROBE_DEFER, which is the only one
of concern and let the master work without IOMMU, thus
restoring the old behavior.
Fixes: 7b07cbefb68d ("iommu: of: Handle IOMMU lookup failure with deferred
probing or error") Reported-by: Geert Uytterhoeven [off-list ref]
Tested-by: Magnus Damn <redacted>
Signed-off-by: Sricharan R <redacted>Reviewed-by: Laurent Pinchart <laurent.pinchart-ryLnwIuWjnjg/C1BVhZhaw@public.gmane.org>
quoted hunk ↗ jump to hunk
--- [V4] Reworded commit log and changed dev_info to dev_dbg drivers/iommu/of_iommu.c | 6 ++++++ 1 file changed, 6 insertions(+)diff --git a/drivers/iommu/of_iommu.c b/drivers/iommu/of_iommu.c index e6e9bec..19779b8 100644 --- a/drivers/iommu/of_iommu.c +++ b/drivers/iommu/of_iommu.c@@ -237,6 +237,12 @@ const struct iommu_ops *of_iommu_configure(structdevice *dev, ops = ERR_PTR(err); } + /* Ignore all other errors apart from EPROBE_DEFER */ + if (IS_ERR(ops) && (PTR_ERR(ops) != -EPROBE_DEFER)) { + dev_dbg(dev, "Adding to IOMMU failed: %ld\n", PTR_ERR(ops)); + ops = NULL; + } + return ops; }
-- Regards, Laurent Pinchart