dmaengine: at_xdmac: fix bad behavior in interleaved mode
authorSylvain ETIENNE <Sylvain.ETIENNE@ingenico.com>
Wed, 2 Dec 2015 16:10:16 +0000 (17:10 +0100)
committerVinod Koul <vinod.koul@intel.com>
Sat, 5 Dec 2015 08:46:23 +0000 (14:16 +0530)
When performing interleaved transfers with numf > 1, an extra line is
copied. The mbr.bc field is incremented once too often. The length of
the block is (BLEN+1) microblocks.

Signed-off-by: Sylvain ETIENNE <Sylvain.ETIENNE@ingenico.com>
Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com>
Fixes: 4e5385784e69 ("dmaengine: at_xdmac: handle numf > 1")
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
drivers/dma/at_xdmac.c

index c344f89a77e84e722864113d5b516361c047dd6e..bda49519b6de9d6d5e316b9d7bd7f25cea2aca88 100644 (file)
@@ -965,7 +965,9 @@ at_xdmac_prep_interleaved(struct dma_chan *chan,
                                                        NULL,
                                                        src_addr, dst_addr,
                                                        xt, xt->sgl);
-               for (i = 0; i < xt->numf; i++)
+
+               /* Length of the block is (BLEN+1) microblocks. */
+               for (i = 0; i < xt->numf - 1; i++)
                        at_xdmac_increment_block_count(chan, first);
 
                dev_dbg(chan2dev(chan), "%s: add desc 0x%p to descs_list 0x%p\n",