Merge branch 'dmaengine' of git://git.linaro.org/people/rmk/linux-arm

Pull ARM DMA engine updates from Russell King:
 "This looks scary at first glance, but what it is is:
   - a rework of the sa11x0 DMA engine driver merged during the previous
     cycle, to extract a common set of helper functions for DMA engine
     implementations.
   - conversion of amba-pl08x.c to use these helper functions.
   - addition of OMAP DMA engine driver (using these helper functions),
     and conversion of some of the OMAP DMA users to use DMA engine.

  Nothing in the helper functions is ARM specific, so I hope that other
  implementations can consolidate some of their code by making use of
  these helpers.

  This has been sitting in linux-next most of the merge cycle, and has
  been tested by several OMAP folk.  I've tested it on sa11x0 platforms,
  and given it my best shot on my broken platforms which have the
  amba-pl08x controller.

  The last point is the addition to feature-removal-schedule.txt, which
  will have a merge conflict.  Between myself and TI, we're planning to
  remove the old TI DMA implementation next year."

Fix up trivial add/add conflicts in Documentation/feature-removal-schedule.txt
and drivers/dma/{Kconfig,Makefile}

* 'dmaengine' of git://git.linaro.org/people/rmk/linux-arm: (53 commits)
  ARM: 7481/1: OMAP2+: omap2plus_defconfig: enable OMAP DMA engine
  ARM: 7464/1: mmc: omap_hsmmc: ensure probe returns error if DMA channel request fails
  Add feature removal of old OMAP private DMA implementation
  mtd: omap2: remove private DMA API implementation
  mtd: omap2: add DMA engine support
  spi: omap2-mcspi: remove private DMA API implementation
  spi: omap2-mcspi: add DMA engine support
  ARM: omap: remove mmc platform data dma_mask and initialization
  mmc: omap: remove private DMA API implementation
  mmc: omap: add DMA engine support
  mmc: omap_hsmmc: remove private DMA API implementation
  mmc: omap_hsmmc: add DMA engine support
  dmaengine: omap: add support for cyclic DMA
  dmaengine: omap: add support for setting fi
  dmaengine: omap: add support for returning residue in tx_state method
  dmaengine: add OMAP DMA engine driver
  dmaengine: sa11x0-dma: add cyclic DMA support
  dmaengine: sa11x0-dma: fix DMA residue support
  dmaengine: PL08x: ensure all descriptors are freed when channel is released
  dmaengine: PL08x: get rid of write only pool_ctr and free_txd locking
  ...

1 files changed, 56 insertions, 50 deletions

diff --git a/drivers/mtd/nand/omap2.c b/drivers/mtd/nand/omap2.c
index d7f681d0c9b9..e9309b3659e7 100644
--- a/drivers/mtd/nand/omap2.c
+++ b/drivers/mtd/nand/omap2.c
@@ -9,6 +9,7 @@
  */
 
 #include <linux/platform_device.h>
+#include <linux/dmaengine.h>
 #include <linux/dma-mapping.h>
 #include <linux/delay.h>
 #include <linux/module.h>
@@ -18,6 +19,7 @@
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/nand.h>
 #include <linux/mtd/partitions.h>
+#include <linux/omap-dma.h>
 #include <linux/io.h>
 #include <linux/slab.h>
 
@@ -123,7 +125,7 @@ struct omap_nand_info {
         int                             gpmc_cs;
         unsigned long                   phys_base;
         struct completion               comp;
-        int                             dma_ch;
+        struct dma_chan                 *dma;
         int                             gpmc_irq;
         enum {
                 OMAP_NAND_IO_READ = 0,  /* read */
@@ -336,12 +338,10 @@ static void omap_write_buf_pref(struct mtd_info *mtd,
 }
 
 /*
- * omap_nand_dma_cb: callback on the completion of dma transfer
- * @lch: logical channel
- * @ch_satuts: channel status
+ * omap_nand_dma_callback: callback on the completion of dma transfer
  * @data: pointer to completion data structure
  */
-static void omap_nand_dma_cb(int lch, u16 ch_status, void *data)
+static void omap_nand_dma_callback(void *data)
 {
         complete((struct completion *) data);
 }
@@ -358,17 +358,13 @@ static inline int omap_nand_dma_transfer(struct mtd_info *mtd, void *addr,
 {
         struct omap_nand_info *info = container_of(mtd,
                                         struct omap_nand_info, mtd);
+        struct dma_async_tx_descriptor *tx;
         enum dma_data_direction dir = is_write ? DMA_TO_DEVICE :
                                                         DMA_FROM_DEVICE;
-        dma_addr_t dma_addr;
-        int ret;
+        struct scatterlist sg;
         unsigned long tim, limit;
-
-        /* The fifo depth is 64 bytes max.
-         * But configure the FIFO-threahold to 32 to get a sync at each frame
-         * and frame length is 32 bytes.
-         */
-        int buf_len = len >> 6;
+        unsigned n;
+        int ret;
 
         if (addr >= high_memory) {
                 struct page *p1;
@@ -382,40 +378,33 @@ static inline int omap_nand_dma_transfer(struct mtd_info *mtd, void *addr,
                 addr = page_address(p1) + ((size_t)addr & ~PAGE_MASK);
         }
 
-        dma_addr = dma_map_single(&info->pdev->dev, addr, len, dir);
-        if (dma_mapping_error(&info->pdev->dev, dma_addr)) {
+        sg_init_one(&sg, addr, len);
+        n = dma_map_sg(info->dma->device->dev, &sg, 1, dir);
+        if (n == 0) {
                 dev_err(&info->pdev->dev,
                         "Couldn't DMA map a %d byte buffer\n", len);
                 goto out_copy;
         }
 
-        if (is_write) {
-            omap_set_dma_dest_params(info->dma_ch, 0, OMAP_DMA_AMODE_CONSTANT,
-                                                info->phys_base, 0, 0);
-            omap_set_dma_src_params(info->dma_ch, 0, OMAP_DMA_AMODE_POST_INC,
-                                                        dma_addr, 0, 0);
-            omap_set_dma_transfer_params(info->dma_ch, OMAP_DMA_DATA_TYPE_S32,
-                                        0x10, buf_len, OMAP_DMA_SYNC_FRAME,
-                                        OMAP24XX_DMA_GPMC, OMAP_DMA_DST_SYNC);
-        } else {
-            omap_set_dma_src_params(info->dma_ch, 0, OMAP_DMA_AMODE_CONSTANT,
-                                                info->phys_base, 0, 0);
-            omap_set_dma_dest_params(info->dma_ch, 0, OMAP_DMA_AMODE_POST_INC,
-                                                        dma_addr, 0, 0);
-            omap_set_dma_transfer_params(info->dma_ch, OMAP_DMA_DATA_TYPE_S32,
-                                        0x10, buf_len, OMAP_DMA_SYNC_FRAME,
-                                        OMAP24XX_DMA_GPMC, OMAP_DMA_SRC_SYNC);
-        }
-        /*  configure and start prefetch transfer */
+        tx = dmaengine_prep_slave_sg(info->dma, &sg, n,
+                is_write ? DMA_MEM_TO_DEV : DMA_DEV_TO_MEM,
+                DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
+        if (!tx)
+                goto out_copy_unmap;
+
+        tx->callback = omap_nand_dma_callback;
+        tx->callback_param = &info->comp;
+        dmaengine_submit(tx);
+
+        /* configure and start prefetch transfer */
         ret = gpmc_prefetch_enable(info->gpmc_cs,
-                        PREFETCH_FIFOTHRESHOLD_MAX, 0x1, len, is_write);
+                PREFETCH_FIFOTHRESHOLD_MAX, 0x1, len, is_write);
         if (ret)
                 /* PFPW engine is busy, use cpu copy method */
                 goto out_copy_unmap;
 
         init_completion(&info->comp);
-
-        omap_start_dma(info->dma_ch);
+        dma_async_issue_pending(info->dma);
 
         /* setup and start DMA using dma_addr */
         wait_for_completion(&info->comp);
@@ -427,11 +416,11 @@ static inline int omap_nand_dma_transfer(struct mtd_info *mtd, void *addr,
         /* disable and stop the PFPW engine */
         gpmc_prefetch_reset(info->gpmc_cs);
 
-        dma_unmap_single(&info->pdev->dev, dma_addr, len, dir);
+        dma_unmap_sg(info->dma->device->dev, &sg, 1, dir);
         return 0;
 
 out_copy_unmap:
-        dma_unmap_single(&info->pdev->dev, dma_addr, len, dir);
+        dma_unmap_sg(info->dma->device->dev, &sg, 1, dir);
 out_copy:
         if (info->nand.options & NAND_BUSWIDTH_16)
                 is_write == 0 ? omap_read_buf16(mtd, (u_char *) addr, len)
@@ -1164,6 +1153,8 @@ static int __devinit omap_nand_probe(struct platform_device *pdev)
         struct omap_nand_platform_data  *pdata;
         int                             err;
         int                             i, offset;
+        dma_cap_mask_t mask;
+        unsigned sig;
 
         pdata = pdev->dev.platform_data;
         if (pdata == NULL) {
@@ -1244,18 +1235,31 @@ static int __devinit omap_nand_probe(struct platform_device *pdev)
                 break;
 
         case NAND_OMAP_PREFETCH_DMA:
-                err = omap_request_dma(OMAP24XX_DMA_GPMC, "NAND",
-                                omap_nand_dma_cb, &info->comp, &info->dma_ch);
-                if (err < 0) {
-                        info->dma_ch = -1;
-                        dev_err(&pdev->dev, "DMA request failed!\n");
+                dma_cap_zero(mask);
+                dma_cap_set(DMA_SLAVE, mask);
+                sig = OMAP24XX_DMA_GPMC;
+                info->dma = dma_request_channel(mask, omap_dma_filter_fn, &sig);
+                if (!info->dma) {
+                        dev_err(&pdev->dev, "DMA engine request failed\n");
+                        err = -ENXIO;
                         goto out_release_mem_region;
                 } else {
-                        omap_set_dma_dest_burst_mode(info->dma_ch,
-                                        OMAP_DMA_DATA_BURST_16);
-                        omap_set_dma_src_burst_mode(info->dma_ch,
-                                        OMAP_DMA_DATA_BURST_16);
-
+                        struct dma_slave_config cfg;
+                        int rc;
+
+                        memset(&cfg, 0, sizeof(cfg));
+                        cfg.src_addr = info->phys_base;
+                        cfg.dst_addr = info->phys_base;
+                        cfg.src_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
+                        cfg.dst_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
+                        cfg.src_maxburst = 16;
+                        cfg.dst_maxburst = 16;
+                        rc = dmaengine_slave_config(info->dma, &cfg);
+                        if (rc) {
+                                dev_err(&pdev->dev, "DMA engine slave config failed: %d\n",
+                                        rc);
+                                goto out_release_mem_region;
+                        }
                         info->nand.read_buf   = omap_read_buf_dma_pref;
                         info->nand.write_buf  = omap_write_buf_dma_pref;
                 }
@@ -1358,6 +1362,8 @@ static int __devinit omap_nand_probe(struct platform_device *pdev)
         return 0;
 
 out_release_mem_region:
+        if (info->dma)
+                dma_release_channel(info->dma);
         release_mem_region(info->phys_base, NAND_IO_SIZE);
 out_free_info:
         kfree(info);
@@ -1373,8 +1379,8 @@ static int omap_nand_remove(struct platform_device *pdev)
         omap3_free_bch(&info->mtd);
 
         platform_set_drvdata(pdev, NULL);
-        if (info->dma_ch != -1)
-                omap_free_dma(info->dma_ch);
+        if (info->dma)
+                dma_release_channel(info->dma);
 
         if (info->gpmc_irq)
                 free_irq(info->gpmc_irq, info);