Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma

Pull slave-dmaengine update from Vinod Koul:
 "This includes the cookie cleanup by Russell, the addition of context
  parameter for dmaengine APIs, more arm dmaengine driver cleanup by
  moving code to dmaengine, this time for imx by Javier and pl330 by
  Boojin along with the usual driver fixes."

Fix up some fairly trivial conflicts with various other cleanups.

* 'next' of git://git.infradead.org/users/vkoul/slave-dma: (67 commits)
  dmaengine: imx: fix the build failure on x86_64
  dmaengine: i.MX: Fix merge of cookie branch.
  dmaengine: i.MX: Add support for interleaved transfers.
  dmaengine: imx-dma: use 'dev_dbg' and 'dev_warn' for messages.
  dmaengine: imx-dma: remove 'imx_dmav1_baseaddr' and 'dma_clk'.
  dmaengine: imx-dma: remove unused arg of imxdma_sg_next.
  dmaengine: imx-dma: remove internal structure.
  dmaengine: imx-dma: remove 'resbytes' field of 'internal' structure.
  dmaengine: imx-dma: remove 'in_use' field of 'internal' structure.
  dmaengine: imx-dma: remove sg member from internal structure.
  dmaengine: imx-dma: remove 'imxdma_setup_sg_hw' function.
  dmaengine: imx-dma: remove 'imxdma_config_channel_hw' function.
  dmaengine: imx-dma: remove 'imxdma_setup_mem2mem_hw' function.
  dmaengine: imx-dma: remove dma_mode member of internal structure.
  dmaengine: imx-dma: remove data member from internal structure.
  dmaengine: imx-dma: merge old dma-v1.c with imx-dma.c
  dmaengine: at_hdmac: add slave config operation
  dmaengine: add context parameter to prep_slave_sg and prep_dma_cyclic
  dmaengine/dma_slave: introduce inline wrappers
  dma: imx-sdma: Treat firmware messages as warnings instead of erros
  ...

1 files changed, 11 insertions, 26 deletions

diff --git a/drivers/dma/timb_dma.c b/drivers/dma/timb_dma.c
index a6f9c1684a0f..4e0dff59901d 100644
--- a/drivers/dma/timb_dma.c
+++ b/drivers/dma/timb_dma.c
@@ -31,6 +31,8 @@
 
 #include <linux/timb_dma.h>
 
+#include "dmaengine.h"
+
 #define DRIVER_NAME "timb-dma"
 
 /* Global DMA registers */
@@ -84,7 +86,6 @@ struct timb_dma_chan {
                                         especially the lists and descriptors,
                                         from races between the tasklet and calls
                                         from above */
-        dma_cookie_t            last_completed_cookie;
         bool                    ongoing;
         struct list_head        active_list;
         struct list_head        queue;
@@ -284,7 +285,7 @@ static void __td_finish(struct timb_dma_chan *td_chan)
         else
                 iowrite32(0, td_chan->membase + TIMBDMA_OFFS_TX_DLAR);
 */
-        td_chan->last_completed_cookie = txd->cookie;
+        dma_cookie_complete(txd);
         td_chan->ongoing = false;
 
         callback = txd->callback;
@@ -349,12 +350,7 @@ static dma_cookie_t td_tx_submit(struct dma_async_tx_descriptor *txd)
         dma_cookie_t cookie;
 
         spin_lock_bh(&td_chan->lock);
-
-        cookie = txd->chan->cookie;
-        if (++cookie < 0)
-                cookie = 1;
-        txd->chan->cookie = cookie;
-        txd->cookie = cookie;
+        cookie = dma_cookie_assign(txd);
 
         if (list_empty(&td_chan->active_list)) {
                 dev_dbg(chan2dev(txd->chan), "%s: started %u\n", __func__,
@@ -481,8 +477,7 @@ static int td_alloc_chan_resources(struct dma_chan *chan)
         }
 
         spin_lock_bh(&td_chan->lock);
-        td_chan->last_completed_cookie = 1;
-        chan->cookie = 1;
+        dma_cookie_init(chan);
         spin_unlock_bh(&td_chan->lock);
 
         return 0;
@@ -515,24 +510,13 @@ static void td_free_chan_resources(struct dma_chan *chan)
 static enum dma_status td_tx_status(struct dma_chan *chan, dma_cookie_t cookie,
                                     struct dma_tx_state *txstate)
 {
-        struct timb_dma_chan *td_chan =
-                container_of(chan, struct timb_dma_chan, chan);
-        dma_cookie_t            last_used;
-        dma_cookie_t            last_complete;
-        int                     ret;
+        enum dma_status ret;
 
         dev_dbg(chan2dev(chan), "%s: Entry\n", __func__);
 
-        last_complete = td_chan->last_completed_cookie;
-        last_used = chan->cookie;
-
-        ret = dma_async_is_complete(cookie, last_complete, last_used);
-
-        dma_set_tx_state(txstate, last_complete, last_used, 0);
+        ret = dma_cookie_status(chan, cookie, txstate);
 
-        dev_dbg(chan2dev(chan),
-                "%s: exit, ret: %d, last_complete: %d, last_used: %d\n",
-                __func__, ret, last_complete, last_used);
+        dev_dbg(chan2dev(chan), "%s: exit, ret: %d\n",  __func__, ret);
 
         return ret;
 }
@@ -558,7 +542,8 @@ static void td_issue_pending(struct dma_chan *chan)
 
 static struct dma_async_tx_descriptor *td_prep_slave_sg(struct dma_chan *chan,
         struct scatterlist *sgl, unsigned int sg_len,
-        enum dma_transfer_direction direction, unsigned long flags)
+        enum dma_transfer_direction direction, unsigned long flags,
+        void *context)
 {
         struct timb_dma_chan *td_chan =
                 container_of(chan, struct timb_dma_chan, chan);
@@ -766,7 +751,7 @@ static int __devinit td_probe(struct platform_device *pdev)
                 }
 
                 td_chan->chan.device = &td->dma;
-                td_chan->chan.cookie = 1;
+                dma_cookie_init(&td_chan->chan);
                 spin_lock_init(&td_chan->lock);
                 INIT_LIST_HEAD(&td_chan->active_list);
                 INIT_LIST_HEAD(&td_chan->queue);