iommu: Move new probe_device path to separate function

This makes it easier to remove to old code-path when all drivers are
converted. As a side effect that it also fixes the error cleanup
path.

Signed-off-by: Joerg Roedel <jroedel@suse.de>
Tested-by: Marek Szyprowski <m.szyprowski@samsung.com>
Acked-by: Marek Szyprowski <m.szyprowski@samsung.com>
Link: https://lore.kernel.org/r/20200429133712.31431-11-joro@8bytes.org
Signed-off-by: Joerg Roedel <jroedel@suse.de>

diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
index 18eb3623bd002583f3d00b98453fab13c35ea971..8be047a4808f7b3dc2021d5a3c08e45803696ed7 100644 (file)
--- a/drivers/iommu/iommu.c
+++ b/drivers/iommu/iommu.c
@@ -218,12 +218,55 @@ out_release:
        return ret;
 }
 
+static int __iommu_probe_device_helper(struct device *dev)
+{
+       const struct iommu_ops *ops = dev->bus->iommu_ops;
+       struct iommu_group *group;
+       int ret;
+
+       ret = __iommu_probe_device(dev, NULL);
+       if (ret)
+               goto err_out;
+
+       /*
+        * Try to allocate a default domain - needs support from the
+        * IOMMU driver. There are still some drivers which don't
+        * support default domains, so the return value is not yet
+        * checked.
+        */
+       iommu_alloc_default_domain(dev);
+
+       group = iommu_group_get(dev);
+       if (!group)
+               goto err_release;
+
+       if (group->default_domain)
+               ret = __iommu_attach_device(group->default_domain, dev);
+
+       iommu_group_put(group);
+
+       if (ret)
+               goto err_release;
+
+       if (ops->probe_finalize)
+               ops->probe_finalize(dev);
+
+       return 0;
+
+err_release:
+       iommu_release_device(dev);
+err_out:
+       return ret;
+
+}
+
 int iommu_probe_device(struct device *dev)
 {
        const struct iommu_ops *ops = dev->bus->iommu_ops;
        int ret;
 
        WARN_ON(dev->iommu_group);
+
        if (!ops)
                return -EINVAL;
 
@@ -235,30 +278,10 @@ int iommu_probe_device(struct device *dev)
                goto err_free_dev_param;
        }
 
-       if (ops->probe_device) {
-               struct iommu_group *group;
-
-               ret = __iommu_probe_device(dev, NULL);
-
-               /*
-                * Try to allocate a default domain - needs support from the
-                * IOMMU driver. There are still some drivers which don't
-                * support default domains, so the return value is not yet
-                * checked.
-                */
-               if (!ret)
-                       iommu_alloc_default_domain(dev);
-
-               group = iommu_group_get(dev);
-               if (group && group->default_domain) {
-                       ret = __iommu_attach_device(group->default_domain, dev);
-                       iommu_group_put(group);
-               }
-
-       } else {
-               ret = ops->add_device(dev);
-       }
+       if (ops->probe_device)
+               return __iommu_probe_device_helper(dev);
 
+       ret = ops->add_device(dev);
        if (ret)
                goto err_module_put;