]> git.karo-electronics.de Git - linux-beck.git/commitdiff
dmaengine: fsldma: move unmap to before callback
authorDave Jiang <dave.jiang@intel.com>
Mon, 25 Jul 2016 17:33:57 +0000 (10:33 -0700)
committerVinod Koul <vinod.koul@intel.com>
Mon, 8 Aug 2016 02:41:43 +0000 (08:11 +0530)
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>
drivers/dma/fsldma.c

index ef808665aeca00ec98775ffadcea2f13e4bd9575..b557ccbaa1b5b695f723c6c87f62f604c1a834b6 100644 (file)
@@ -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 */