dmaengine: dw: Fix data corruption in large device to memory transfers

When transferring more data than the maximum block size supported by the
HW multiplied by source width the transfer is split into smaller chunks.
Currently code calculates the memory width and thus aligment before
splitting for both memory to device and device to memory transfers.

For memory to device transfers this work fine since alignment is preserved
through the splitting and split blocks are still memory width aligned.
However in device to memory transfers aligment breaks when maximum block
size multiplied by register width doesn't have the same alignment than the
buffer. For instance when transferring from an 8-bit register 4100 bytes
(32-bit aligned) on a DW DMA that has maximum block size of 4095 elements.
An attempt to do such transfers caused data corruption.

Fix this by calculating and setting the destination memory width after
splitting by using the split block aligment and length.

Signed-off-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>

diff --git a/drivers/dma/dw/core.c b/drivers/dma/dw/core.c
index e5adf5d1c34fcf53dfeab355ee647a97c2765661..45bb608a1b7ce3bed49f49c743cc92ade06076c7 100644 (file)
--- a/drivers/dma/dw/core.c
+++ b/drivers/dma/dw/core.c
@@ -789,17 +789,13 @@ dwc_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl,
 
                        lli_write(desc, sar, mem);
                        lli_write(desc, dar, reg);
-                       lli_write(desc, ctllo, ctllo | DWC_CTLL_SRC_WIDTH(mem_width));
                        if ((len >> mem_width) > dwc->block_size) {
                                dlen = dwc->block_size << mem_width;
-                               mem += dlen;
-                               len -= dlen;
                        } else {
                                dlen = len;
-                               len = 0;
                        }
-
                        lli_write(desc, ctlhi, dlen >> mem_width);
+                       lli_write(desc, ctllo, ctllo | DWC_CTLL_SRC_WIDTH(mem_width));
                        desc->len = dlen;
 
                        if (!first) {
@@ -809,6 +805,9 @@ dwc_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl,
                                list_add_tail(&desc->desc_node, &first->tx_list);
                        }
                        prev = desc;
+
+                       mem += dlen;
+                       len -= dlen;
                        total_len += dlen;
 
                        if (len)
@@ -833,8 +832,6 @@ dwc_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl,
                        mem = sg_dma_address(sg);
                        len = sg_dma_len(sg);
 
-                       mem_width = __ffs(data_width | mem | len);
-
 slave_sg_fromdev_fill_desc:
                        desc = dwc_desc_get(dwc);
                        if (!desc)
@@ -842,16 +839,14 @@ dwc_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl,
 
                        lli_write(desc, sar, reg);
                        lli_write(desc, dar, mem);
-                       lli_write(desc, ctllo, ctllo | DWC_CTLL_DST_WIDTH(mem_width));
                        if ((len >> reg_width) > dwc->block_size) {
                                dlen = dwc->block_size << reg_width;
-                               mem += dlen;
-                               len -= dlen;
                        } else {
                                dlen = len;
-                               len = 0;
                        }
                        lli_write(desc, ctlhi, dlen >> reg_width);
+                       mem_width = __ffs(data_width | mem | dlen);
+                       lli_write(desc, ctllo, ctllo | DWC_CTLL_DST_WIDTH(mem_width));
                        desc->len = dlen;
 
                        if (!first) {
@@ -861,6 +856,9 @@ dwc_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl,
                                list_add_tail(&desc->desc_node, &first->tx_list);
                        }
                        prev = desc;
+
+                       mem += dlen;
+                       len -= dlen;
                        total_len += dlen;
 
                        if (len)