omap: iommu: migrate to the generic IOMMU API

Migrate OMAP's iommu driver to the generic IOMMU API, so users can stay
generic, and any generic IOMMU functionality can be developed once
in the generic framework.

Migrate omap's iovmm (virtual memory manager) to the generic IOMMU API,
and adapt omap3isp as needed, so the latter won't break.

The plan is to eventually remove iovmm completely by replacing it
with the (upcoming) IOMMU-based DMA-API.

Tested on OMAP3 (with omap3isp) and OMAP4 (with rpmsg/remoteproc).

Signed-off-by: Ohad Ben-Cohen <ohad@wizery.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
Acked-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>

1 files changed, 34 insertions, 7 deletions

diff --git a/drivers/media/video/omap3isp/isp.c b/drivers/media/video/omap3isp/isp.c
index 5cea2bbd7014..0db45ac7489b 100644
--- a/drivers/media/video/omap3isp/isp.c
+++ b/drivers/media/video/omap3isp/isp.c
@@ -80,6 +80,13 @@
 #include "isph3a.h"
 #include "isphist.h"
 
+/*
+ * this is provided as an interim solution until omap3isp doesn't need
+ * any omap-specific iommu API
+ */
+#define to_iommu(dev)                                                   \
+        (struct iommu *)platform_get_drvdata(to_platform_device(dev))
+
 static unsigned int autoidle;
 module_param(autoidle, int, 0444);
 MODULE_PARM_DESC(autoidle, "Enable OMAP3ISP AUTOIDLE support");
@@ -1975,7 +1982,8 @@ static int isp_remove(struct platform_device *pdev)
         isp_cleanup_modules(isp);
 
         omap3isp_get(isp);
-        iommu_put(isp->iommu);
+        iommu_detach_device(isp->domain, isp->iommu_dev);
+        iommu_domain_free(isp->domain);
         omap3isp_put(isp);
 
         free_irq(isp->irq_num, isp);
@@ -2123,25 +2131,41 @@ static int isp_probe(struct platform_device *pdev)
         }
 
         /* IOMMU */
-        isp->iommu = iommu_get("isp");
-        if (IS_ERR_OR_NULL(isp->iommu)) {
-                isp->iommu = NULL;
+        isp->iommu_dev = omap_find_iommu_device("isp");
+        if (!isp->iommu_dev) {
+                dev_err(isp->dev, "omap_find_iommu_device failed\n");
                 ret = -ENODEV;
                 goto error_isp;
         }
 
+        /* to be removed once iommu migration is complete */
+        isp->iommu = to_iommu(isp->iommu_dev);
+
+        isp->domain = iommu_domain_alloc();
+        if (!isp->domain) {
+                dev_err(isp->dev, "can't alloc iommu domain\n");
+                ret = -ENOMEM;
+                goto error_isp;
+        }
+
+        ret = iommu_attach_device(isp->domain, isp->iommu_dev);
+        if (ret) {
+                dev_err(&pdev->dev, "can't attach iommu device: %d\n", ret);
+                goto free_domain;
+        }
+
         /* Interrupt */
         isp->irq_num = platform_get_irq(pdev, 0);
         if (isp->irq_num <= 0) {
                 dev_err(isp->dev, "No IRQ resource\n");
                 ret = -ENODEV;
-                goto error_isp;
+                goto detach_dev;
         }
 
         if (request_irq(isp->irq_num, isp_isr, IRQF_SHARED, "OMAP3 ISP", isp)) {
                 dev_err(isp->dev, "Unable to request IRQ\n");
                 ret = -EINVAL;
-                goto error_isp;
+                goto detach_dev;
         }
 
         /* Entities */
@@ -2162,8 +2186,11 @@ error_modules:
         isp_cleanup_modules(isp);
 error_irq:
         free_irq(isp->irq_num, isp);
+detach_dev:
+        iommu_detach_device(isp->domain, isp->iommu_dev);
+free_domain:
+        iommu_domain_free(isp->domain);
 error_isp:
-        iommu_put(isp->iommu);
         omap3isp_put(isp);
 error:
         isp_put_clocks(isp);