Skip to content

Commit c26e611

Browse files
nxpfranklivinodkoul
nxpfrankli
authored and
vinodkoul
committed
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: Frank Li <Frank.Li@nxp.com> Link: https://lore.kernel.org/r/20230821161617.2142561-5-Frank.Li@nxp.com Signed-off-by: Vinod Koul <vkoul@kernel.org>
1 parent 9e006b2 commit c26e611

4 files changed

Lines changed: 26 additions & 41 deletions

File tree

‎drivers/dma/fsl-edma-common.c‎

Lines changed: 19 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ static void fsl_edma_enable_request(struct fsl_edma_chan *fsl_chan)
4747
struct edma_regs *regs = &fsl_chan->edma->regs;
4848
u32 ch = fsl_chan->vchan.chan.chan_id;
4949

50-
if (fsl_chan->edma->drvdata->version == v1) {
50+
if (fsl_chan->edma->drvdata->flags & FSL_EDMA_DRV_WRAP_IO) {
5151
edma_writeb(fsl_chan->edma, EDMA_SEEI_SEEI(ch), regs->seei);
5252
edma_writeb(fsl_chan->edma, ch, regs->serq);
5353
} else {
@@ -64,7 +64,7 @@ void fsl_edma_disable_request(struct fsl_edma_chan *fsl_chan)
6464
struct edma_regs *regs = &fsl_chan->edma->regs;
6565
u32 ch = fsl_chan->vchan.chan.chan_id;
6666

67-
if (fsl_chan->edma->drvdata->version == v1) {
67+
if (fsl_chan->edma->drvdata->flags & FSL_EDMA_DRV_WRAP_IO) {
6868
edma_writeb(fsl_chan->edma, ch, regs->cerq);
6969
edma_writeb(fsl_chan->edma, EDMA_CEEI_CEEI(ch), regs->ceei);
7070
} else {
@@ -120,7 +120,7 @@ void fsl_edma_chan_mux(struct fsl_edma_chan *fsl_chan,
120120
muxaddr = fsl_chan->edma->muxbase[ch / chans_per_mux];
121121
slot = EDMAMUX_CHCFG_SOURCE(slot);
122122

123-
if (fsl_chan->edma->drvdata->version == v3)
123+
if (fsl_chan->edma->drvdata->flags & FSL_EDMA_DRV_CONFIG32)
124124
mux_configure32(fsl_chan, muxaddr, ch_off, slot, enable);
125125
else
126126
mux_configure8(fsl_chan, muxaddr, ch_off, slot, enable);
@@ -682,43 +682,34 @@ void fsl_edma_cleanup_vchan(struct dma_device *dmadev)
682682
}
683683

684684
/*
685-
* On the 32 channels Vybrid/mpc577x edma version (here called "v1"),
686-
* register offsets are different compared to ColdFire mcf5441x 64 channels
687-
* edma (here called "v2").
685+
* On the 32 channels Vybrid/mpc577x edma version, register offsets are
686+
* different compared to ColdFire mcf5441x 64 channels edma.
688687
*
689688
* This function sets up register offsets as per proper declared version
690689
* so must be called in xxx_edma_probe() just after setting the
691690
* edma "version" and "membase" appropriately.
692691
*/
693692
void fsl_edma_setup_regs(struct fsl_edma_engine *edma)
694693
{
694+
bool is64 = !!(edma->drvdata->flags & FSL_EDMA_DRV_EDMA64);
695+
695696
edma->regs.cr = edma->membase + EDMA_CR;
696697
edma->regs.es = edma->membase + EDMA_ES;
697698
edma->regs.erql = edma->membase + EDMA_ERQ;
698699
edma->regs.eeil = edma->membase + EDMA_EEI;
699700

700-
edma->regs.serq = edma->membase + ((edma->drvdata->version == v2) ?
701-
EDMA64_SERQ : EDMA_SERQ);
702-
edma->regs.cerq = edma->membase + ((edma->drvdata->version == v2) ?
703-
EDMA64_CERQ : EDMA_CERQ);
704-
edma->regs.seei = edma->membase + ((edma->drvdata->version == v2) ?
705-
EDMA64_SEEI : EDMA_SEEI);
706-
edma->regs.ceei = edma->membase + ((edma->drvdata->version == v2) ?
707-
EDMA64_CEEI : EDMA_CEEI);
708-
edma->regs.cint = edma->membase + ((edma->drvdata->version == v2) ?
709-
EDMA64_CINT : EDMA_CINT);
710-
edma->regs.cerr = edma->membase + ((edma->drvdata->version == v2) ?
711-
EDMA64_CERR : EDMA_CERR);
712-
edma->regs.ssrt = edma->membase + ((edma->drvdata->version == v2) ?
713-
EDMA64_SSRT : EDMA_SSRT);
714-
edma->regs.cdne = edma->membase + ((edma->drvdata->version == v2) ?
715-
EDMA64_CDNE : EDMA_CDNE);
716-
edma->regs.intl = edma->membase + ((edma->drvdata->version == v2) ?
717-
EDMA64_INTL : EDMA_INTR);
718-
edma->regs.errl = edma->membase + ((edma->drvdata->version == v2) ?
719-
EDMA64_ERRL : EDMA_ERR);
720-
721-
if (edma->drvdata->version == v2) {
701+
edma->regs.serq = edma->membase + (is64 ? EDMA64_SERQ : EDMA_SERQ);
702+
edma->regs.cerq = edma->membase + (is64 ? EDMA64_CERQ : EDMA_CERQ);
703+
edma->regs.seei = edma->membase + (is64 ? EDMA64_SEEI : EDMA_SEEI);
704+
edma->regs.ceei = edma->membase + (is64 ? EDMA64_CEEI : EDMA_CEEI);
705+
edma->regs.cint = edma->membase + (is64 ? EDMA64_CINT : EDMA_CINT);
706+
edma->regs.cerr = edma->membase + (is64 ? EDMA64_CERR : EDMA_CERR);
707+
edma->regs.ssrt = edma->membase + (is64 ? EDMA64_SSRT : EDMA_SSRT);
708+
edma->regs.cdne = edma->membase + (is64 ? EDMA64_CDNE : EDMA_CDNE);
709+
edma->regs.intl = edma->membase + (is64 ? EDMA64_INTL : EDMA_INTR);
710+
edma->regs.errl = edma->membase + (is64 ? EDMA64_ERRL : EDMA_ERR);
711+
712+
if (is64) {
722713
edma->regs.erqh = edma->membase + EDMA64_ERQH;
723714
edma->regs.eeih = edma->membase + EDMA64_EEIH;
724715
edma->regs.errh = edma->membase + EDMA64_ERRH;

‎drivers/dma/fsl-edma-common.h‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -138,16 +138,12 @@ struct fsl_edma_desc {
138138
struct fsl_edma_sw_tcd tcd[];
139139
};
140140

141-
enum edma_version {
142-
v1, /* 32ch, Vybrid, mpc57x, etc */
143-
v2, /* 64ch Coldfire */
144-
v3, /* 32ch, i.mx7ulp */
145-
};
146-
147141
#define FSL_EDMA_DRV_HAS_DMACLK BIT(0)
148142
#define FSL_EDMA_DRV_MUX_SWAP BIT(1)
143+
#define FSL_EDMA_DRV_CONFIG32 BIT(2)
144+
#define FSL_EDMA_DRV_WRAP_IO BIT(3)
145+
#define FSL_EDMA_DRV_EDMA64 BIT(4)
149146
struct fsl_edma_drvdata {
150-
enum edma_version version;
151147
u32 dmamuxs;
152148
u32 flags;
153149
int (*setup_irq)(struct platform_device *pdev,

‎drivers/dma/fsl-edma-main.c‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -236,22 +236,20 @@ static void fsl_disable_clocks(struct fsl_edma_engine *fsl_edma, int nr_clocks)
236236
}
237237

238238
static struct fsl_edma_drvdata vf610_data = {
239-
.version = v1,
240239
.dmamuxs = DMAMUX_NR,
240+
.flags = FSL_EDMA_DRV_WRAP_IO,
241241
.setup_irq = fsl_edma_irq_init,
242242
};
243243

244244
static struct fsl_edma_drvdata ls1028a_data = {
245-
.version = v1,
246245
.dmamuxs = DMAMUX_NR,
247-
.flags = FSL_EDMA_DRV_MUX_SWAP,
246+
.flags = FSL_EDMA_DRV_MUX_SWAP | FSL_EDMA_DRV_WRAP_IO,
248247
.setup_irq = fsl_edma_irq_init,
249248
};
250249

251250
static struct fsl_edma_drvdata imx7ulp_data = {
252-
.version = v3,
253251
.dmamuxs = 1,
254-
.flags = FSL_EDMA_DRV_HAS_DMACLK,
252+
.flags = FSL_EDMA_DRV_HAS_DMACLK | FSL_EDMA_DRV_CONFIG32,
255253
.setup_irq = fsl_edma2_irq_init,
256254
};
257255

‎drivers/dma/mcf-edma-main.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ static void mcf_edma_irq_free(struct platform_device *pdev,
172172
}
173173

174174
static struct fsl_edma_drvdata mcf_data = {
175-
.version = v2,
175+
.flags = FSL_EDMA_DRV_EDMA64,
176176
.setup_irq = mcf_edma_irq_init,
177177
};
178178

0 commit comments

Comments
 (0)