iommu/of: Fix check for returning EPROBE_DEFER
authorSricharan R <sricharan@codeaurora.org>
Sat, 27 May 2017 13:47:40 +0000 (19:17 +0530)
committerJoerg Roedel <jroedel@suse.de>
Tue, 30 May 2017 09:31:32 +0000 (11:31 +0200)
commit573d41757c47cb71cd572236685d4c9e6cacc06c
tree4c0ece8d43dba4d066eb2ca7af5e904739a4e985
parent4b1c88984c8ac894c2c411570757bed7fa5f3226
iommu/of: Fix check for returning EPROBE_DEFER

Now with IOMMU probe deferral, we return -EPROBE_DEFER
for masters that are connected to an IOMMU which is not
probed yet, but going to get probed, so that we can attach
the correct dma_ops. So while trying to defer the probe of
the master, check if the of_iommu node that it is connected
to is marked in DT as 'status=disabled', then the IOMMU is never
is going to get probed. So simply return NULL and let the master
work without an IOMMU.

Fixes: 7b07cbefb68d ("iommu: of: Handle IOMMU lookup failure with deferred probing or error")
Reported-by: Geert Uytterhoeven <geert@linux-m68k.org>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Tested-by: Will Deacon <will.deacon@arm.com>
Tested-by: Magnus Damn <magnus.damn@gmail.com>
Acked-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Sricharan R <sricharan@codeaurora.org>
Signed-off-by: Joerg Roedel <jroedel@suse.de>
drivers/iommu/of_iommu.c