Commit a37b19a3 authored by Sricharan R's avatar Sricharan R Committed by Joerg Roedel

iommu/of: Ignore all errors except EPROBE_DEFER

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. Also make explicit that
of_dma_configure handles only -EPROBE_DEFER from
of_iommu_configure.

Fixes: 7b07cbef ("iommu: of: Handle IOMMU lookup failure with deferred probing or error")
Reported-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Tested-by: default avatarMagnus Damn <magnus.damn@gmail.com>
Signed-off-by: default avatarSricharan R <sricharan@codeaurora.org>
Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent 573d4175
...@@ -237,6 +237,12 @@ const struct iommu_ops *of_iommu_configure(struct device *dev, ...@@ -237,6 +237,12 @@ const struct iommu_ops *of_iommu_configure(struct device *dev,
ops = ERR_PTR(err); 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; return ops;
} }
......
...@@ -144,8 +144,8 @@ int of_dma_configure(struct device *dev, struct device_node *np) ...@@ -144,8 +144,8 @@ int of_dma_configure(struct device *dev, struct device_node *np)
coherent ? " " : " not "); coherent ? " " : " not ");
iommu = of_iommu_configure(dev, np); iommu = of_iommu_configure(dev, np);
if (IS_ERR(iommu)) if (IS_ERR(iommu) && PTR_ERR(iommu) == -EPROBE_DEFER)
return PTR_ERR(iommu); return -EPROBE_DEFER;
dev_dbg(dev, "device is%sbehind an iommu\n", dev_dbg(dev, "device is%sbehind an iommu\n",
iommu ? " " : " not "); iommu ? " " : " not ");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment