]> git.karo-electronics.de Git - linux-beck.git/commitdiff
dmaengine: ppc4xx/adma: move unmap to before callback
authorDave Jiang <dave.jiang@intel.com>
Mon, 25 Jul 2016 17:34:14 +0000 (10:34 -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>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
drivers/dma/ppc4xx/adma.c

index 140f3ed429f47ba8f4b9324758e771b9c87ead25..fc71a635edf60f970a3d4952621e20701007c538 100644 (file)
@@ -1482,11 +1482,11 @@ static dma_cookie_t ppc440spe_adma_run_tx_complete_actions(
                cookie = desc->async_tx.cookie;
                desc->async_tx.cookie = 0;
 
+               dma_descriptor_unmap(&desc->async_tx);
                /* call the callback (must not sleep or submit new
                 * operations to this channel)
                 */
                dmaengine_desc_get_callback_invoke(&desc->async_tx, NULL);
-               dma_descriptor_unmap(&desc->async_tx);
        }
 
        /* run dependent operations */