dmaengine: shdma: extend .device_terminate_all() to record partial transfer

This patch extends the .device_terminate_all() method of the shdma driver
to return number of bytes transfered in the current descriptor.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>

2 files changed, 16 insertions, 16 deletions

diff --git a/drivers/dma/shdma.c b/drivers/dma/shdma.c
index ea6779f3e73f..5d17e09cb625 100644
--- a/drivers/dma/shdma.c
+++ b/drivers/dma/shdma.c
@@ -587,6 +587,19 @@ static void sh_dmae_terminate_all(struct dma_chan *chan)
         if (!chan)
                 return;
 
+        dmae_halt(sh_chan);
+
+        spin_lock_bh(&sh_chan->desc_lock);
+        if (!list_empty(&sh_chan->ld_queue)) {
+                /* Record partial transfer */
+                struct sh_desc *desc = list_entry(sh_chan->ld_queue.next,
+                                                  struct sh_desc, node);
+                desc->partial = (desc->hw.tcr - sh_dmae_readl(sh_chan, TCR)) <<
+                        sh_chan->xmit_shift;
+
+        }
+        spin_unlock_bh(&sh_chan->desc_lock);
+
         sh_dmae_chan_ld_cleanup(sh_chan, true);
 }
 
@@ -701,6 +714,9 @@ static void sh_chan_xfer_ld_queue(struct sh_dmae_chan *sh_chan)
         /* Find the first not transferred desciptor */
         list_for_each_entry(desc, &sh_chan->ld_queue, node)
                 if (desc->mark == DESC_SUBMITTED) {
+                        dev_dbg(sh_chan->dev, "Queue #%d to %d: %u@%x -> %x\n",
+                                desc->async_tx.cookie, sh_chan->id,
+                                desc->hw.tcr, desc->hw.sar, desc->hw.dar);
                         /* Get the ld start address from ld_queue */
                         dmae_set_reg(sh_chan, &desc->hw);
                         dmae_start(sh_chan);
diff --git a/drivers/dma/shdma.h b/drivers/dma/shdma.h
index 9f0897f7fe34..153609a1e96c 100644
--- a/drivers/dma/shdma.h
+++ b/drivers/dma/shdma.h
@@ -21,22 +21,6 @@
 
 #define SH_DMA_TCR_MAX 0x00FFFFFF       /* 16MB */
 
-struct sh_dmae_regs {
-        u32 sar; /* SAR / source address */
-        u32 dar; /* DAR / destination address */
-        u32 tcr; /* TCR / transfer count */
-};
-
-struct sh_desc {
-        struct sh_dmae_regs hw;
-        struct list_head node;
-        struct dma_async_tx_descriptor async_tx;
-        enum dma_data_direction direction;
-        dma_cookie_t cookie;
-        int chunks;
-        int mark;
-};
-
 struct device;
 
 struct sh_dmae_chan {