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

Commit 000a2f25 authored by Patrick Daly's avatar Patrick Daly Committed by Gerrit - the friendly Code Review server
Browse files

iommu: arm-smmu: Handle multiple arm-smmu instances 



There may be multiple instances of an iommu present on the same bus.
Ensure the add_device() callback is called for each iommu instance,
rather than just the first one.

Change-Id: Ia55ef6e8ed3bd85214d111bb29f4e22ca696b185
Signed-off-by: default avatarPatrick Daly <pdaly@codeaurora.org>
parent 8e3371a0

drivers/iommu/arm-smmu.c

+11 −0
Original line number Diff line number Diff line
@@ -3628,6 +3628,14 @@ static int arm_smmu_of_iommu_configure_fixup(struct device *dev, void *data) 
	return 0;

}



static int arm_smmu_add_device_fixup(struct device *dev, void *data)

{

	struct iommu_ops *ops = data;



	ops->add_device(dev);

	return 0;

}



static int qsmmuv500_tbu_register(struct device *dev, void *data);

static int arm_smmu_device_dt_probe(struct platform_device *pdev)

{
@@ -3767,6 +3775,9 @@ static int arm_smmu_device_dt_probe(struct platform_device *pdev) 
	/* Oh, for a proper bus abstraction */

	if (!iommu_present(&platform_bus_type))

		bus_set_iommu(&platform_bus_type, &arm_smmu_ops);

	else

		bus_for_each_dev(&platform_bus_type, NULL, &arm_smmu_ops,

				 arm_smmu_add_device_fixup);

#ifdef CONFIG_ARM_AMBA

	if (!iommu_present(&amba_bustype))

		bus_set_iommu(&amba_bustype, &arm_smmu_ops);