| Message ID | 20240411024417.2170609-2-joy.zou@nxp.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Headers | show |
| Series | optimize fsl-edma for imx8QM | expand |
On Thu, Apr 11, 2024 at 10:44:17AM +0800, Joy Zou wrote: > The eDMA hardware issue only exist imx8QM A0. A0 never mass production. > So remove the workaround safely. > > Signed-off-by: Joy Zou <joy.zou@nxp.com> > --- > drivers/dma/fsl-edma-common.c | 16 ++++------------ > drivers/dma/fsl-edma-main.c | 8 -------- > 2 files changed, 4 insertions(+), 20 deletions(-) > > diff --git a/drivers/dma/fsl-edma-common.c b/drivers/dma/fsl-edma-common.c > index f9144b015439..ed93e01282d5 100644 > --- a/drivers/dma/fsl-edma-common.c > +++ b/drivers/dma/fsl-edma-common.c > @@ -75,18 +75,10 @@ static void fsl_edma3_enable_request(struct fsl_edma_chan *fsl_chan) > > flags = fsl_edma_drvflags(fsl_chan); > val = edma_readl_chreg(fsl_chan, ch_sbr); > - /* Remote/local swapped wrongly on iMX8 QM Audio edma */ > - if (flags & FSL_EDMA_DRV_QUIRK_SWAPPED) { > - if (!fsl_chan->is_rxchan) > - val |= EDMA_V3_CH_SBR_RD; > - else > - val |= EDMA_V3_CH_SBR_WR; > - } else { > - if (fsl_chan->is_rxchan) > - val |= EDMA_V3_CH_SBR_RD; > - else > - val |= EDMA_V3_CH_SBR_WR; > - } > + if (fsl_chan->is_rxchan) > + val |= EDMA_V3_CH_SBR_RD; > + else > + val |= EDMA_V3_CH_SBR_WR; > > if (fsl_chan->is_remote) > val &= ~(EDMA_V3_CH_SBR_RD | EDMA_V3_CH_SBR_WR); > diff --git a/drivers/dma/fsl-edma-main.c b/drivers/dma/fsl-edma-main.c > index 755a3dc3b0a7..b06fa147d6ba 100644 > --- a/drivers/dma/fsl-edma-main.c > +++ b/drivers/dma/fsl-edma-main.c > @@ -349,13 +349,6 @@ static struct fsl_edma_drvdata imx8qm_data = { > .setup_irq = fsl_edma3_irq_init, > }; > > -static struct fsl_edma_drvdata imx8qm_audio_data = { > - .flags = FSL_EDMA_DRV_QUIRK_SWAPPED | FSL_EDMA_DRV_HAS_PD | FSL_EDMA_DRV_EDMA3, > - .chreg_space_sz = 0x10000, > - .chreg_off = 0x10000, > - .setup_irq = fsl_edma3_irq_init, > -}; > - > static struct fsl_edma_drvdata imx8ulp_data = { > .flags = FSL_EDMA_DRV_HAS_CHMUX | FSL_EDMA_DRV_HAS_CHCLK | FSL_EDMA_DRV_HAS_DMACLK | > FSL_EDMA_DRV_EDMA3, > @@ -397,7 +390,6 @@ static const struct of_device_id fsl_edma_dt_ids[] = { > { .compatible = "fsl,ls1028a-edma", .data = &ls1028a_data}, > { .compatible = "fsl,imx7ulp-edma", .data = &imx7ulp_data}, > { .compatible = "fsl,imx8qm-edma", .data = &imx8qm_data}, > - { .compatible = "fsl,imx8qm-adma", .data = &imx8qm_audio_data}, Please update binding doc also. Frank Li > { .compatible = "fsl,imx8ulp-edma", .data = &imx8ulp_data}, > { .compatible = "fsl,imx93-edma3", .data = &imx93_data3}, > { .compatible = "fsl,imx93-edma4", .data = &imx93_data4}, > -- > 2.37.1 >
> -----Original Message----- > From: Frank Li <frank.li@nxp.com> > Sent: 2024年4月11日 10:41 > To: Joy Zou <joy.zou@nxp.com> > Cc: Peng Fan <peng.fan@nxp.com>; vkoul@kernel.org; imx@lists.linux.dev; > dmaengine@vger.kernel.org; linux-kernel@vger.kernel.org > Subject: Re: [PATCH v1 1/1] dmaengine: fsl-edma: optimize edma driver for > imx8QM > > On Thu, Apr 11, 2024 at 10:44:17AM +0800, Joy Zou wrote: > > The eDMA hardware issue only exist imx8QM A0. A0 never mass > production. > > So remove the workaround safely. > > > > Signed-off-by: Joy Zou <joy.zou@nxp.com> > > --- > > drivers/dma/fsl-edma-common.c | 16 ++++------------ > > drivers/dma/fsl-edma-main.c | 8 -------- > > 2 files changed, 4 insertions(+), 20 deletions(-) > > > > diff --git a/drivers/dma/fsl-edma-common.c > > b/drivers/dma/fsl-edma-common.c index f9144b015439..ed93e01282d5 > > 100644 > > --- a/drivers/dma/fsl-edma-common.c > > +++ b/drivers/dma/fsl-edma-common.c > > @@ -75,18 +75,10 @@ static void fsl_edma3_enable_request(struct > > fsl_edma_chan *fsl_chan) > > > > flags = fsl_edma_drvflags(fsl_chan); > > val = edma_readl_chreg(fsl_chan, ch_sbr); > > - /* Remote/local swapped wrongly on iMX8 QM Audio edma */ > > - if (flags & FSL_EDMA_DRV_QUIRK_SWAPPED) { > > - if (!fsl_chan->is_rxchan) > > - val |= EDMA_V3_CH_SBR_RD; > > - else > > - val |= EDMA_V3_CH_SBR_WR; > > - } else { > > - if (fsl_chan->is_rxchan) > > - val |= EDMA_V3_CH_SBR_RD; > > - else > > - val |= EDMA_V3_CH_SBR_WR; > > - } > > + if (fsl_chan->is_rxchan) > > + val |= EDMA_V3_CH_SBR_RD; > > + else > > + val |= EDMA_V3_CH_SBR_WR; > > > > if (fsl_chan->is_remote) > > val &= ~(EDMA_V3_CH_SBR_RD | EDMA_V3_CH_SBR_WR); diff --git > > a/drivers/dma/fsl-edma-main.c b/drivers/dma/fsl-edma-main.c index > > 755a3dc3b0a7..b06fa147d6ba 100644 > > --- a/drivers/dma/fsl-edma-main.c > > +++ b/drivers/dma/fsl-edma-main.c > > @@ -349,13 +349,6 @@ static struct fsl_edma_drvdata imx8qm_data = { > > .setup_irq = fsl_edma3_irq_init, > > }; > > > > -static struct fsl_edma_drvdata imx8qm_audio_data = { > > - .flags = FSL_EDMA_DRV_QUIRK_SWAPPED | FSL_EDMA_DRV_HAS_PD | > FSL_EDMA_DRV_EDMA3, > > - .chreg_space_sz = 0x10000, > > - .chreg_off = 0x10000, > > - .setup_irq = fsl_edma3_irq_init, > > -}; > > - > > static struct fsl_edma_drvdata imx8ulp_data = { > > .flags = FSL_EDMA_DRV_HAS_CHMUX | FSL_EDMA_DRV_HAS_CHCLK | > FSL_EDMA_DRV_HAS_DMACLK | > > FSL_EDMA_DRV_EDMA3, > > @@ -397,7 +390,6 @@ static const struct of_device_id fsl_edma_dt_ids[] = > { > > { .compatible = "fsl,ls1028a-edma", .data = &ls1028a_data}, > > { .compatible = "fsl,imx7ulp-edma", .data = &imx7ulp_data}, > > { .compatible = "fsl,imx8qm-edma", .data = &imx8qm_data}, > > - { .compatible = "fsl,imx8qm-adma", .data = &imx8qm_audio_data}, > > Please update binding doc also. Thanks for your comments! Yeah, will add bindings update on next version. BR Joy Zou > > Frank Li > > > { .compatible = "fsl,imx8ulp-edma", .data = &imx8ulp_data}, > > { .compatible = "fsl,imx93-edma3", .data = &imx93_data3}, > > { .compatible = "fsl,imx93-edma4", .data = &imx93_data4}, > > -- > > 2.37.1 > >
diff --git a/drivers/dma/fsl-edma-common.c b/drivers/dma/fsl-edma-common.c index f9144b015439..ed93e01282d5 100644 --- a/drivers/dma/fsl-edma-common.c +++ b/drivers/dma/fsl-edma-common.c @@ -75,18 +75,10 @@ static void fsl_edma3_enable_request(struct fsl_edma_chan *fsl_chan) flags = fsl_edma_drvflags(fsl_chan); val = edma_readl_chreg(fsl_chan, ch_sbr); - /* Remote/local swapped wrongly on iMX8 QM Audio edma */ - if (flags & FSL_EDMA_DRV_QUIRK_SWAPPED) { - if (!fsl_chan->is_rxchan) - val |= EDMA_V3_CH_SBR_RD; - else - val |= EDMA_V3_CH_SBR_WR; - } else { - if (fsl_chan->is_rxchan) - val |= EDMA_V3_CH_SBR_RD; - else - val |= EDMA_V3_CH_SBR_WR; - } + if (fsl_chan->is_rxchan) + val |= EDMA_V3_CH_SBR_RD; + else + val |= EDMA_V3_CH_SBR_WR; if (fsl_chan->is_remote) val &= ~(EDMA_V3_CH_SBR_RD | EDMA_V3_CH_SBR_WR); diff --git a/drivers/dma/fsl-edma-main.c b/drivers/dma/fsl-edma-main.c index 755a3dc3b0a7..b06fa147d6ba 100644 --- a/drivers/dma/fsl-edma-main.c +++ b/drivers/dma/fsl-edma-main.c @@ -349,13 +349,6 @@ static struct fsl_edma_drvdata imx8qm_data = { .setup_irq = fsl_edma3_irq_init, }; -static struct fsl_edma_drvdata imx8qm_audio_data = { - .flags = FSL_EDMA_DRV_QUIRK_SWAPPED | FSL_EDMA_DRV_HAS_PD | FSL_EDMA_DRV_EDMA3, - .chreg_space_sz = 0x10000, - .chreg_off = 0x10000, - .setup_irq = fsl_edma3_irq_init, -}; - static struct fsl_edma_drvdata imx8ulp_data = { .flags = FSL_EDMA_DRV_HAS_CHMUX | FSL_EDMA_DRV_HAS_CHCLK | FSL_EDMA_DRV_HAS_DMACLK | FSL_EDMA_DRV_EDMA3, @@ -397,7 +390,6 @@ static const struct of_device_id fsl_edma_dt_ids[] = { { .compatible = "fsl,ls1028a-edma", .data = &ls1028a_data}, { .compatible = "fsl,imx7ulp-edma", .data = &imx7ulp_data}, { .compatible = "fsl,imx8qm-edma", .data = &imx8qm_data}, - { .compatible = "fsl,imx8qm-adma", .data = &imx8qm_audio_data}, { .compatible = "fsl,imx8ulp-edma", .data = &imx8ulp_data}, { .compatible = "fsl,imx93-edma3", .data = &imx93_data3}, { .compatible = "fsl,imx93-edma4", .data = &imx93_data4},
The eDMA hardware issue only exist imx8QM A0. A0 never mass production. So remove the workaround safely. Signed-off-by: Joy Zou <joy.zou@nxp.com> --- drivers/dma/fsl-edma-common.c | 16 ++++------------ drivers/dma/fsl-edma-main.c | 8 -------- 2 files changed, 4 insertions(+), 20 deletions(-)