Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6ec23790 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "iommu/of: return -EPROBE_DEFER when smmu driver is not registered"

parents 13f4b1dc 94c99712

drivers/iommu/of_iommu.c

+8 −0
Original line number Diff line number Diff line
@@ -119,6 +119,14 @@ static int of_iommu_xlate(struct device *dev, 
	int err;



	ops = iommu_ops_from_fwnode(fwnode);

	/*

	 * Return -EPROBE_DEFER for the platform devices which are dependent

	 * on the SMMU driver registration. Deferring from here helps in adding

	 * the clients in proper iommu groups.

	 */

	if (!dev_is_pci(dev) && of_device_is_available(iommu_spec->np) && !ops)

		return -EPROBE_DEFER;



	if ((ops && !ops->of_xlate) ||

	    !of_device_is_available(iommu_spec->np) ||

	    (!ops && !of_iommu_driver_present(iommu_spec->np)))