Commit 05655541 authored by Gustavo Pimentel's avatar Gustavo Pimentel Committed by Vinod Koul

dmaengine: dw-edma: Fix scatter-gather address calculation

Fix the source and destination physical address calculation of a
peripheral device on scatter-gather implementation.

This issue manifested during tests using a 64 bits architecture system.
The abnormal behavior wasn't visible before due to all previous tests
were done using 32 bits architecture system, that masked his effect.

Fixes: e63d79d1 ("dmaengine: Add Synopsys eDMA IP core driver")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarGustavo Pimentel <gustavo.pimentel@synopsys.com>
Link: https://lore.kernel.org/r/8d3ab7e2ba96563fe3495b32f60077fffb85307d.1597327623.git.gustavo.pimentel@synopsys.comSigned-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent 33ebffa1
...@@ -405,7 +405,7 @@ dw_edma_device_transfer(struct dw_edma_transfer *xfer) ...@@ -405,7 +405,7 @@ dw_edma_device_transfer(struct dw_edma_transfer *xfer)
if (xfer->cyclic) { if (xfer->cyclic) {
burst->dar = xfer->xfer.cyclic.paddr; burst->dar = xfer->xfer.cyclic.paddr;
} else { } else {
burst->dar = sg_dma_address(sg); burst->dar = dst_addr;
/* Unlike the typical assumption by other /* Unlike the typical assumption by other
* drivers/IPs the peripheral memory isn't * drivers/IPs the peripheral memory isn't
* a FIFO memory, in this case, it's a * a FIFO memory, in this case, it's a
...@@ -413,14 +413,13 @@ dw_edma_device_transfer(struct dw_edma_transfer *xfer) ...@@ -413,14 +413,13 @@ dw_edma_device_transfer(struct dw_edma_transfer *xfer)
* and destination addresses are increased * and destination addresses are increased
* by the same portion (data length) * by the same portion (data length)
*/ */
src_addr += sg_dma_len(sg);
} }
} else { } else {
burst->dar = dst_addr; burst->dar = dst_addr;
if (xfer->cyclic) { if (xfer->cyclic) {
burst->sar = xfer->xfer.cyclic.paddr; burst->sar = xfer->xfer.cyclic.paddr;
} else { } else {
burst->sar = sg_dma_address(sg); burst->sar = src_addr;
/* Unlike the typical assumption by other /* Unlike the typical assumption by other
* drivers/IPs the peripheral memory isn't * drivers/IPs the peripheral memory isn't
* a FIFO memory, in this case, it's a * a FIFO memory, in this case, it's a
...@@ -428,12 +427,14 @@ dw_edma_device_transfer(struct dw_edma_transfer *xfer) ...@@ -428,12 +427,14 @@ dw_edma_device_transfer(struct dw_edma_transfer *xfer)
* and destination addresses are increased * and destination addresses are increased
* by the same portion (data length) * by the same portion (data length)
*/ */
dst_addr += sg_dma_len(sg);
} }
} }
if (!xfer->cyclic) if (!xfer->cyclic) {
src_addr += sg_dma_len(sg);
dst_addr += sg_dma_len(sg);
sg = sg_next(sg); sg = sg_next(sg);
}
} }
return vchan_tx_prep(&chan->vc, &desc->vd, xfer->flags); return vchan_tx_prep(&chan->vc, &desc->vd, xfer->flags);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment