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

dmaengine: fsl-edma: simply ATTR_DSIZE and ATTR_SSIZE by using ffs() 



Removes all ATTR_DSIZE_*BIT(BYTE) and ATTR_SSIZE_*BIT(BYTE) definitions
in edma. Uses ffs() instead, as it gives identical results. This simplifies
the code and avoids adding more similar definitions in future V3 version.

Signed-off-by: default avatarFrank Li <Frank.Li@nxp.com>
Link: https://lore.kernel.org/r/20230821161617.2142561-7-Frank.Li@nxp.com


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

drivers/dma/fsl-edma-common.c

+8 −13
Original line number Diff line number Diff line
@@ -154,18 +154,13 @@ void fsl_edma_chan_mux(struct fsl_edma_chan *fsl_chan, 


static unsigned int fsl_edma_get_tcd_attr(enum dma_slave_buswidth addr_width)

{

	switch (addr_width) {

	case 1:

		return EDMA_TCD_ATTR_SSIZE_8BIT | EDMA_TCD_ATTR_DSIZE_8BIT;

	case 2:

		return EDMA_TCD_ATTR_SSIZE_16BIT | EDMA_TCD_ATTR_DSIZE_16BIT;

	case 4:

		return EDMA_TCD_ATTR_SSIZE_32BIT | EDMA_TCD_ATTR_DSIZE_32BIT;

	case 8:

		return EDMA_TCD_ATTR_SSIZE_64BIT | EDMA_TCD_ATTR_DSIZE_64BIT;

	default:

		return EDMA_TCD_ATTR_SSIZE_32BIT | EDMA_TCD_ATTR_DSIZE_32BIT;

	}

	u32 val;



	if (addr_width == DMA_SLAVE_BUSWIDTH_UNDEFINED)

		addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;



	val = ffs(addr_width) - 1;

	return val | (val << 8);

}



void fsl_edma_free_desc(struct virt_dma_desc *vdesc)
@@ -623,7 +618,7 @@ struct dma_async_tx_descriptor *fsl_edma_prep_memcpy(struct dma_chan *chan, 


	/* To match with copy_align and max_seg_size so 1 tcd is enough */

	fsl_edma_fill_tcd(fsl_desc->tcd[0].vtcd, dma_src, dma_dst,

			EDMA_TCD_ATTR_SSIZE_32BYTE | EDMA_TCD_ATTR_DSIZE_32BYTE,

			fsl_edma_get_tcd_attr(DMA_SLAVE_BUSWIDTH_32_BYTES),

			32, len, 0, 1, 1, 32, 0, true, true, false);



	return vchan_tx_prep(&fsl_chan->vchan, &fsl_desc->vdesc, flags);

drivers/dma/fsl-edma-common.h

+0 −10
Original line number Diff line number Diff line
@@ -29,16 +29,6 @@ 
#define EDMA_TCD_ATTR_DMOD(x)		(((x) & GENMASK(4, 0)) << 3)

#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_ATTR_DSIZE_8BIT	0

#define EDMA_TCD_ATTR_DSIZE_16BIT	BIT(0)

#define EDMA_TCD_ATTR_DSIZE_32BIT	BIT(1)

#define EDMA_TCD_ATTR_DSIZE_64BIT	(BIT(0) | BIT(1))

#define EDMA_TCD_ATTR_DSIZE_32BYTE	(BIT(2) | BIT(0))

#define EDMA_TCD_ATTR_SSIZE_8BIT	0

#define EDMA_TCD_ATTR_SSIZE_16BIT	(EDMA_TCD_ATTR_DSIZE_16BIT << 8)

#define EDMA_TCD_ATTR_SSIZE_32BIT	(EDMA_TCD_ATTR_DSIZE_32BIT << 8)

#define EDMA_TCD_ATTR_SSIZE_64BIT	(EDMA_TCD_ATTR_DSIZE_64BIT << 8)

#define EDMA_TCD_ATTR_SSIZE_32BYTE	(EDMA_TCD_ATTR_DSIZE_32BYTE << 8)



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

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