From: Dave Jiang <dave.jiang@intel.com>
Date: Mon, 25 Jul 2016 17:33:57 +0000 (-0700)
Subject: dmaengine: fsldma: move unmap to before callback
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=9b335978f7081cd4fe264709599a18073e12fee2;p=deliverable%2Flinux.git

dmaengine: fsldma: move unmap to before callback

Completion callback should happen after dma_descriptor_unmap() has
happened. This allow the cache invalidate to happen and ensure that
the data accessed by the upper layer is in memory that was from DMA
rather than stale data. On some architecture this is done by the
hardware, however we should make the code consistent to not cause
confusion.

Signed-off-by: Dave Jiang <dave.jiang@intel.com>
Acked-by: Li Yang <leoyang.li@nxp.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
---

diff --git a/drivers/dma/fsldma.c b/drivers/dma/fsldma.c
index ef808665aeca..b557ccbaa1b5 100644
--- a/drivers/dma/fsldma.c
+++ b/drivers/dma/fsldma.c
@@ -516,9 +516,9 @@ static dma_cookie_t fsldma_run_tx_complete_actions(struct fsldma_chan *chan,
 	if (txd->cookie > 0) {
 		ret = txd->cookie;
 
+		dma_descriptor_unmap(txd);
 		/* Run the link descriptor callback function */
 		dmaengine_desc_get_callback_invoke(txd, NULL);
-		dma_descriptor_unmap(txd);
 	}
 
 	/* Run any dependencies */