@@ -1919,6 +1919,7 @@ static int arm_smmu_device_dt_probe(struct platform_device *pdev)
if (of_property_read_bool(dev->of_node, "mmu-masters"))
arm_smmu_probe_mmu_masters(smmu);
arm_smmu_device_reset(smmu);
+ of_iommu_set_ops(dev->of_node, &arm_smmu_ops);
return 0;
out_free_irqs:
@@ -1957,24 +1958,13 @@ static struct platform_driver arm_smmu_driver = {
.remove = arm_smmu_device_remove,
};
-static int __init arm_smmu_init(void)
+static int __init arm_smmu_of_init(struct device_node *np)
{
- struct device_node *np;
static bool done;
int ret;
if (done)
return 0;
- /*
- * Play nice with systems that don't have an ARM SMMU by checking that
- * an ARM SMMU exists in the system before proceeding with the driver
- * and IOMMU bus operation registration.
- */
- np = of_find_matching_node(NULL, arm_smmu_of_match);
- if (!np)
- return 0;
-
- of_node_put(np);
ret = platform_driver_register(&arm_smmu_driver);
if (ret)
@@ -2002,28 +1992,8 @@ static void __exit arm_smmu_exit(void)
{
return platform_driver_unregister(&arm_smmu_driver);
}
-
-subsys_initcall(arm_smmu_init);
module_exit(arm_smmu_exit);
-static int __init arm_smmu_of_init(struct device_node *np)
-{
- struct arm_smmu_device *smmu;
- struct platform_device *pdev;
- int ret = arm_smmu_init();
-
- if (ret)
- return ret;
-
- pdev = of_platform_device_create(np, NULL, platform_bus_type.dev_root);
- if (!pdev)
- return -ENODEV;
-
- smmu = platform_get_drvdata(pdev);
- of_iommu_set_ops(np, &arm_smmu_ops);
-
- return 0;
-}
IOMMU_OF_DECLARE(arm_smmuv1, "arm,smmu-v1", arm_smmu_of_init);
IOMMU_OF_DECLARE(arm_smmuv2, "arm,smmu-v2", arm_smmu_of_init);
IOMMU_OF_DECLARE(arm_mmu400, "arm,mmu-400", arm_smmu_of_init);
iommu_ops should be set after the iommu is probed. This ensures that the iommu is really ready when master's iommu ops are set during their probe or else deferred. Signed-off-by: Sricharan R <sricharan@codeaurora.org> --- drivers/iommu/arm-smmu.c | 34 ++-------------------------------- 1 file changed, 2 insertions(+), 32 deletions(-)