iommu/rockchip: Register in a sensible order

Currently Rockchip calls iommu_device_register() before it's finished
setting up the hardware and driver state, and as such it now gets
unhappy in various ways when registration starts working the way it was
always intended to, and probing client devices straight away. Reorder
the operations to ensure that what we're registering is a prepared and
functional IOMMU instance.

Fixes: bcb81ac6ae3c ("iommu: Get DT/ACPI parsing into the proper probe path")
Signed-off-by: Robin Murphy <robin.murphy@arm.com>
Tested-by: Quentin Schulz <quentin.schulz@cherry.de>
Tested-by: Dang Huynh <danct12@riseup.net>
Reviewed-by: Nicolas Frattaroli <nicolas.frattaroli@collabora.com>
Tested-by: Nicolas Frattaroli <nicolas.frattaroli@collabora.com>
Link: https://lore.kernel.org/r/e69532f00bf49d98322b96788edb7e2e305e4006.1741886382.git.robin.murphy@arm.com
Signed-off-by: Joerg Roedel <jroedel@suse.de>

diff --git a/drivers/iommu/rockchip-iommu.c b/drivers/iommu/rockchip-iommu.c
index 48826d1ccfd85d3fbc3fb3edf4c041e028d566f1..9d2120a9232ac3591a6b1e1657fa81f0ad15874b 100644 (file)
--- a/drivers/iommu/rockchip-iommu.c
+++ b/drivers/iommu/rockchip-iommu.c
@@ -1256,14 +1256,6 @@ static int rk_iommu_probe(struct platform_device *pdev)
        if (err)
                return err;
 
-       err = iommu_device_sysfs_add(&iommu->iommu, dev, NULL, dev_name(dev));
-       if (err)
-               goto err_unprepare_clocks;
-
-       err = iommu_device_register(&iommu->iommu, &rk_iommu_ops, dev);
-       if (err)
-               goto err_remove_sysfs;
-
        /*
         * Use the first registered IOMMU device for domain to use with DMA
         * API, since a domain might not physically correspond to a single
@@ -1290,12 +1282,19 @@ static int rk_iommu_probe(struct platform_device *pdev)
 
        dma_set_mask_and_coherent(dev, rk_ops->dma_bit_mask);
 
+       err = iommu_device_sysfs_add(&iommu->iommu, dev, NULL, dev_name(dev));
+       if (err)
+               goto err_pm_disable;
+
+       err = iommu_device_register(&iommu->iommu, &rk_iommu_ops, dev);
+       if (err)
+               goto err_remove_sysfs;
+
        return 0;
-err_pm_disable:
-       pm_runtime_disable(dev);
 err_remove_sysfs:
        iommu_device_sysfs_remove(&iommu->iommu);
-err_unprepare_clocks:
+err_pm_disable:
+       pm_runtime_disable(dev);
        clk_bulk_unprepare(iommu->num_clocks, iommu->clocks);
        return err;
 }