On Sat, May 27, 2017 at 07:17:40PM +0530, Sricharan R wrote: > 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@xxxxxxxxxxxxxx> > Reviewed-by: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx> > Tested-by: Will Deacon <will.deacon@xxxxxxx> > Tested-by: Magnus Damn <magnus.damn@xxxxxxxxx> > Acked-by: Will Deacon <will.deacon@xxxxxxx> > Signed-off-by: Sricharan R <sricharan@xxxxxxxxxxxxxx> > --- > drivers/iommu/of_iommu.c | 1 + > 1 file changed, 1 insertion(+) Sorry for the confusion, I meant to apply this version of the patch-set instead of v5.