iommu/omap: Add iommu-group support

Support for IOMMU groups will become mandatory for drivers,
so add it to the omap iommu driver.

Signed-off-by: Joerg Roedel <jroedel@suse.de>
[s-anna@ti.com: minor error cleanups]
Signed-off-by: Suman Anna <s-anna@ti.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>

diff --git a/drivers/iommu/omap-iommu.c b/drivers/iommu/omap-iommu.c
index ef44fc740da7221f8561f5c43aaad082d7019b54..95dfca36ccb993e90c21aadb8454272a1838b7b7 100644 (file)
--- a/drivers/iommu/omap-iommu.c
+++ b/drivers/iommu/omap-iommu.c
@@ -943,9 +943,13 @@ static int omap_iommu_probe(struct platform_device *pdev)
                return err;
        platform_set_drvdata(pdev, obj);
 
+       obj->group = iommu_group_alloc();
+       if (IS_ERR(obj->group))
+               return PTR_ERR(obj->group);
+
        err = iommu_device_sysfs_add(&obj->iommu, obj->dev, NULL, obj->name);
        if (err)
-               return err;
+               goto out_group;
 
        iommu_device_set_ops(&obj->iommu, &omap_iommu_ops);
 
@@ -959,10 +963,13 @@ static int omap_iommu_probe(struct platform_device *pdev)
        omap_iommu_debugfs_add(obj);
 
        dev_info(&pdev->dev, "%s registered\n", obj->name);
+
        return 0;
 
 out_sysfs:
        iommu_device_sysfs_remove(&obj->iommu);
+out_group:
+       iommu_group_put(obj->group);
        return err;
 }
 
@@ -970,6 +977,9 @@ static int omap_iommu_remove(struct platform_device *pdev)
 {
        struct omap_iommu *obj = platform_get_drvdata(pdev);
 
+       iommu_group_put(obj->group);
+       obj->group = NULL;
+
        iommu_device_sysfs_remove(&obj->iommu);
        iommu_device_unregister(&obj->iommu);
 
@@ -1217,6 +1227,7 @@ static int omap_iommu_add_device(struct device *dev)
 {
        struct omap_iommu_arch_data *arch_data;
        struct omap_iommu *oiommu;
+       struct iommu_group *group;
        struct device_node *np;
        struct platform_device *pdev;
        int ret;
@@ -1262,6 +1273,19 @@ static int omap_iommu_add_device(struct device *dev)
        arch_data->iommu_dev = oiommu;
        dev->archdata.iommu = arch_data;
 
+       /*
+        * IOMMU group initialization calls into omap_iommu_device_group, which
+        * needs a valid dev->archdata.iommu pointer
+        */
+       group = iommu_group_get_for_dev(dev);
+       if (IS_ERR(group)) {
+               iommu_device_unlink(&oiommu->iommu, dev);
+               dev->archdata.iommu = NULL;
+               kfree(arch_data);
+               return PTR_ERR(group);
+       }
+       iommu_group_put(group);
+
        of_node_put(np);
 
        return 0;
@@ -1275,12 +1299,24 @@ static void omap_iommu_remove_device(struct device *dev)
                return;
 
        iommu_device_unlink(&arch_data->iommu_dev->iommu, dev);
+       iommu_group_remove_device(dev);
 
        dev->archdata.iommu = NULL;
        kfree(arch_data);
 
 }
 
+static struct iommu_group *omap_iommu_device_group(struct device *dev)
+{
+       struct omap_iommu_arch_data *arch_data = dev->archdata.iommu;
+       struct iommu_group *group = NULL;
+
+       if (arch_data->iommu_dev)
+               group = arch_data->iommu_dev->group;
+
+       return group;
+}
+
 static const struct iommu_ops omap_iommu_ops = {
        .domain_alloc   = omap_iommu_domain_alloc,
        .domain_free    = omap_iommu_domain_free,
@@ -1292,6 +1328,7 @@ static const struct iommu_ops omap_iommu_ops = {
        .iova_to_phys   = omap_iommu_iova_to_phys,
        .add_device     = omap_iommu_add_device,
        .remove_device  = omap_iommu_remove_device,
+       .device_group   = omap_iommu_device_group,
        .pgsize_bitmap  = OMAP_IOMMU_PGSIZES,
 };
 

diff --git a/drivers/iommu/omap-iommu.h b/drivers/iommu/omap-iommu.h
index 758958a4712ccf10814cfdfe768855a3bdd24641..6e70515e60385bfdadb520242107d045f8e82ec4 100644 (file)
--- a/drivers/iommu/omap-iommu.h
+++ b/drivers/iommu/omap-iommu.h
@@ -70,6 +70,7 @@ struct omap_iommu {
        u32 id;
 
        struct iommu_device iommu;
+       struct iommu_group *group;
 };
 
 /**