iommu/amd: Convert to probe/release_device() call-backs

Convert the AMD IOMMU Driver to use the probe_device() and
release_device() call-backs of iommu_ops, so that the iommu core code
does the group and sysfs setup.

Signed-off-by: Joerg Roedel <jroedel@suse.de>
Link: https://lore.kernel.org/r/20200429133712.31431-16-joro@8bytes.org
Signed-off-by: Joerg Roedel <jroedel@suse.de>

diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
index 0b4b4fa..c303674 100644 (file)
--- a/drivers/iommu/amd_iommu.c
+++ b/drivers/iommu/amd_iommu.c
@@ -343,21 +343,9 @@ static bool check_device(struct device *dev)
        return true;
 }
 
-static void init_iommu_group(struct device *dev)
-{
-       struct iommu_group *group;
-
-       group = iommu_group_get_for_dev(dev);
-       if (IS_ERR(group))
-               return;
-
-       iommu_group_put(group);
-}
-
 static int iommu_init_device(struct device *dev)
 {
        struct iommu_dev_data *dev_data;
-       struct amd_iommu *iommu;
        int devid;
 
        if (dev->archdata.iommu)
@@ -367,8 +355,6 @@ static int iommu_init_device(struct device *dev)
        if (devid < 0)
                return devid;
 
-       iommu = amd_iommu_rlookup_table[devid];
-
        dev_data = find_dev_data(devid);
        if (!dev_data)
                return -ENOMEM;
@@ -391,8 +377,6 @@ static int iommu_init_device(struct device *dev)
 
        dev->archdata.iommu = dev_data;
 
-       iommu_device_link(&iommu->iommu, dev);
-
        return 0;
 }
 
@@ -410,7 +394,7 @@ static void iommu_ignore_device(struct device *dev)
        setup_aliases(dev);
 }
 
-static void iommu_uninit_device(struct device *dev)
+static void amd_iommu_uninit_device(struct device *dev)
 {
        struct iommu_dev_data *dev_data;
        struct amd_iommu *iommu;
@@ -429,13 +413,6 @@ static void iommu_uninit_device(struct device *dev)
        if (dev_data->domain)
                detach_device(dev);
 
-       iommu_device_unlink(&iommu->iommu, dev);
-
-       iommu_group_remove_device(dev);
-
-       /* Remove dma-ops */
-       dev->dma_ops = NULL;
-
        /*
         * We keep dev_data around for unplugged devices and reuse it when the
         * device is re-plugged - not doing so would introduce a ton of races.
@@ -2152,55 +2129,50 @@ out:
        spin_unlock_irqrestore(&domain->lock, flags);
 }
 
-static int amd_iommu_add_device(struct device *dev)
+static struct iommu_device *amd_iommu_probe_device(struct device *dev)
 {
-       struct iommu_dev_data *dev_data;
-       struct iommu_domain *domain;
+       struct iommu_device *iommu_dev;
        struct amd_iommu *iommu;
        int ret, devid;
 
-       if (get_dev_data(dev))
-               return 0;
-
        if (!check_device(dev))
-               return -ENODEV;
+               return ERR_PTR(-ENODEV);
 
        devid = get_device_id(dev);
        if (devid < 0)
-               return devid;
+               return ERR_PTR(devid);
 
        iommu = amd_iommu_rlookup_table[devid];
 
+       if (get_dev_data(dev))
+               return &iommu->iommu;
+
        ret = iommu_init_device(dev);
        if (ret) {
                if (ret != -ENOTSUPP)
                        dev_err(dev, "Failed to initialize - trying to proceed anyway\n");
-
+               iommu_dev = ERR_PTR(ret);
                iommu_ignore_device(dev);
-               dev->dma_ops = NULL;
-               goto out;
+       } else {
+               iommu_dev = &iommu->iommu;
        }
-       init_iommu_group(dev);
 
-       dev_data = get_dev_data(dev);
+       iommu_completion_wait(iommu);
 
-       BUG_ON(!dev_data);
+       return iommu_dev;
+}
 
-       if (dev_data->iommu_v2)
-               iommu_request_dm_for_dev(dev);
+static void amd_iommu_probe_finalize(struct device *dev)
+{
+       struct iommu_domain *domain;
 
        /* Domains are initialized for this device - have a look what we ended up with */
        domain = iommu_get_domain_for_dev(dev);
        if (domain->type == IOMMU_DOMAIN_DMA)
                iommu_setup_dma_ops(dev, IOVA_START_PFN << PAGE_SHIFT, 0);
-
-out:
-       iommu_completion_wait(iommu);
-
-       return 0;
 }
 
-static void amd_iommu_remove_device(struct device *dev)
+static void amd_iommu_release_device(struct device *dev)
 {
        struct amd_iommu *iommu;
        int devid;
@@ -2214,7 +2186,7 @@ static void amd_iommu_remove_device(struct device *dev)
 
        iommu = amd_iommu_rlookup_table[devid];
 
-       iommu_uninit_device(dev);
+       amd_iommu_uninit_device(dev);
        iommu_completion_wait(iommu);
 }
 
@@ -2687,8 +2659,9 @@ const struct iommu_ops amd_iommu_ops = {
        .map = amd_iommu_map,
        .unmap = amd_iommu_unmap,
        .iova_to_phys = amd_iommu_iova_to_phys,
-       .add_device = amd_iommu_add_device,
-       .remove_device = amd_iommu_remove_device,
+       .probe_device = amd_iommu_probe_device,
+       .release_device = amd_iommu_release_device,
+       .probe_finalize = amd_iommu_probe_finalize,
        .device_group = amd_iommu_device_group,
        .domain_get_attr = amd_iommu_domain_get_attr,
        .get_resv_regions = amd_iommu_get_resv_regions,