Merge branch 'topic/omap3isp' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

Pull OMAP3 updates from Mauro Carvalho Chehab:
 "Some driver improvements on OMAP3.  This series depend on some iommu
  patches already merged"

* 'topic/omap3isp' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (26 commits)
  [media] omap3isp: Rename isp_buffer isp_addr field to dma
  [media] omap3isp: Move to videobuf2
  [media] v4l: vb2: Add a function to discard all DONE buffers
  [media] omap3isp: Cancel all queued buffers when stopping the video stream
  [media] omap3isp: Move buffer irqlist to isp_buffer structure
  [media] omap3isp: Move queue irqlock to isp_video structure
  [media] omap3isp: Move queue mutex to isp_video structure
  [media] omap3isp: queue: Don't build scatterlist for kernel buffer
  [media] omap3isp: Use the ARM DMA IOMMU-aware operations
  [media] omap3isp: queue: Use sg_alloc_table_from_pages()
  [media] omap3isp: queue: Map PFNMAP buffers to device
  [media] omap3isp: queue: Fix the dma_map_sg() return value check
  [media] omap3isp: queue: Allocate kernel buffers with dma_alloc_coherent
  [media] omap3isp: queue: Inline the ispmmu_v(un)map functions
  [media] omap3isp: queue: Merge the prepare and sglist functions
  [media] omap3isp: queue: Use sg_table structure
  [media] omap3isp: queue: Move IOMMU handling code to the queue
  [media] omap3isp: video: Set the buffer bytesused field at completion time
  [media] omap3isp: ccdc: Use the DMA API for FPC
  [media] omap3isp: ccdc: Use the DMA API for LSC
  ...

21 files changed, 458 insertions, 1745 deletions

diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index 20f1655e6d75..8108c698b548 100644
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -93,7 +93,9 @@ config VIDEO_M32R_AR_M64278
 
 config VIDEO_OMAP3
         tristate "OMAP 3 Camera support"
-        depends on OMAP_IOVMM && VIDEO_V4L2 && I2C && VIDEO_V4L2_SUBDEV_API && ARCH_OMAP3
+        depends on VIDEO_V4L2 && I2C && VIDEO_V4L2_SUBDEV_API && ARCH_OMAP3
+        select ARM_DMA_USE_IOMMU
+        select OMAP_IOMMU
         ---help---
           Driver for an OMAP 3 camera controller.
 
diff --git a/drivers/media/platform/omap3isp/Makefile b/drivers/media/platform/omap3isp/Makefile
index e8847e79e31a..254975a9174e 100644
--- a/drivers/media/platform/omap3isp/Makefile
+++ b/drivers/media/platform/omap3isp/Makefile
@@ -3,7 +3,7 @@
 ccflags-$(CONFIG_VIDEO_OMAP3_DEBUG) += -DDEBUG
 
 omap3-isp-objs += \
-        isp.o ispqueue.o ispvideo.o \
+        isp.o ispvideo.o \
         ispcsiphy.o ispccp2.o ispcsi2.o \
         ispccdc.o isppreview.o ispresizer.o \
         ispstat.o isph3a_aewb.o isph3a_af.o isphist.o
diff --git a/drivers/media/platform/omap3isp/isp.c b/drivers/media/platform/omap3isp/isp.c
index 06a0df434249..2c7aa6720569 100644
--- a/drivers/media/platform/omap3isp/isp.c
+++ b/drivers/media/platform/omap3isp/isp.c
@@ -69,6 +69,8 @@
 #include <linux/sched.h>
 #include <linux/vmalloc.h>
 
+#include <asm/dma-iommu.h>
+
 #include <media/v4l2-common.h>
 #include <media/v4l2-device.h>
 
@@ -1397,14 +1399,14 @@ int omap3isp_module_sync_idle(struct media_entity *me, wait_queue_head_t *wait,
         if (isp_pipeline_is_last(me)) {
                 struct isp_video *video = pipe->output;
                 unsigned long flags;
-                spin_lock_irqsave(&video->queue->irqlock, flags);
+                spin_lock_irqsave(&video->irqlock, flags);
                 if (video->dmaqueue_flags & ISP_VIDEO_DMAQUEUE_UNDERRUN) {
-                        spin_unlock_irqrestore(&video->queue->irqlock, flags);
+                        spin_unlock_irqrestore(&video->irqlock, flags);
                         atomic_set(stopping, 0);
                         smp_mb();
                         return 0;
                 }
-                spin_unlock_irqrestore(&video->queue->irqlock, flags);
+                spin_unlock_irqrestore(&video->irqlock, flags);
                 if (!wait_event_timeout(*wait, !atomic_read(stopping),
                                         msecs_to_jiffies(1000))) {
                         atomic_set(stopping, 0);
@@ -1625,7 +1627,7 @@ struct isp_device *omap3isp_get(struct isp_device *isp)
  * Decrement the reference count on the ISP. If the last reference is released,
  * power-down all submodules, disable clocks and free temporary buffers.
  */
-void omap3isp_put(struct isp_device *isp)
+static void __omap3isp_put(struct isp_device *isp, bool save_ctx)
 {
         if (isp == NULL)
                 return;
@@ -1634,7 +1636,7 @@ void omap3isp_put(struct isp_device *isp)
         BUG_ON(isp->ref_count == 0);
         if (--isp->ref_count == 0) {
                 isp_disable_interrupts(isp);
-                if (isp->domain) {
+                if (save_ctx) {
                         isp_save_ctx(isp);
                         isp->has_context = 1;
                 }
@@ -1648,6 +1650,11 @@ void omap3isp_put(struct isp_device *isp)
         mutex_unlock(&isp->isp_mutex);
 }
 
+void omap3isp_put(struct isp_device *isp)
+{
+        __omap3isp_put(isp, true);
+}
+
 /* --------------------------------------------------------------------------
  * Platform device driver
  */
@@ -2120,6 +2127,61 @@ error_csiphy:
         return ret;
 }
 
+static void isp_detach_iommu(struct isp_device *isp)
+{
+        arm_iommu_release_mapping(isp->mapping);
+        isp->mapping = NULL;
+        iommu_group_remove_device(isp->dev);
+}
+
+static int isp_attach_iommu(struct isp_device *isp)
+{
+        struct dma_iommu_mapping *mapping;
+        struct iommu_group *group;
+        int ret;
+
+        /* Create a device group and add the device to it. */
+        group = iommu_group_alloc();
+        if (IS_ERR(group)) {
+                dev_err(isp->dev, "failed to allocate IOMMU group\n");
+                return PTR_ERR(group);
+        }
+
+        ret = iommu_group_add_device(group, isp->dev);
+        iommu_group_put(group);
+
+        if (ret < 0) {
+                dev_err(isp->dev, "failed to add device to IPMMU group\n");
+                return ret;
+        }
+
+        /*
+         * Create the ARM mapping, used by the ARM DMA mapping core to allocate
+         * VAs. This will allocate a corresponding IOMMU domain.
+         */
+        mapping = arm_iommu_create_mapping(&platform_bus_type, SZ_1G, SZ_2G);
+        if (IS_ERR(mapping)) {
+                dev_err(isp->dev, "failed to create ARM IOMMU mapping\n");
+                ret = PTR_ERR(mapping);
+                goto error;
+        }
+
+        isp->mapping = mapping;
+
+        /* Attach the ARM VA mapping to the device. */
+        ret = arm_iommu_attach_device(isp->dev, mapping);
+        if (ret < 0) {
+                dev_err(isp->dev, "failed to attach device to VA mapping\n");
+                goto error;
+        }
+
+        return 0;
+
+error:
+        isp_detach_iommu(isp);
+        return ret;
+}