iommu/ipmmu-vmsa: Register in a sensible order

IPMMU registers almost-initialised instances, but misses assigning the
drvdata to make them fully functional, so initial calls back into
ipmmu_probe_device() are likely to fail unnecessarily. Reorder this to
work as it should, also pruning the long-out-of-date comment and adding
the missing sysfs cleanup on error for good measure.

Reported-by: Geert Uytterhoeven <geert@linux-m68k.org>
Fixes: bcb81ac6ae3c ("iommu: Get DT/ACPI parsing into the proper probe path")
Signed-off-by: Robin Murphy <robin.murphy@arm.com>
Tested-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Link: https://lore.kernel.org/r/53be6667544de65a15415b699e38a9a965692e45.1742481687.git.robin.murphy@arm.com
Signed-off-by: Joerg Roedel <jroedel@suse.de>

diff --git a/drivers/iommu/ipmmu-vmsa.c b/drivers/iommu/ipmmu-vmsa.c
index 074daf1aac4e4c0c0f7df8e9c59b64b4f63d03c6..e424b279a8cd9baf6faa68103b5b971f93b162c9 100644 (file)
--- a/drivers/iommu/ipmmu-vmsa.c
+++ b/drivers/iommu/ipmmu-vmsa.c
@@ -1081,31 +1081,24 @@ static int ipmmu_probe(struct platform_device *pdev)
                }
        }
 
+       platform_set_drvdata(pdev, mmu);
        /*
         * Register the IPMMU to the IOMMU subsystem in the following cases:
         * - R-Car Gen2 IPMMU (all devices registered)
         * - R-Car Gen3 IPMMU (leaf devices only - skip root IPMMU-MM device)
         */
-       if (!mmu->features->has_cache_leaf_nodes || !ipmmu_is_root(mmu)) {
-               ret = iommu_device_sysfs_add(&mmu->iommu, &pdev->dev, NULL,
-                                            dev_name(&pdev->dev));
-               if (ret)
-                       return ret;
-
-               ret = iommu_device_register(&mmu->iommu, &ipmmu_ops, &pdev->dev);
-               if (ret)
-                       return ret;
-       }
+       if (mmu->features->has_cache_leaf_nodes && ipmmu_is_root(mmu))
+               return 0;
 
-       /*
-        * We can't create the ARM mapping here as it requires the bus to have
-        * an IOMMU, which only happens when bus_set_iommu() is called in
-        * ipmmu_init() after the probe function returns.
-        */
+       ret = iommu_device_sysfs_add(&mmu->iommu, &pdev->dev, NULL, dev_name(&pdev->dev));
+       if (ret)
+               return ret;
 
-       platform_set_drvdata(pdev, mmu);
+       ret = iommu_device_register(&mmu->iommu, &ipmmu_ops, &pdev->dev);
+       if (ret)
+               iommu_device_sysfs_remove(&mmu->iommu);
 
-       return 0;
+       return ret;
 }
 
 static void ipmmu_remove(struct platform_device *pdev)