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

dmaengine: fsl-edma: Remove enum edma_version 



The enum edma_version, which defines v1, v2, and v3, is a software concept
used to distinguish IP differences. However, it is not aligned with the
chip reference manual. According to the 7ulp reference manual, it should
be edma2. In the future, there will be edma3, edma4, and edma5, which
could cause confusion. To avoid this confusion, remove the edma_version
and instead use drvdata->flags to distinguish the IP difference.

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


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

drivers/dma/fsl-edma-common.c

+19 −28
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ static void fsl_edma_enable_request(struct fsl_edma_chan *fsl_chan) 
	struct edma_regs *regs = &fsl_chan->edma->regs;

	u32 ch = fsl_chan->vchan.chan.chan_id;



	if (fsl_chan->edma->drvdata->version == v1) {

	if (fsl_chan->edma->drvdata->flags & FSL_EDMA_DRV_WRAP_IO) {

		edma_writeb(fsl_chan->edma, EDMA_SEEI_SEEI(ch), regs->seei);

		edma_writeb(fsl_chan->edma, ch, regs->serq);

	} else {
@@ -64,7 +64,7 @@ void fsl_edma_disable_request(struct fsl_edma_chan *fsl_chan) 
	struct edma_regs *regs = &fsl_chan->edma->regs;

	u32 ch = fsl_chan->vchan.chan.chan_id;



	if (fsl_chan->edma->drvdata->version == v1) {

	if (fsl_chan->edma->drvdata->flags & FSL_EDMA_DRV_WRAP_IO) {

		edma_writeb(fsl_chan->edma, ch, regs->cerq);

		edma_writeb(fsl_chan->edma, EDMA_CEEI_CEEI(ch), regs->ceei);

	} else {
@@ -120,7 +120,7 @@ void fsl_edma_chan_mux(struct fsl_edma_chan *fsl_chan, 
	muxaddr = fsl_chan->edma->muxbase[ch / chans_per_mux];

	slot = EDMAMUX_CHCFG_SOURCE(slot);



	if (fsl_chan->edma->drvdata->version == v3)

	if (fsl_chan->edma->drvdata->flags & FSL_EDMA_DRV_CONFIG32)

		mux_configure32(fsl_chan, muxaddr, ch_off, slot, enable);

	else

		mux_configure8(fsl_chan, muxaddr, ch_off, slot, enable);
@@ -682,9 +682,8 @@ void fsl_edma_cleanup_vchan(struct dma_device *dmadev) 
}



/*

 * On the 32 channels Vybrid/mpc577x edma version (here called "v1"),

 * register offsets are different compared to ColdFire mcf5441x 64 channels

 * edma (here called "v2").

 * On the 32 channels Vybrid/mpc577x edma version, register offsets are

 * different compared to ColdFire mcf5441x 64 channels edma.

 *

 * This function sets up register offsets as per proper declared version

 * so must be called in xxx_edma_probe() just after setting the
@@ -692,33 +691,25 @@ void fsl_edma_cleanup_vchan(struct dma_device *dmadev) 
 */

void fsl_edma_setup_regs(struct fsl_edma_engine *edma)

{

	bool is64 = !!(edma->drvdata->flags & FSL_EDMA_DRV_EDMA64);



	edma->regs.cr = edma->membase + EDMA_CR;

	edma->regs.es = edma->membase + EDMA_ES;

	edma->regs.erql = edma->membase + EDMA_ERQ;

	edma->regs.eeil = edma->membase + EDMA_EEI;



	edma->regs.serq = edma->membase + ((edma->drvdata->version == v2) ?

			EDMA64_SERQ : EDMA_SERQ);

	edma->regs.cerq = edma->membase + ((edma->drvdata->version == v2) ?

			EDMA64_CERQ : EDMA_CERQ);

	edma->regs.seei = edma->membase + ((edma->drvdata->version == v2) ?

			EDMA64_SEEI : EDMA_SEEI);

	edma->regs.ceei = edma->membase + ((edma->drvdata->version == v2) ?

			EDMA64_CEEI : EDMA_CEEI);

	edma->regs.cint = edma->membase + ((edma->drvdata->version == v2) ?

			EDMA64_CINT : EDMA_CINT);

	edma->regs.cerr = edma->membase + ((edma->drvdata->version == v2) ?

			EDMA64_CERR : EDMA_CERR);

	edma->regs.ssrt = edma->membase + ((edma->drvdata->version == v2) ?

			EDMA64_SSRT : EDMA_SSRT);

	edma->regs.cdne = edma->membase + ((edma->drvdata->version == v2) ?

			EDMA64_CDNE : EDMA_CDNE);

	edma->regs.intl = edma->membase + ((edma->drvdata->version == v2) ?

			EDMA64_INTL : EDMA_INTR);

	edma->regs.errl = edma->membase + ((edma->drvdata->version == v2) ?

			EDMA64_ERRL : EDMA_ERR);



	if (edma->drvdata->version == v2) {

	edma->regs.serq = edma->membase + (is64 ? EDMA64_SERQ : EDMA_SERQ);

	edma->regs.cerq = edma->membase + (is64 ? EDMA64_CERQ : EDMA_CERQ);

	edma->regs.seei = edma->membase + (is64 ? EDMA64_SEEI : EDMA_SEEI);

	edma->regs.ceei = edma->membase + (is64 ? EDMA64_CEEI : EDMA_CEEI);

	edma->regs.cint = edma->membase + (is64 ? EDMA64_CINT : EDMA_CINT);

	edma->regs.cerr = edma->membase + (is64 ? EDMA64_CERR : EDMA_CERR);

	edma->regs.ssrt = edma->membase + (is64 ? EDMA64_SSRT : EDMA_SSRT);

	edma->regs.cdne = edma->membase + (is64 ? EDMA64_CDNE : EDMA_CDNE);

	edma->regs.intl = edma->membase + (is64 ? EDMA64_INTL : EDMA_INTR);

	edma->regs.errl = edma->membase + (is64 ? EDMA64_ERRL : EDMA_ERR);



	if (is64) {

		edma->regs.erqh = edma->membase + EDMA64_ERQH;

		edma->regs.eeih = edma->membase + EDMA64_EEIH;

		edma->regs.errh = edma->membase + EDMA64_ERRH;

drivers/dma/fsl-edma-common.h

+3 −7
Original line number Diff line number Diff line
@@ -138,16 +138,12 @@ struct fsl_edma_desc { 
	struct fsl_edma_sw_tcd		tcd[];

};



enum edma_version {

	v1, /* 32ch, Vybrid, mpc57x, etc */

	v2, /* 64ch Coldfire */

	v3, /* 32ch, i.mx7ulp */

};



#define FSL_EDMA_DRV_HAS_DMACLK		BIT(0)

#define FSL_EDMA_DRV_MUX_SWAP		BIT(1)

#define FSL_EDMA_DRV_CONFIG32		BIT(2)

#define FSL_EDMA_DRV_WRAP_IO		BIT(3)

#define FSL_EDMA_DRV_EDMA64		BIT(4)

struct fsl_edma_drvdata {

	enum edma_version	version;

	u32			dmamuxs;

	u32			flags;

	int			(*setup_irq)(struct platform_device *pdev,

drivers/dma/fsl-edma-main.c

+3 −5
Original line number Diff line number Diff line
@@ -236,22 +236,20 @@ static void fsl_disable_clocks(struct fsl_edma_engine *fsl_edma, int nr_clocks) 
}



static struct fsl_edma_drvdata vf610_data = {

	.version = v1,

	.dmamuxs = DMAMUX_NR,

	.flags = FSL_EDMA_DRV_WRAP_IO,

	.setup_irq = fsl_edma_irq_init,

};



static struct fsl_edma_drvdata ls1028a_data = {

	.version = v1,

	.dmamuxs = DMAMUX_NR,

	.flags = FSL_EDMA_DRV_MUX_SWAP,

	.flags = FSL_EDMA_DRV_MUX_SWAP | FSL_EDMA_DRV_WRAP_IO,

	.setup_irq = fsl_edma_irq_init,

};



static struct fsl_edma_drvdata imx7ulp_data = {

	.version = v3,

	.dmamuxs = 1,

	.flags = FSL_EDMA_DRV_HAS_DMACLK,

	.flags = FSL_EDMA_DRV_HAS_DMACLK | FSL_EDMA_DRV_CONFIG32,

	.setup_irq = fsl_edma2_irq_init,

};

drivers/dma/mcf-edma-main.c

+1 −1
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ static void mcf_edma_irq_free(struct platform_device *pdev, 
}



static struct fsl_edma_drvdata mcf_data = {

	.version = v2,

	.flags = FSL_EDMA_DRV_EDMA64,

	.setup_irq = mcf_edma_irq_init,

};