From: Robin Gong <yibin.gong@nxp.com>
To: "vkoul@kernel.org" <vkoul@kernel.org>
Cc: dl-linux-imx <linux-imx@nxp.com>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"devicetree@vger.kernel.org" <devicetree@vger.kernel.org>,
"festevam@gmail.com" <festevam@gmail.com>,
"dan.j.williams@intel.com" <dan.j.williams@intel.com>,
"mark.rutland@arm.com" <mark.rutland@arm.com>,
"dmaengine@vger.kernel.org" <dmaengine@vger.kernel.org>,
"robh@kernel.org" <robh@kernel.org>,
"shawnguo@kernel.org" <shawnguo@kernel.org>,
"linux-arm-kernel@lists.infradead.org"
<linux-arm-kernel@lists.infradead.org>,
"kernel@pengutronix.de" <kernel@pengutronix.de>,
"s.hauer@pengutronix.de" <s.hauer@pengutronix.de>
Subject: Re: [PATCH v3 7/8] dmaengine: fsl-edma: add i.mx7ulp edma2 version support
Date: Wed, 5 Jun 2019 02:29:49 +0000 [thread overview]
Message-ID: <1559730811.24019.18.camel@nxp.com> (raw)
In-Reply-To: <20190604123722.GF15118@vkoul-mobl>
On 2019-06-04 at 12:37 +0000, Vinod Koul wrote:
> On 29-05-19, 17:08, yibin.gong@nxp.com wrote:
> >
> > From: Robin Gong <yibin.gong@nxp.com>
> >
> > Add edma2 for i.mx7ulp by version v3, since v2 has already
> Why leading spaces at start of line?
Sorry for the typo, will fix in next version
>
> >
> > 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 | 67
> > +++++++++++++++++++++++++++++++++++++++++++
> > 3 files changed, 87 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/dma/fsl-edma-common.c b/drivers/dma/fsl-edma-
> > common.c
> > index 45d70d3..0d9915c 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 014ab74..07482d2 100644
> > --- a/drivers/dma/fsl-edma-common.h
> > +++ b/drivers/dma/fsl-edma-common.h
> > @@ -125,6 +125,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 {
> > @@ -139,6 +140,7 @@ struct fsl_edma_desc {
> > enum edma_version {
> > v1, /* 32ch, Vybrid, mpc57x, etc */
> > v2, /* 64ch Coldfire */
> > + v3, /* 32ch, i.mx7ulp */
> > };
> >
> > struct fsl_edma_drvdata {
> > @@ -154,6 +156,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;
> > const struct fsl_edma_drvdata *drvdata;
> > diff --git a/drivers/dma/fsl-edma.c b/drivers/dma/fsl-edma.c
> > index cf18301..45b26d6 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;
> Superflous initialization of count!
Would fix it in v4.
>
> >
> > +
> > + count = of_irq_count(np);
> > + dev_info(&pdev->dev, "%s Found %d interrupts\r\n",
> > __func__, count);
> Consider using debug level..
Would downgrade print level in v4.
>
> >
> > + 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_handl
> > er,
> > + 0, "eDMA2-ERR",
> > fsl_edma);
> > + else
> > +
> empty line is waste here
>
> >
> > + ret = devm_request_irq(&pdev->dev, irq,
> > + fsl_edma_tx_handle
> > r, 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)
> > {
> > @@ -191,8 +236,16 @@ static struct fsl_edma_drvdata vf610_data = {
> > .setup_irq = fsl_edma_irq_init,
> > };
> >
> > +static struct fsl_edma_drvdata imx7ulp_data = {
> > + .version = v3,
> > + .dmamuxs = 1,
> > + .has_dmaclk = true,
> > + .setup_irq = fsl_edma2_irq_init,
> > +};
> > +
> > static const struct of_device_id fsl_edma_dt_ids[] = {
> > { .compatible = "fsl,vf610-edma", .data = &vf610_data},
> > + { .compatible = "fsl,imx7ulp-edma", .data =
> > &imx7ulp_data},
> > { /* sentinel */ }
> > };
> > MODULE_DEVICE_TABLE(of, fsl_edma_dt_ids);
> > @@ -242,6 +295,20 @@ static int fsl_edma_probe(struct
> > platform_device *pdev)
> > fsl_edma_setup_regs(fsl_edma);
> > regs = &fsl_edma->regs;
> >
> > + if (drvdata->has_dmaclk) {
> > + 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];
> >
> > --
> > 2.7.4
next prev parent reply other threads:[~2019-06-05 2:29 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-29 9:08 [PATCH v3 0/8] add edma2 for i.mx7ulp yibin.gong
2019-05-29 9:08 ` [PATCH v3 1/8] dmaengine: fsl-edma: add dmamux_nr for next version yibin.gong
2019-05-29 9:08 ` [PATCH v3 2/8] dmaengine: mcf-edma: update to 'dmamux_nr' yibin.gong
2019-05-29 9:08 ` [PATCH v3 3/8] dmaengine: fsl-edma-common: move dmamux register to another single function yibin.gong
2019-05-29 9:08 ` [PATCH v3 4/8] dmaengine: fsl-edma-common: version check for v2 instead yibin.gong
2019-05-29 9:08 ` [PATCH v3 5/8] dmaengine: fsl-edma: add drvdata for vf610 yibin.gong
2019-06-04 12:33 ` Vinod Koul
2019-06-05 2:25 ` Robin Gong
2019-05-29 9:08 ` [PATCH v3 6/8] dt-bindings: dma: fsl-edma: add new i.mx7ulp-edma yibin.gong
2019-05-29 9:08 ` [PATCH v3 7/8] dmaengine: fsl-edma: add i.mx7ulp edma2 version support yibin.gong
2019-06-04 12:37 ` Vinod Koul
2019-06-05 2:29 ` Robin Gong [this message]
2019-05-29 9:08 ` [PATCH v3 8/8] ARM: dts: imx7ulp: add edma device node yibin.gong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1559730811.24019.18.camel@nxp.com \
--to=yibin.gong@nxp.com \
--cc=dan.j.williams@intel.com \
--cc=devicetree@vger.kernel.org \
--cc=dmaengine@vger.kernel.org \
--cc=festevam@gmail.com \
--cc=kernel@pengutronix.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-imx@nxp.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=robh@kernel.org \
--cc=s.hauer@pengutronix.de \
--cc=shawnguo@kernel.org \
--cc=vkoul@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).