| Message ID | 1557512248-8440-5-git-send-email-yibin.gong@nxp.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Headers | show |
| Series | add edma2 for i.mx7ulp | expand |
On 10-05-19, 10:14, Robin Gong wrote: > Add edma2 for i.mx7ulp by version v3, since v2 has already > been used by mcf-edma. > The big changes based on v1 are belows: > 1. only one dmamux. > 2. another clock dma_clk except dmamux clk. > 3. 16 independent interrupts instead of only one interrupt for > all channels. > > Signed-off-by: Robin Gong <yibin.gong@nxp.com> > --- > drivers/dma/fsl-edma-common.c | 18 ++++++++++- > drivers/dma/fsl-edma-common.h | 3 ++ > drivers/dma/fsl-edma.c | 69 ++++++++++++++++++++++++++++++++++++++++++- > 3 files changed, 88 insertions(+), 2 deletions(-) > > diff --git a/drivers/dma/fsl-edma-common.c b/drivers/dma/fsl-edma-common.c > index bb24251..64e822e 100644 > --- a/drivers/dma/fsl-edma-common.c > +++ b/drivers/dma/fsl-edma-common.c > @@ -90,6 +90,19 @@ static void mux_configure8(struct fsl_edma_chan *fsl_chan, void __iomem *addr, > iowrite8(val8, addr + off); > } > > +void mux_configure32(struct fsl_edma_chan *fsl_chan, void __iomem *addr, > + u32 off, u32 slot, bool enable) > +{ > + u32 val; > + > + if (enable) > + val = EDMAMUX_CHCFG_ENBL << 24 | slot; > + else > + val = EDMAMUX_CHCFG_DIS; > + > + iowrite32(val, addr + off * 4); > +} > + > void fsl_edma_chan_mux(struct fsl_edma_chan *fsl_chan, > unsigned int slot, bool enable) > { > @@ -102,7 +115,10 @@ 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); > > - mux_configure8(fsl_chan, muxaddr, ch_off, slot, enable); > + if (fsl_chan->edma->version == v3) > + mux_configure32(fsl_chan, muxaddr, ch_off, slot, enable); > + else > + mux_configure8(fsl_chan, muxaddr, ch_off, slot, enable); > } > EXPORT_SYMBOL_GPL(fsl_edma_chan_mux); > > diff --git a/drivers/dma/fsl-edma-common.h b/drivers/dma/fsl-edma-common.h > index 21a9cfd..2b0cc8e 100644 > --- a/drivers/dma/fsl-edma-common.h > +++ b/drivers/dma/fsl-edma-common.h > @@ -124,6 +124,7 @@ struct fsl_edma_chan { > dma_addr_t dma_dev_addr; > u32 dma_dev_size; > enum dma_data_direction dma_dir; > + char chan_name[16]; > }; > > struct fsl_edma_desc { > @@ -138,6 +139,7 @@ struct fsl_edma_desc { > enum edma_version { > v1, /* 32ch, Vybrid, mpc57x, etc */ > v2, /* 64ch Coldfire */ > + v3, /* 32ch, i.mx7ulp */ > }; > > struct fsl_edma_engine { > @@ -145,6 +147,7 @@ struct fsl_edma_engine { > void __iomem *membase; > void __iomem *muxbase[DMAMUX_NR]; > struct clk *muxclk[DMAMUX_NR]; > + struct clk *dmaclk; > u32 dmamux_nr; > struct mutex fsl_edma_mutex; > u32 n_chans; > diff --git a/drivers/dma/fsl-edma.c b/drivers/dma/fsl-edma.c > index 7b65ef4..1568070 100644 > --- a/drivers/dma/fsl-edma.c > +++ b/drivers/dma/fsl-edma.c > @@ -165,6 +165,51 @@ fsl_edma_irq_init(struct platform_device *pdev, struct fsl_edma_engine *fsl_edma > return 0; > } > > +static int > +fsl_edma2_irq_init(struct platform_device *pdev, > + struct fsl_edma_engine *fsl_edma) > +{ > + struct device_node *np = pdev->dev.of_node; > + int i, ret, irq; > + int count = 0; > + > + count = of_irq_count(np); > + dev_info(&pdev->dev, "%s Found %d interrupts\r\n", __func__, count); > + if (count <= 2) { > + dev_err(&pdev->dev, "Interrupts in DTS not correct.\n"); > + return -EINVAL; > + } > + /* > + * 16 channel independent interrupts + 1 error interrupt on i.mx7ulp. > + * 2 channel share one interrupt, for example, ch0/ch16, ch1/ch17... > + * For now, just simply request irq without IRQF_SHARED flag, since 16 > + * channels are enough on i.mx7ulp whose M4 domain own some peripherals. > + */ > + for (i = 0; i < count; i++) { > + irq = platform_get_irq(pdev, i); > + if (irq < 0) > + return -ENXIO; > + > + sprintf(fsl_edma->chans[i].chan_name, "eDMA2-CH%02d", i); > + > + /* The last IRQ is for eDMA err */ > + if (i == count - 1) > + ret = devm_request_irq(&pdev->dev, irq, > + fsl_edma_err_handler, > + 0, "eDMA2-ERR", fsl_edma); > + else > + > + ret = devm_request_irq(&pdev->dev, irq, > + fsl_edma_tx_handler, 0, > + fsl_edma->chans[i].chan_name, > + fsl_edma); > + if (ret) > + return ret; > + } > + > + return 0; > +} > + > static void fsl_edma_irq_exit( > struct platform_device *pdev, struct fsl_edma_engine *fsl_edma) > { > @@ -218,6 +263,23 @@ static int fsl_edma_probe(struct platform_device *pdev) > fsl_edma_setup_regs(fsl_edma); > regs = &fsl_edma->regs; > > + if (of_device_is_compatible(np, "fsl,imx7ulp-edma")) { > + fsl_edma->dmamux_nr = 1; > + fsl_edma->version = v3; well this is not really scalable, we will keep adding versions and compatible and expanding this check. So it would make sense to create a driver data table which can be set for compatible and we use those values and avoid these runtime checks for compatible. Btw the binding documentation should precede the code usage, so this patch should come after that > + > + fsl_edma->dmaclk = devm_clk_get(&pdev->dev, "dma"); > + if (IS_ERR(fsl_edma->dmaclk)) { > + dev_err(&pdev->dev, "Missing DMA block clock.\n"); > + return PTR_ERR(fsl_edma->dmaclk); > + } > + > + ret = clk_prepare_enable(fsl_edma->dmaclk); > + if (ret) { > + dev_err(&pdev->dev, "DMA clk block failed.\n"); > + return ret; > + } > + } > + > for (i = 0; i < fsl_edma->dmamux_nr; i++) { > char clkname[32]; > > @@ -264,7 +326,11 @@ static int fsl_edma_probe(struct platform_device *pdev) > } > > edma_writel(fsl_edma, ~0, regs->intl); > - ret = fsl_edma_irq_init(pdev, fsl_edma); > + > + if (fsl_edma->version == v3) > + ret = fsl_edma2_irq_init(pdev, fsl_edma); > + else > + ret = fsl_edma_irq_init(pdev, fsl_edma); > if (ret) > return ret; > > @@ -385,6 +451,7 @@ static const struct dev_pm_ops fsl_edma_pm_ops = { > > static const struct of_device_id fsl_edma_dt_ids[] = { > { .compatible = "fsl,vf610-edma", }, > + { .compatible = "fsl,imx7ulp-edma", }, > { /* sentinel */ } > }; > MODULE_DEVICE_TABLE(of, fsl_edma_dt_ids); > -- > 2.7.4 >
On 2019-05-27 at 06:34 +0000, Vinod Koul wrote: > On 10-05-19, 10:14, Robin Gong wrote: > > > > > > + if (of_device_is_compatible(np, "fsl,imx7ulp-edma")) { > > + fsl_edma->dmamux_nr = 1; > > + fsl_edma->version = v3; > well this is not really scalable, we will keep adding versions and > compatible and expanding this check. So it would make sense to create > a > driver data table which can be set for compatible and we use those > values and avoid these runtime checks for compatible. > > Btw the binding documentation should precede the code usage, so this > patch should come after that > Okay, will update in v2.
diff --git a/drivers/dma/fsl-edma-common.c b/drivers/dma/fsl-edma-common.c index bb24251..64e822e 100644 --- a/drivers/dma/fsl-edma-common.c +++ b/drivers/dma/fsl-edma-common.c @@ -90,6 +90,19 @@ static void mux_configure8(struct fsl_edma_chan *fsl_chan, void __iomem *addr, iowrite8(val8, addr + off); } +void mux_configure32(struct fsl_edma_chan *fsl_chan, void __iomem *addr, + u32 off, u32 slot, bool enable) +{ + u32 val; + + if (enable) + val = EDMAMUX_CHCFG_ENBL << 24 | slot; + else + val = EDMAMUX_CHCFG_DIS; + + iowrite32(val, addr + off * 4); +} + void fsl_edma_chan_mux(struct fsl_edma_chan *fsl_chan, unsigned int slot, bool enable) { @@ -102,7 +115,10 @@ 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); - mux_configure8(fsl_chan, muxaddr, ch_off, slot, enable); + if (fsl_chan->edma->version == v3) + mux_configure32(fsl_chan, muxaddr, ch_off, slot, enable); + else + mux_configure8(fsl_chan, muxaddr, ch_off, slot, enable); } EXPORT_SYMBOL_GPL(fsl_edma_chan_mux); diff --git a/drivers/dma/fsl-edma-common.h b/drivers/dma/fsl-edma-common.h index 21a9cfd..2b0cc8e 100644 --- a/drivers/dma/fsl-edma-common.h +++ b/drivers/dma/fsl-edma-common.h @@ -124,6 +124,7 @@ struct fsl_edma_chan { dma_addr_t dma_dev_addr; u32 dma_dev_size; enum dma_data_direction dma_dir; + char chan_name[16]; }; struct fsl_edma_desc { @@ -138,6 +139,7 @@ struct fsl_edma_desc { enum edma_version { v1, /* 32ch, Vybrid, mpc57x, etc */ v2, /* 64ch Coldfire */ + v3, /* 32ch, i.mx7ulp */ }; struct fsl_edma_engine { @@ -145,6 +147,7 @@ struct fsl_edma_engine { void __iomem *membase; void __iomem *muxbase[DMAMUX_NR]; struct clk *muxclk[DMAMUX_NR]; + struct clk *dmaclk; u32 dmamux_nr; struct mutex fsl_edma_mutex; u32 n_chans; diff --git a/drivers/dma/fsl-edma.c b/drivers/dma/fsl-edma.c index 7b65ef4..1568070 100644 --- a/drivers/dma/fsl-edma.c +++ b/drivers/dma/fsl-edma.c @@ -165,6 +165,51 @@ fsl_edma_irq_init(struct platform_device *pdev, struct fsl_edma_engine *fsl_edma return 0; } +static int +fsl_edma2_irq_init(struct platform_device *pdev, + struct fsl_edma_engine *fsl_edma) +{ + struct device_node *np = pdev->dev.of_node; + int i, ret, irq; + int count = 0; + + count = of_irq_count(np); + dev_info(&pdev->dev, "%s Found %d interrupts\r\n", __func__, count); + if (count <= 2) { + dev_err(&pdev->dev, "Interrupts in DTS not correct.\n"); + return -EINVAL; + } + /* + * 16 channel independent interrupts + 1 error interrupt on i.mx7ulp. + * 2 channel share one interrupt, for example, ch0/ch16, ch1/ch17... + * For now, just simply request irq without IRQF_SHARED flag, since 16 + * channels are enough on i.mx7ulp whose M4 domain own some peripherals. + */ + for (i = 0; i < count; i++) { + irq = platform_get_irq(pdev, i); + if (irq < 0) + return -ENXIO; + + sprintf(fsl_edma->chans[i].chan_name, "eDMA2-CH%02d", i); + + /* The last IRQ is for eDMA err */ + if (i == count - 1) + ret = devm_request_irq(&pdev->dev, irq, + fsl_edma_err_handler, + 0, "eDMA2-ERR", fsl_edma); + else + + ret = devm_request_irq(&pdev->dev, irq, + fsl_edma_tx_handler, 0, + fsl_edma->chans[i].chan_name, + fsl_edma); + if (ret) + return ret; + } + + return 0; +} + static void fsl_edma_irq_exit( struct platform_device *pdev, struct fsl_edma_engine *fsl_edma) { @@ -218,6 +263,23 @@ static int fsl_edma_probe(struct platform_device *pdev) fsl_edma_setup_regs(fsl_edma); regs = &fsl_edma->regs; + if (of_device_is_compatible(np, "fsl,imx7ulp-edma")) { + fsl_edma->dmamux_nr = 1; + fsl_edma->version = v3; + + fsl_edma->dmaclk = devm_clk_get(&pdev->dev, "dma"); + if (IS_ERR(fsl_edma->dmaclk)) { + dev_err(&pdev->dev, "Missing DMA block clock.\n"); + return PTR_ERR(fsl_edma->dmaclk); + } + + ret = clk_prepare_enable(fsl_edma->dmaclk); + if (ret) { + dev_err(&pdev->dev, "DMA clk block failed.\n"); + return ret; + } + } + for (i = 0; i < fsl_edma->dmamux_nr; i++) { char clkname[32]; @@ -264,7 +326,11 @@ static int fsl_edma_probe(struct platform_device *pdev) } edma_writel(fsl_edma, ~0, regs->intl); - ret = fsl_edma_irq_init(pdev, fsl_edma); + + if (fsl_edma->version == v3) + ret = fsl_edma2_irq_init(pdev, fsl_edma); + else + ret = fsl_edma_irq_init(pdev, fsl_edma); if (ret) return ret; @@ -385,6 +451,7 @@ static const struct dev_pm_ops fsl_edma_pm_ops = { static const struct of_device_id fsl_edma_dt_ids[] = { { .compatible = "fsl,vf610-edma", }, + { .compatible = "fsl,imx7ulp-edma", }, { /* sentinel */ } }; MODULE_DEVICE_TABLE(of, fsl_edma_dt_ids);
Add edma2 for i.mx7ulp by version v3, since v2 has already been used by mcf-edma. The big changes based on v1 are belows: 1. only one dmamux. 2. another clock dma_clk except dmamux clk. 3. 16 independent interrupts instead of only one interrupt for all channels. Signed-off-by: Robin Gong <yibin.gong@nxp.com> --- drivers/dma/fsl-edma-common.c | 18 ++++++++++- drivers/dma/fsl-edma-common.h | 3 ++ drivers/dma/fsl-edma.c | 69 ++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 88 insertions(+), 2 deletions(-)