diff mbox series

dmaengine: pl330: Fix burst length if burst size is smaller than bus width

Message ID 20200825064617.16193-1-m.szyprowski@samsung.com (mailing list archive)
State New, archived
Headers show
Series dmaengine: pl330: Fix burst length if burst size is smaller than bus width | expand

Commit Message

Marek Szyprowski Aug. 25, 2020, 6:46 a.m. UTC 
Move the burst len fixup after setting the generic value for it. This
finally enables the fixup introduced by commit 137bd11090d8 ("dmaengine:
pl330: Align DMA memcpy operations to MFIFO width"), which otherwise was
overwritten by the generic value.

Reported-by: kernel test robot <lkp@intel.com>
Fixes: 137bd11090d8 ("dmaengine: pl330: Align DMA memcpy operations to MFIFO width")
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
---
 drivers/dma/pl330.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Vinod Koul Aug. 25, 2020, 10:19 a.m. UTC | #1 
On 25-08-20, 08:46, Marek Szyprowski wrote:
> Move the burst len fixup after setting the generic value for it. This
> finally enables the fixup introduced by commit 137bd11090d8 ("dmaengine:
> pl330: Align DMA memcpy operations to MFIFO width"), which otherwise was
> overwritten by the generic value.

Applied, thanks
diff mbox series

Patch

diff --git a/drivers/dma/pl330.c b/drivers/dma/pl330.c
index 2c508ee672b9..e010064d8846 100644
--- a/drivers/dma/pl330.c
+++ b/drivers/dma/pl330.c
@@ -2801,6 +2801,7 @@  pl330_prep_dma_memcpy(struct dma_chan *chan, dma_addr_t dst,
 	while (burst != (1 << desc->rqcfg.brst_size))
 		desc->rqcfg.brst_size++;
 
+	desc->rqcfg.brst_len = get_burst_len(desc, len);
 	/*
 	 * If burst size is smaller than bus width then make sure we only
 	 * transfer one at a time to avoid a burst stradling an MFIFO entry.
@@ -2808,7 +2809,6 @@  pl330_prep_dma_memcpy(struct dma_chan *chan, dma_addr_t dst,
 	if (desc->rqcfg.brst_size * 8 < pl330->pcfg.data_bus_width)
 		desc->rqcfg.brst_len = 1;
 
-	desc->rqcfg.brst_len = get_burst_len(desc, len);
 	desc->bytes_requested = len;
 
 	desc->txd.flags = flags;