iommu/rockchip: Support sharing IOMMU between masters
There would be some masters sharing the same IOMMU device. Put them in the same iommu group and share the same iommu domain. Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com> Reviewed-by: Robin Murphy <robin.murphy@arm.com> Signed-off-by: Joerg Roedel <jroedel@suse.de>
This commit is contained in:
parent
0f181d3cf7
commit
57c26957bd
|
@ -104,6 +104,7 @@ struct rk_iommu {
|
||||||
struct iommu_device iommu;
|
struct iommu_device iommu;
|
||||||
struct list_head node; /* entry in rk_iommu_domain.iommus */
|
struct list_head node; /* entry in rk_iommu_domain.iommus */
|
||||||
struct iommu_domain *domain; /* domain to which iommu is attached */
|
struct iommu_domain *domain; /* domain to which iommu is attached */
|
||||||
|
struct iommu_group *group;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct rk_iommudata {
|
struct rk_iommudata {
|
||||||
|
@ -1073,6 +1074,15 @@ static void rk_iommu_remove_device(struct device *dev)
|
||||||
iommu_group_remove_device(dev);
|
iommu_group_remove_device(dev);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static struct iommu_group *rk_iommu_device_group(struct device *dev)
|
||||||
|
{
|
||||||
|
struct rk_iommu *iommu;
|
||||||
|
|
||||||
|
iommu = rk_iommu_from_dev(dev);
|
||||||
|
|
||||||
|
return iommu_group_ref_get(iommu->group);
|
||||||
|
}
|
||||||
|
|
||||||
static int rk_iommu_of_xlate(struct device *dev,
|
static int rk_iommu_of_xlate(struct device *dev,
|
||||||
struct of_phandle_args *args)
|
struct of_phandle_args *args)
|
||||||
{
|
{
|
||||||
|
@ -1104,7 +1114,7 @@ static const struct iommu_ops rk_iommu_ops = {
|
||||||
.add_device = rk_iommu_add_device,
|
.add_device = rk_iommu_add_device,
|
||||||
.remove_device = rk_iommu_remove_device,
|
.remove_device = rk_iommu_remove_device,
|
||||||
.iova_to_phys = rk_iommu_iova_to_phys,
|
.iova_to_phys = rk_iommu_iova_to_phys,
|
||||||
.device_group = generic_device_group,
|
.device_group = rk_iommu_device_group,
|
||||||
.pgsize_bitmap = RK_IOMMU_PGSIZE_BITMAP,
|
.pgsize_bitmap = RK_IOMMU_PGSIZE_BITMAP,
|
||||||
.of_xlate = rk_iommu_of_xlate,
|
.of_xlate = rk_iommu_of_xlate,
|
||||||
};
|
};
|
||||||
|
@ -1173,9 +1183,15 @@ static int rk_iommu_probe(struct platform_device *pdev)
|
||||||
if (err)
|
if (err)
|
||||||
return err;
|
return err;
|
||||||
|
|
||||||
|
iommu->group = iommu_group_alloc();
|
||||||
|
if (IS_ERR(iommu->group)) {
|
||||||
|
err = PTR_ERR(iommu->group);
|
||||||
|
goto err_unprepare_clocks;
|
||||||
|
}
|
||||||
|
|
||||||
err = iommu_device_sysfs_add(&iommu->iommu, dev, NULL, dev_name(dev));
|
err = iommu_device_sysfs_add(&iommu->iommu, dev, NULL, dev_name(dev));
|
||||||
if (err)
|
if (err)
|
||||||
goto err_unprepare_clocks;
|
goto err_put_group;
|
||||||
|
|
||||||
iommu_device_set_ops(&iommu->iommu, &rk_iommu_ops);
|
iommu_device_set_ops(&iommu->iommu, &rk_iommu_ops);
|
||||||
iommu_device_set_fwnode(&iommu->iommu, &dev->of_node->fwnode);
|
iommu_device_set_fwnode(&iommu->iommu, &dev->of_node->fwnode);
|
||||||
|
@ -1199,6 +1215,8 @@ static int rk_iommu_probe(struct platform_device *pdev)
|
||||||
return 0;
|
return 0;
|
||||||
err_remove_sysfs:
|
err_remove_sysfs:
|
||||||
iommu_device_sysfs_remove(&iommu->iommu);
|
iommu_device_sysfs_remove(&iommu->iommu);
|
||||||
|
err_put_group:
|
||||||
|
iommu_group_put(iommu->group);
|
||||||
err_unprepare_clocks:
|
err_unprepare_clocks:
|
||||||
clk_bulk_unprepare(iommu->num_clocks, iommu->clocks);
|
clk_bulk_unprepare(iommu->num_clocks, iommu->clocks);
|
||||||
return err;
|
return err;
|
||||||
|
|
Loading…
Reference in New Issue