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>

5 files changed, 50 insertions, 20 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);
diff --git a/drivers/media/video/omap3isp/isp.h b/drivers/media/video/omap3isp/isp.h
index 529e582ef948..c9ec7a2e53ea 100644
--- a/drivers/media/video/omap3isp/isp.h
+++ b/drivers/media/video/omap3isp/isp.h
@@ -32,6 +32,7 @@
 #include <linux/io.h>
 #include <linux/platform_device.h>
 #include <linux/wait.h>
+#include <linux/iommu.h>
 #include <plat/iommu.h>
 #include <plat/iovmm.h>
 
@@ -295,6 +296,8 @@ struct isp_device {
         unsigned int subclk_resources;
 
         struct iommu *iommu;
+        struct iommu_domain *domain;
+        struct device *iommu_dev;
 
         struct isp_platform_callback platform_cb;
 };
diff --git a/drivers/media/video/omap3isp/ispccdc.c b/drivers/media/video/omap3isp/ispccdc.c
index 9d3459de04b2..de2547413739 100644
--- a/drivers/media/video/omap3isp/ispccdc.c
+++ b/drivers/media/video/omap3isp/ispccdc.c
@@ -365,7 +365,7 @@ static void ccdc_lsc_free_request(struct isp_ccdc_device *ccdc,
                 dma_unmap_sg(isp->dev, req->iovm->sgt->sgl,
                              req->iovm->sgt->nents, DMA_TO_DEVICE);
         if (req->table)
-                iommu_vfree(isp->iommu, req->table);
+                iommu_vfree(isp->domain, isp->iommu, req->table);
         kfree(req);
 }
 
@@ -437,8 +437,8 @@ static int ccdc_lsc_config(struct isp_ccdc_device *ccdc,
 
                 req->enable = 1;
 
-                req->table = iommu_vmalloc(isp->iommu, 0, req->config.size,
-                                           IOMMU_FLAG);
+                req->table = iommu_vmalloc(isp->domain, isp->iommu, 0,
+                                        req->config.size, IOMMU_FLAG);
                 if (IS_ERR_VALUE(req->table)) {
                         req->table = 0;
                         ret = -ENOMEM;
@@ -733,15 +733,15 @@ static int ccdc_config(struct isp_ccdc_device *ccdc,
                          * already done by iommu_vmalloc().
                          */
                         size = ccdc->fpc.fpnum * 4;
-                        table_new = iommu_vmalloc(isp->iommu, 0, size,
-                                                  IOMMU_FLAG);
+                        table_new = iommu_vmalloc(isp->domain, isp->iommu, 0,
+                                                        size, IOMMU_FLAG);
                         if (IS_ERR_VALUE(table_new))
                                 return -ENOMEM;
 
                         if (copy_from_user(da_to_va(isp->iommu, table_new),
                                            (__force void __user *)
                                            ccdc->fpc.fpcaddr, size)) {
-                                iommu_vfree(isp->iommu, table_new);
+                                iommu_vfree(isp->domain, isp->iommu, table_new);
                                 return -EFAULT;
                         }
 
@@ -751,7 +751,7 @@ static int ccdc_config(struct isp_ccdc_device *ccdc,
 
                 ccdc_configure_fpc(ccdc);
                 if (table_old != 0)
-                        iommu_vfree(isp->iommu, table_old);
+                        iommu_vfree(isp->domain, isp->iommu, table_old);
         }
 
         return ccdc_lsc_config(ccdc, ccdc_struct);
@@ -2286,5 +2286,5 @@ void omap3isp_ccdc_cleanup(struct isp_device *isp)
         ccdc_lsc_free_queue(ccdc, &ccdc->lsc.free_queue);
 
         if (ccdc->fpc.fpcaddr != 0)
-                iommu_vfree(isp->iommu, ccdc->fpc.fpcaddr);
+                iommu_vfree(isp->domain, isp->iommu, ccdc->fpc.fpcaddr);
 }
diff --git a/drivers/media/video/omap3isp/ispstat.c b/drivers/media/video/omap3isp/ispstat.c
index 808065948ac1..98af736b9a90 100644
--- a/drivers/media/video/omap3isp/ispstat.c
+++ b/drivers/media/video/omap3isp/ispstat.c
@@ -366,7 +366,7 @@ static void isp_stat_bufs_free(struct ispstat *stat)
                                 dma_unmap_sg(isp->dev, buf->iovm->sgt->sgl,
                                              buf->iovm->sgt->nents,
                                              DMA_FROM_DEVICE);
-                        iommu_vfree(isp->iommu, buf->iommu_addr);
+                        iommu_vfree(isp->domain, isp->iommu, buf->iommu_addr);
                 } else {
                         if (!buf->virt_addr)
                                 continue;
@@ -399,8 +399,8 @@ static int isp_stat_bufs_alloc_iommu(struct ispstat *stat, unsigned int size)
                 struct iovm_struct *iovm;
 
                 WARN_ON(buf->dma_addr);
-                buf->iommu_addr = iommu_vmalloc(isp->iommu, 0, size,
-                                                IOMMU_FLAG);
+                buf->iommu_addr = iommu_vmalloc(isp->domain, isp->iommu, 0,
+                                                        size, IOMMU_FLAG);
                 if (IS_ERR((void *)buf->iommu_addr)) {
                         dev_err(stat->isp->dev,
                                  "%s: Can't acquire memory for "
diff --git a/drivers/media/video/omap3isp/ispvideo.c b/drivers/media/video/omap3isp/ispvideo.c
index fd965adfd597..023b5028a27b 100644
--- a/drivers/media/video/omap3isp/ispvideo.c
+++ b/drivers/media/video/omap3isp/ispvideo.c
@@ -446,7 +446,7 @@ ispmmu_vmap(struct isp_device *isp, const struct scatterlist *sglist, int sglen)
         sgt->nents = sglen;
         sgt->orig_nents = sglen;
 
-        da = iommu_vmap(isp->iommu, 0, sgt, IOMMU_FLAG);
+        da = iommu_vmap(isp->domain, isp->iommu, 0, sgt, IOMMU_FLAG);
         if (IS_ERR_VALUE(da))
                 kfree(sgt);
 
@@ -462,7 +462,7 @@ static void ispmmu_vunmap(struct isp_device *isp, dma_addr_t da)
 {
         struct sg_table *sgt;
 
-        sgt = iommu_vunmap(isp->iommu, (u32)da);
+        sgt = iommu_vunmap(isp->domain, isp->iommu, (u32)da);
         kfree(sgt);
 }