Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934039AbdDGOmC (ORCPT ); Fri, 7 Apr 2017 10:42:02 -0400 Received: from 8bytes.org ([81.169.241.247]:48992 "EHLO theia.8bytes.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933910AbdDGOlg (ORCPT ); Fri, 7 Apr 2017 10:41:36 -0400 From: Joerg Roedel To: Suman Anna , iommu@lists.linux-foundation.org Cc: linux-kernel@vger.kernel.org, Joerg Roedel Subject: [PATCH 3/4] iommu/omap: Make use of 'struct iommu_device' Date: Fri, 7 Apr 2017 16:41:31 +0200 Message-Id: <1491576092-23339-4-git-send-email-joro@8bytes.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1491576092-23339-1-git-send-email-joro@8bytes.org> References: <1491576092-23339-1-git-send-email-joro@8bytes.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2742 Lines: 99 From: Joerg Roedel Modify the driver to register individual iommus and establish links between devices and iommus in sysfs. Signed-off-by: Joerg Roedel --- drivers/iommu/omap-iommu.c | 25 +++++++++++++++++++++++++ drivers/iommu/omap-iommu.h | 2 ++ 2 files changed, 27 insertions(+) diff --git a/drivers/iommu/omap-iommu.c b/drivers/iommu/omap-iommu.c index 08bd731..a1ed13c 100644 --- a/drivers/iommu/omap-iommu.c +++ b/drivers/iommu/omap-iommu.c @@ -36,6 +36,8 @@ #include "omap-iopgtable.h" #include "omap-iommu.h" +static const struct iommu_ops omap_iommu_ops; + #define to_iommu(dev) \ ((struct omap_iommu *)platform_get_drvdata(to_platform_device(dev))) @@ -963,6 +965,16 @@ static int omap_iommu_probe(struct platform_device *pdev) pm_runtime_irq_safe(obj->dev); pm_runtime_enable(obj->dev); + err = iommu_device_sysfs_add(&obj->iommu, obj->dev, NULL, obj->name); + if (err) + return err; + + iommu_device_set_ops(&obj->iommu, &omap_iommu_ops); + + err = iommu_device_register(&obj->iommu); + if (err) + return err; + omap_iommu_debugfs_add(obj); dev_info(&pdev->dev, "%s registered\n", obj->name); @@ -973,6 +985,9 @@ static int omap_iommu_remove(struct platform_device *pdev) { struct omap_iommu *obj = platform_get_drvdata(pdev); + iommu_device_sysfs_remove(&obj->iommu); + iommu_device_unregister(&obj->iommu); + omap_iommu_debugfs_remove(obj); pm_runtime_disable(obj->dev); @@ -1087,6 +1102,12 @@ static size_t omap_iommu_unmap(struct iommu_domain *domain, unsigned long da, goto out; } + ret = iommu_device_link(&oiommu->iommu, dev); + if (ret) { + dev_err(dev, "can't link device to iommu\n"); + goto out; + } + omap_domain->iommu_dev = arch_data->iommu_dev = oiommu; omap_domain->dev = dev; oiommu->domain = domain; @@ -1121,8 +1142,11 @@ static void omap_iommu_detach_dev(struct iommu_domain *domain, struct device *dev) { struct omap_iommu_domain *omap_domain = to_omap_domain(domain); + struct omap_iommu_arch_data *arch_data = dev->archdata.iommu; spin_lock(&omap_domain->lock); + if (arch_data) + iommu_device_unlink(&arch_data->iommu_dev->iommu, dev); _omap_iommu_detach_dev(omap_domain, dev); spin_unlock(&omap_domain->lock); } @@ -1263,6 +1287,7 @@ static void omap_iommu_remove_device(struct device *dev) kfree(arch_data->name); kfree(arch_data); + } static const struct iommu_ops omap_iommu_ops = { diff --git a/drivers/iommu/omap-iommu.h b/drivers/iommu/omap-iommu.h index 3cd414a..ba16a18 100644 --- a/drivers/iommu/omap-iommu.h +++ b/drivers/iommu/omap-iommu.h @@ -67,6 +67,8 @@ struct omap_iommu { int has_bus_err_back; u32 id; + + struct iommu_device iommu; }; /** -- 1.9.1