p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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>
This commit is contained in:
Joerg Roedel 2017-04-12 00:21:31 -05:00
parent 01611fe847
commit 28ae1e3e14
2 changed files with 39 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
drivers/iommu/omap-iommu.c
View File

@ -943,9 +943,13 @@ static int omap_iommu_probe(struct platform_device *pdev)
return err; return err;
platform_set_drvdata(pdev, obj); 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); err = iommu_device_sysfs_add(&obj->iommu, obj->dev, NULL, obj->name);
if (err) if (err)
return err; goto out_group;
iommu_device_set_ops(&obj->iommu, &omap_iommu_ops); 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); omap_iommu_debugfs_add(obj);
dev_info(&pdev->dev, "%s registered\n", obj->name); dev_info(&pdev->dev, "%s registered\n", obj->name);
return 0; return 0;
out_sysfs: out_sysfs:
iommu_device_sysfs_remove(&obj->iommu); iommu_device_sysfs_remove(&obj->iommu);
out_group:
iommu_group_put(obj->group);
return err; return err;
} }
@ -970,6 +977,9 @@ static int omap_iommu_remove(struct platform_device *pdev)
{ {
struct omap_iommu *obj = platform_get_drvdata(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_sysfs_remove(&obj->iommu);
iommu_device_unregister(&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_arch_data *arch_data;
struct omap_iommu *oiommu; struct omap_iommu *oiommu;
struct iommu_group *group;
struct device_node *np; struct device_node *np;
struct platform_device *pdev; struct platform_device *pdev;
int ret; int ret;
@ -1262,6 +1273,19 @@ static int omap_iommu_add_device(struct device *dev)
arch_data->iommu_dev = oiommu; arch_data->iommu_dev = oiommu;
dev->archdata.iommu = arch_data; 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); of_node_put(np);
return 0; return 0;
@ -1275,12 +1299,24 @@ static void omap_iommu_remove_device(struct device *dev)
return; return;
iommu_device_unlink(&arch_data->iommu_dev->iommu, dev); iommu_device_unlink(&arch_data->iommu_dev->iommu, dev);
iommu_group_remove_device(dev);
dev->archdata.iommu = NULL; dev->archdata.iommu = NULL;
kfree(arch_data); 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 = { static const struct iommu_ops omap_iommu_ops = {
.domain_alloc = omap_iommu_domain_alloc, .domain_alloc = omap_iommu_domain_alloc,
.domain_free = omap_iommu_domain_free, .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, .iova_to_phys = omap_iommu_iova_to_phys,
.add_device = omap_iommu_add_device, .add_device = omap_iommu_add_device,
.remove_device = omap_iommu_remove_device, .remove_device = omap_iommu_remove_device,
.device_group = omap_iommu_device_group,
.pgsize_bitmap = OMAP_IOMMU_PGSIZES, .pgsize_bitmap = OMAP_IOMMU_PGSIZES,
}; };

1
drivers/iommu/omap-iommu.h
View File

@ -70,6 +70,7 @@ struct omap_iommu {
u32 id; u32 id;
struct iommu_device iommu; struct iommu_device iommu;
struct iommu_group *group;
}; };
/** /**