aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoerg Roedel <jroedel@suse.de>2017-02-03 07:23:42 -0500
committerJoerg Roedel <jroedel@suse.de>2017-02-10 08:53:46 -0500
commitd2c302b6e8b1a5c0735b59d63075132bae9c52ac (patch)
tree8de8ead76f4ee15b63ecbfdebbeeeae7fada0952
parentb16c0170b53cfbf50db6cd60a427b52b0602b882 (diff)
iommu/exynos: Make use of iommu_device_register interface
Register Exynos IOMMUs to the IOMMU core and make them visible in sysfs. This patch does not add the links between IOMMUs and translated devices yet. Cc: Marek Szyprowski <m.szyprowski@samsung.com> Cc: linux-arm-kernel@lists.infradead.org Cc: linux-samsung-soc@vger.kernel.org Acked-by: Marek Szyprowski <m.szyprowski@samsung.com> Tested-by: Marek Szyprowski <m.szyprowski@samsung.com> Signed-off-by: Joerg Roedel <jroedel@suse.de>
-rw-r--r--drivers/iommu/exynos-iommu.c14
1 files changed, 14 insertions, 0 deletions
diff --git a/drivers/iommu/exynos-iommu.c b/drivers/iommu/exynos-iommu.c
index 57ba0d3091ea..64325d8ddd40 100644
--- a/drivers/iommu/exynos-iommu.c
+++ b/drivers/iommu/exynos-iommu.c
@@ -276,6 +276,8 @@ struct sysmmu_drvdata {
276 struct list_head owner_node; /* node for owner controllers list */ 276 struct list_head owner_node; /* node for owner controllers list */
277 phys_addr_t pgtable; /* assigned page table structure */ 277 phys_addr_t pgtable; /* assigned page table structure */
278 unsigned int version; /* our version */ 278 unsigned int version; /* our version */
279
280 struct iommu_device iommu; /* IOMMU core handle */
279}; 281};
280 282
281static struct exynos_iommu_domain *to_exynos_domain(struct iommu_domain *dom) 283static struct exynos_iommu_domain *to_exynos_domain(struct iommu_domain *dom)
@@ -611,6 +613,18 @@ static int __init exynos_sysmmu_probe(struct platform_device *pdev)
611 data->sysmmu = dev; 613 data->sysmmu = dev;
612 spin_lock_init(&data->lock); 614 spin_lock_init(&data->lock);
613 615
616 ret = iommu_device_sysfs_add(&data->iommu, &pdev->dev, NULL,
617 dev_name(data->sysmmu));
618 if (ret)
619 return ret;
620
621 iommu_device_set_ops(&data->iommu, &exynos_iommu_ops);
622 iommu_device_set_fwnode(&data->iommu, &dev->of_node->fwnode);
623
624 ret = iommu_device_register(&data->iommu);
625 if (ret)
626 return ret;
627
614 platform_set_drvdata(pdev, data); 628 platform_set_drvdata(pdev, data);
615 629
616 __sysmmu_get_version(data); 630 __sysmmu_get_version(data);