]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
dmaengine: mv_xor: move unmap to before callback
authorDave Jiang <dave.jiang@intel.com>
Mon, 25 Jul 2016 17:34:08 +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/mv_xor.c

index f8b5e7424b3a39293a7766c4a955ddca30b71c9c..d550efbc70540c1ba62290a3e4ac64360c3b98e5 100644 (file)
@@ -206,11 +206,11 @@ mv_desc_run_tx_complete_actions(struct mv_xor_desc_slot *desc,
        if (desc->async_tx.cookie > 0) {
                cookie = desc->async_tx.cookie;
 
+               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 */