iommu/arm-smmu: Switch to device_group call-back

This converts the ARM SMMU and the SMMUv3 driver to use the
new device_group call-back.

Cc: Will Deacon <will.deacon@arm.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>

2 files changed, 47 insertions, 31 deletions

diff --git a/drivers/iommu/arm-smmu-v3.c b/drivers/iommu/arm-smmu-v3.c
index dafaf59dc3b8..fbd4fedd5162 100644
--- a/drivers/iommu/arm-smmu-v3.c
+++ b/drivers/iommu/arm-smmu-v3.c
@@ -1898,6 +1898,7 @@ static struct iommu_ops arm_smmu_ops = {
         .iova_to_phys           = arm_smmu_iova_to_phys,
         .add_device             = arm_smmu_add_device,
         .remove_device          = arm_smmu_remove_device,
+        .device_group           = pci_device_group,
         .domain_get_attr        = arm_smmu_domain_get_attr,
         .domain_set_attr        = arm_smmu_domain_set_attr,
         .pgsize_bitmap          = -1UL, /* Restricted during device attach */
diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c
index 48a39dfa9777..b4c0629d7f7d 100644
--- a/drivers/iommu/arm-smmu.c
+++ b/drivers/iommu/arm-smmu.c
@@ -1292,33 +1292,25 @@ static void __arm_smmu_release_pci_iommudata(void *data)
         kfree(data);
 }
 
-static int arm_smmu_add_pci_device(struct pci_dev *pdev)
+static int arm_smmu_init_pci_device(struct pci_dev *pdev,
+                                    struct iommu_group *group)
 {
-        int i, ret;
-        u16 sid;
-        struct iommu_group *group;
         struct arm_smmu_master_cfg *cfg;
-
-        group = iommu_group_get_for_dev(&pdev->dev);
-        if (IS_ERR(group))
-                return PTR_ERR(group);
+        u16 sid;
+        int i;
 
         cfg = iommu_group_get_iommudata(group);
         if (!cfg) {
                 cfg = kzalloc(sizeof(*cfg), GFP_KERNEL);
-                if (!cfg) {
-                        ret = -ENOMEM;
-                        goto out_put_group;
-                }
+                if (!cfg)
+                        return -ENOMEM;
 
                 iommu_group_set_iommudata(group, cfg,
                                           __arm_smmu_release_pci_iommudata);
         }
 
-        if (cfg->num_streamids >= MAX_MASTER_STREAMIDS) {
-                ret = -ENOSPC;
-                goto out_put_group;
-        }
+        if (cfg->num_streamids >= MAX_MASTER_STREAMIDS)
+                return -ENOSPC;
 
         /*
          * Assume Stream ID == Requester ID for now.
@@ -1334,16 +1326,13 @@ static int arm_smmu_add_pci_device(struct pci_dev *pdev)
                 cfg->streamids[cfg->num_streamids++] = sid;
 
         return 0;
-out_put_group:
-        iommu_group_put(group);
-        return ret;
 }
 
-static int arm_smmu_add_platform_device(struct device *dev)
+static int arm_smmu_init_platform_device(struct device *dev,
+                                         struct iommu_group *group)
 {
-        struct iommu_group *group;
-        struct arm_smmu_master *master;
         struct arm_smmu_device *smmu = find_smmu_for_device(dev);
+        struct arm_smmu_master *master;
 
         if (!smmu)
                 return -ENODEV;
@@ -1352,21 +1341,20 @@ static int arm_smmu_add_platform_device(struct device *dev)
         if (!master)
                 return -ENODEV;
 
-        /* No automatic group creation for platform devices */
-        group = iommu_group_alloc();
-        if (IS_ERR(group))
-                return PTR_ERR(group);
-
         iommu_group_set_iommudata(group, &master->cfg, NULL);
-        return iommu_group_add_device(group, dev);
+
+        return 0;
 }
 
 static int arm_smmu_add_device(struct device *dev)
 {
-        if (dev_is_pci(dev))
-                return arm_smmu_add_pci_device(to_pci_dev(dev));
+        struct iommu_group *group;
 
-        return arm_smmu_add_platform_device(dev);
+        group = iommu_group_get_for_dev(dev);
+        if (IS_ERR(group))
+                return PTR_ERR(group);
+
+        return 0;
 }
 
 static void arm_smmu_remove_device(struct device *dev)
@@ -1374,6 +1362,32 @@ static void arm_smmu_remove_device(struct device *dev)
         iommu_group_remove_device(dev);
 }
 
+static struct iommu_group *arm_smmu_device_group(struct device *dev)
+{
+        struct iommu_group *group;
+        int ret;
+
+        if (dev_is_pci(dev))
+                group = pci_device_group(dev);
+        else
+                group = generic_device_group(dev);
+
+        if (IS_ERR(group))
+                return group;
+
+        if (dev_is_pci(dev))
+                ret = arm_smmu_init_pci_device(to_pci_dev(dev), group);
+        else
+                ret = arm_smmu_init_platform_device(dev, group);
+
+        if (ret) {
+                iommu_group_put(group);
+                group = ERR_PTR(ret);
+        }
+
+        return group;
+}
+
 static int arm_smmu_domain_get_attr(struct iommu_domain *domain,
                                     enum iommu_attr attr, void *data)
 {
@@ -1430,6 +1444,7 @@ static struct iommu_ops arm_smmu_ops = {
         .iova_to_phys           = arm_smmu_iova_to_phys,
         .add_device             = arm_smmu_add_device,
         .remove_device          = arm_smmu_remove_device,
+        .device_group           = arm_smmu_device_group,
         .domain_get_attr        = arm_smmu_domain_get_attr,
         .domain_set_attr        = arm_smmu_domain_set_attr,
         .pgsize_bitmap          = -1UL, /* Restricted during device attach */