iommu/arm-smmu: Make use of the iommu_register interface

Also add the smmu devices to sysfs.

Signed-off-by: Joerg Roedel <jroedel@suse.de>

1 files changed, 21 insertions, 1 deletions

diff --git a/drivers/iommu/arm-smmu-v3.c b/drivers/iommu/arm-smmu-v3.c
index 4d6ec444a9d6..32133e289ff6 100644
--- a/drivers/iommu/arm-smmu-v3.c
+++ b/drivers/iommu/arm-smmu-v3.c
@@ -616,6 +616,9 @@ struct arm_smmu_device {
         unsigned int                    sid_bits;
 
         struct arm_smmu_strtab_cfg      strtab_cfg;
+
+        /* IOMMU core code handle */
+        struct iommu_device             iommu;
 };
 
 /* SMMU private data for each master */
@@ -1795,8 +1798,10 @@ static int arm_smmu_add_device(struct device *dev)
         }
 
         group = iommu_group_get_for_dev(dev);
-        if (!IS_ERR(group))
+        if (!IS_ERR(group)) {
                 iommu_group_put(group);
+                iommu_device_link(&smmu->iommu, dev);
+        }
 
         return PTR_ERR_OR_ZERO(group);
 }
@@ -1805,14 +1810,17 @@ static void arm_smmu_remove_device(struct device *dev)
 {
         struct iommu_fwspec *fwspec = dev->iommu_fwspec;
         struct arm_smmu_master_data *master;
+        struct arm_smmu_device *smmu;
 
         if (!fwspec || fwspec->ops != &arm_smmu_ops)
                 return;
 
         master = fwspec->iommu_priv;
+        smmu = master->smmu;
         if (master && master->ste.valid)
                 arm_smmu_detach_dev(dev);
         iommu_group_remove_device(dev);
+        iommu_device_unlink(&smmu->iommu, dev);
         kfree(master);
         iommu_fwspec_free(dev);
 }
@@ -2613,6 +2621,7 @@ static int arm_smmu_device_probe(struct platform_device *pdev)
 {
         int irq, ret;
         struct resource *res;
+        resource_size_t ioaddr;
         struct arm_smmu_device *smmu;
         struct device *dev = &pdev->dev;
         bool bypass;
@@ -2630,6 +2639,7 @@ static int arm_smmu_device_probe(struct platform_device *pdev)
                 dev_err(dev, "MMIO region too small (%pr)\n", res);
                 return -EINVAL;
         }
+        ioaddr = res->start;
 
         smmu->base = devm_ioremap_resource(dev, res);
         if (IS_ERR(smmu->base))
@@ -2682,6 +2692,16 @@ static int arm_smmu_device_probe(struct platform_device *pdev)
                 return ret;
 
         /* And we're up. Go go go! */
+        ret = iommu_device_sysfs_add(&smmu->iommu, dev, NULL,
+                                     "smmu3.%pa", &ioaddr);
+        if (ret)
+                return ret;
+
+        iommu_device_set_ops(&smmu->iommu, &arm_smmu_ops);
+        iommu_device_set_fwnode(&smmu->iommu, dev->fwnode);
+
+        ret = iommu_device_register(&smmu->iommu);
+
         iommu_register_instance(dev->fwnode, &arm_smmu_ops);
 
 #ifdef CONFIG_PCI