Commit b671d098 authored by Gustavo Pimentel's avatar Gustavo Pimentel Committed by Vinod Koul
Browse files

dmaengine: dw-edma: Revert fix scatter-gather address calculation 



Reverting the applied patch because it caused a regression on
ARC700 platform (32 bits).

Fixes: 05655541 ("dmaengine: dw-edma: Fix scatter-gather address calculation")
Signed-off-by: default avatarGustavo Pimentel <gustavo.pimentel@synopsys.com>
Link: https://lore.kernel.org/r/1778422e389fe40032e216b59b1b992c61ec9887.1613674948.git.gustavo.pimentel@synopsys.com


Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent cb498d7f

drivers/dma/dw-edma/dw-edma-core.c

+4 −4
Original line number Diff line number Diff line
@@ -429,7 +429,8 @@ dw_edma_device_transfer(struct dw_edma_transfer *xfer) 
			if (xfer->type == EDMA_XFER_CYCLIC) {

				burst->dar = xfer->xfer.cyclic.paddr;

			} else if (xfer->type == EDMA_XFER_SCATTER_GATHER) {

				burst->dar = dst_addr;

				src_addr += sg_dma_len(sg);

				burst->dar = sg_dma_address(sg);

				/* Unlike the typical assumption by other

				 * drivers/IPs the peripheral memory isn't

				 * a FIFO memory, in this case, it's a
@@ -443,7 +444,8 @@ dw_edma_device_transfer(struct dw_edma_transfer *xfer) 
			if (xfer->type == EDMA_XFER_CYCLIC) {

				burst->sar = xfer->xfer.cyclic.paddr;

			} else if (xfer->type == EDMA_XFER_SCATTER_GATHER) {

				burst->sar = src_addr;

				dst_addr += sg_dma_len(sg);

				burst->sar = sg_dma_address(sg);

				/* Unlike the typical assumption by other

				 * drivers/IPs the peripheral memory isn't

				 * a FIFO memory, in this case, it's a
@@ -455,8 +457,6 @@ dw_edma_device_transfer(struct dw_edma_transfer *xfer) 
		}



		if (xfer->type == EDMA_XFER_SCATTER_GATHER) {

			src_addr += sg_dma_len(sg);

			dst_addr += sg_dma_len(sg);

			sg = sg_next(sg);

		} else if (xfer->type == EDMA_XFER_INTERLEAVED &&

			   xfer->xfer.il->frame_size > 0) {