Commit a79f949a authored by Frank Li's avatar Frank Li Committed by Vinod Koul
Browse files

dmaengine: fsl-edma: correct max_segment_size setting 



Correcting the previous setting of 0x3fff to the actual value of 0x7fff.

Introduced new macro 'EDMA_TCD_ITER_MASK' for improved code clarity and
utilization of FIELD_GET to obtain the accurate maximum value.

Cc: stable@vger.kernel.org
Fixes: e0674853 ("dmaengine: fsl-edma: support edma memcpy")
Signed-off-by: default avatarFrank Li <Frank.Li@nxp.com>
Link: https://lore.kernel.org/r/20240207194733.2112870-1-Frank.Li@nxp.com


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

drivers/dma/fsl-edma-common.h

+3 −2
Original line number Diff line number Diff line
@@ -30,8 +30,9 @@ 
#define EDMA_TCD_ATTR_SSIZE(x)		(((x) & GENMASK(2, 0)) << 8)

#define EDMA_TCD_ATTR_SMOD(x)		(((x) & GENMASK(4, 0)) << 11)



#define EDMA_TCD_CITER_CITER(x)		((x) & GENMASK(14, 0))

#define EDMA_TCD_BITER_BITER(x)		((x) & GENMASK(14, 0))

#define EDMA_TCD_ITER_MASK		GENMASK(14, 0)

#define EDMA_TCD_CITER_CITER(x)		((x) & EDMA_TCD_ITER_MASK)

#define EDMA_TCD_BITER_BITER(x)		((x) & EDMA_TCD_ITER_MASK)



#define EDMA_TCD_CSR_START		BIT(0)

#define EDMA_TCD_CSR_INT_MAJOR		BIT(1)

drivers/dma/fsl-edma-main.c

+3 −1
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
 */



#include <dt-bindings/dma/fsl-edma.h>

#include <linux/bitfield.h>

#include <linux/module.h>

#include <linux/interrupt.h>

#include <linux/clk.h>
@@ -582,7 +583,8 @@ static int fsl_edma_probe(struct platform_device *pdev) 
					DMAENGINE_ALIGN_32_BYTES;



	/* Per worst case 'nbytes = 1' take CITER as the max_seg_size */

	dma_set_max_seg_size(fsl_edma->dma_dev.dev, 0x3fff);

	dma_set_max_seg_size(fsl_edma->dma_dev.dev,

			     FIELD_GET(EDMA_TCD_ITER_MASK, EDMA_TCD_ITER_MASK));



	fsl_edma->dma_dev.residue_granularity = DMA_RESIDUE_GRANULARITY_SEGMENT;