From 517dbf6a862089a9bc58c9fd64c1ae19e480ab85 Mon Sep 17 00:00:00 2001
From: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Date: Thu, 18 Feb 2010 16:30:02 +0000
Subject: [PATCH] --- yaml --- r: 186479 b: refs/heads/master c:
 c014906a870ce70e009def0c9d170ccabeb0be63 h: refs/heads/master i:   186477:
 d11f361fb7ca7f60ca800bd30172efa324593505   186475:
 c5a786bddcefda0fbdf6428424d1f33aa9d70f83   186471:
 9eb947dbf0c12aa58361599b92f447b873f524ce   186463:
 685a8a8ba19728c51b3de047e3a9038561214fb1 v: v3

---
 [refs]                                |  2 +-
 trunk/arch/sh/include/asm/dmaengine.h | 20 ++++++++++++++++++++
 trunk/drivers/dma/shdma.c             | 16 ++++++++++++++++
 trunk/drivers/dma/shdma.h             | 16 ----------------
 4 files changed, 37 insertions(+), 17 deletions(-)

diff --git a/[refs] b/[refs]
index 96ee7c07199e..77afdcb50488 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c8e3149ba7de24dfd4c37bb0df23c878cdecd8d4
+refs/heads/master: c014906a870ce70e009def0c9d170ccabeb0be63
diff --git a/trunk/arch/sh/include/asm/dmaengine.h b/trunk/arch/sh/include/asm/dmaengine.h
index 9586e4a482b1..bf2f30cf0a27 100644
--- a/trunk/arch/sh/include/asm/dmaengine.h
+++ b/trunk/arch/sh/include/asm/dmaengine.h
@@ -10,6 +10,9 @@
 #ifndef ASM_DMAENGINE_H
 #define ASM_DMAENGINE_H
 
+#include <linux/dmaengine.h>
+#include <linux/list.h>
+
 #include <asm/dma-register.h>
 
 #define SH_DMAC_MAX_CHANNELS	6
@@ -70,4 +73,21 @@ struct sh_dmae_slave {
 	struct sh_dmae_slave_config	*config;  /* Set by the driver */
 };
 
+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;
+	size_t partial;
+	int chunks;
+	int mark;
+};
+
 #endif
diff --git a/trunk/drivers/dma/shdma.c b/trunk/drivers/dma/shdma.c
index ea6779f3e73f..5d17e09cb625 100644
--- a/trunk/drivers/dma/shdma.c
+++ b/trunk/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/trunk/drivers/dma/shdma.h b/trunk/drivers/dma/shdma.h
index 9f0897f7fe34..153609a1e96c 100644
--- a/trunk/drivers/dma/shdma.h
+++ b/trunk/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 {