Commit 29e93229 authored by Robin Murphy's avatar Robin Murphy Committed by Joerg Roedel
Browse files

iommu: Clean up bus_set_iommu() 



Clean up the remaining trivial bus_set_iommu() callsites along
with the implementation. Now drivers only have to know and care
about iommu_device instances, phew!

Reviewed-by: default avatarKevin Tian <kevin.tian@intel.com>
Tested-by: Matthew Rosato <mjrosato@linux.ibm.com> # s390
Tested-by: Niklas Schnelle <schnelle@linux.ibm.com> # s390
Signed-off-by: default avatarRobin Murphy <robin.murphy@arm.com>
Link: https://lore.kernel.org/r/ea383d5f4d74ffe200ab61248e5de6e95846180a.1660572783.git.robin.murphy@arm.com


Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent 19d3607c

drivers/iommu/arm/arm-smmu/qcom_iommu.c

+0 −4
Original line number Diff line number Diff line
@@ -837,8 +837,6 @@ static int qcom_iommu_device_probe(struct platform_device *pdev) 
		goto err_pm_disable;

	}



	bus_set_iommu(&platform_bus_type, &qcom_iommu_ops);



	if (qcom_iommu->local_base) {

		pm_runtime_get_sync(dev);

		writel_relaxed(0xffffffff, qcom_iommu->local_base + SMMU_INTR_SEL_NS);
@@ -856,8 +854,6 @@ static int qcom_iommu_device_remove(struct platform_device *pdev) 
{

	struct qcom_iommu_dev *qcom_iommu = platform_get_drvdata(pdev);



	bus_set_iommu(&platform_bus_type, NULL);



	pm_runtime_force_suspend(&pdev->dev);

	platform_set_drvdata(pdev, NULL);

	iommu_device_sysfs_remove(&qcom_iommu->iommu);

drivers/iommu/fsl_pamu_domain.c

+0 −4
Original line number Diff line number Diff line
@@ -476,11 +476,7 @@ int __init pamu_domain_init(void) 
	if (ret) {

		iommu_device_sysfs_remove(&pamu_iommu);

		pr_err("Can't register iommu device\n");

		return ret;

	}



	bus_set_iommu(&platform_bus_type, &fsl_pamu_ops);

	bus_set_iommu(&pci_bus_type, &fsl_pamu_ops);



	return ret;

}

drivers/iommu/intel/iommu.c

+0 −2
Original line number Diff line number Diff line
@@ -3890,7 +3890,6 @@ static int __init probe_acpi_namespace_devices(void) 
					continue;

				}



				pn->dev->bus->iommu_ops = &intel_iommu_ops;

				ret = iommu_probe_device(pn->dev);

				if (ret)

					break;
@@ -4023,7 +4022,6 @@ int __init intel_iommu_init(void) 
	}

	up_read(&dmar_global_lock);



	bus_set_iommu(&pci_bus_type, &intel_iommu_ops);

	if (si_domain && !hw_pass_through)

		register_memory_notifier(&intel_iommu_memory_nb);

drivers/iommu/iommu.c

+0 −24
Original line number Diff line number Diff line
@@ -1826,30 +1826,6 @@ int bus_iommu_probe(struct bus_type *bus) 
	return ret;

}



/**

 * bus_set_iommu - set iommu-callbacks for the bus

 * @bus: bus.

 * @ops: the callbacks provided by the iommu-driver

 *

 * This function is called by an iommu driver to set the iommu methods

 * used for a particular bus. Drivers for devices on that bus can use

 * the iommu-api after these ops are registered.

 * This special function is needed because IOMMUs are usually devices on

 * the bus itself, so the iommu drivers are not initialized when the bus

 * is set up. With this function the iommu-driver can set the iommu-ops

 * afterwards.

 */

int bus_set_iommu(struct bus_type *bus, const struct iommu_ops *ops)

{

	if (bus->iommu_ops && ops && bus->iommu_ops != ops)

		return -EBUSY;



	bus->iommu_ops = ops;



	return 0;

}

EXPORT_SYMBOL_GPL(bus_set_iommu);



bool iommu_present(struct bus_type *bus)

{

	return bus->iommu_ops != NULL;

drivers/iommu/msm_iommu.c

+0 −2
Original line number Diff line number Diff line
@@ -792,8 +792,6 @@ static int msm_iommu_probe(struct platform_device *pdev) 
		goto fail;

	}



	bus_set_iommu(&platform_bus_type, &msm_iommu_ops);



	pr_info("device mapped at %p, irq %d with %d ctx banks\n",

		iommu->base, iommu->irq, iommu->ncb);