From: Robin Gong <yibin.gong@nxp.com>
To: Lucas Stach <l.stach@pengutronix.de>,
"vkoul@kernel.org" <vkoul@kernel.org>,
"mark.rutland@arm.com" <mark.rutland@arm.com>,
"broonie@kernel.org" <broonie@kernel.org>,
"robh+dt@kernel.org" <robh+dt@kernel.org>,
"catalin.marinas@arm.com" <catalin.marinas@arm.com>,
"will.deacon@arm.com" <will.deacon@arm.com>,
"shawnguo@kernel.org" <shawnguo@kernel.org>,
"festevam@gmail.com" <festevam@gmail.com>,
"s.hauer@pengutronix.de" <s.hauer@pengutronix.de>,
"martin.fuzzey@flowbird.group" <martin.fuzzey@flowbird.group>,
"u.kleine-koenig@pengutronix.de" <u.kleine-koenig@pengutronix.de>,
"dan.j.williams@intel.com" <dan.j.williams@intel.com>,
"matthias.schiffer@ew.tq-group.com"
<matthias.schiffer@ew.tq-group.com>,
"frieder.schrempf@kontron.de" <frieder.schrempf@kontron.de>,
"m.felsch@pengutronix.de" <m.felsch@pengutronix.de>,
Clark Wang <xiaoning.wang@nxp.com>
Cc: "devicetree@vger.kernel.org" <devicetree@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"linux-spi@vger.kernel.org" <linux-spi@vger.kernel.org>,
dl-linux-imx <linux-imx@nxp.com>,
"kernel@pengutronix.de" <kernel@pengutronix.de>,
"dmaengine@vger.kernel.org" <dmaengine@vger.kernel.org>,
"linux-arm-kernel@lists.infradead.org"
<linux-arm-kernel@lists.infradead.org>
Subject: RE: [PATCH v14 05/12] dmaengine: dma: imx-sdma: add fw_loaded and is_ram_script
Date: Mon, 12 Jul 2021 03:20:21 +0000 [thread overview]
Message-ID: <VE1PR04MB668833FAAEEA2F5D0C076A6C89159@VE1PR04MB6688.eurprd04.prod.outlook.com> (raw)
In-Reply-To: <17cadf46f4a0f9771fdde1c9aba9ffecb20efc9f.camel@pengutronix.de>
On 09/07/21 17:25 Lucas Stach <l.stach@pengutronix.de> wrote:
> Am Mittwoch, dem 07.04.2021 um 23:30 +0800 schrieb Robin Gong:
> > Add 'fw_loaded' and 'is_ram_script' to check if the script used by
> > channel is ram script and it's loaded or not, so that could prevent
> > meaningless following malloc dma descriptor and bd allocate in
> > sdma_transfer_init(), otherwise memory may be consumed out potentially
> > without free in case that spi fallback into pio while dma transfer
> > failed by sdma firmware not ready(next ERR009165 patch depends on sdma
> RAM scripts/firmware).
> >
> > Signed-off-by: Robin Gong <yibin.gong@nxp.com>
> > Acked-by: Vinod Koul <vkoul@kernel.org>
> > ---
> > drivers/dma/imx-sdma.c | 13 +++++++++++++
> > 1 file changed, 13 insertions(+)
> >
> > diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c index
> > 1c636d2..78dcfe2 100644
> > --- a/drivers/dma/imx-sdma.c
> > +++ b/drivers/dma/imx-sdma.c
> > @@ -381,6 +381,7 @@ struct sdma_channel {
> > enum dma_status status;
> > struct imx_dma_data data;
> > struct work_struct terminate_worker;
> > + bool is_ram_script;
> > };
> >
> > #define IMX_DMA_SG_LOOP BIT(0)
> > @@ -444,6 +445,7 @@ struct sdma_engine {
> > struct sdma_buffer_descriptor *bd0;
> > /* clock ratio for AHB:SDMA core. 1:1 is 1, 2:1 is 0*/
> > bool clk_ratio;
> > + bool fw_loaded;
> > };
> >
> > static int sdma_config_write(struct dma_chan *chan, @@ -899,6 +901,7
> > @@ static void sdma_get_pc(struct sdma_channel *sdmac,
> > case IMX_DMATYPE_SSI_DUAL:
> > per_2_emi = sdma->script_addrs->ssish_2_mcu_addr;
> > emi_2_per = sdma->script_addrs->mcu_2_ssish_addr;
> > + sdmac->is_ram_script = true;
> > break;
> > case IMX_DMATYPE_SSI_SP:
> > case IMX_DMATYPE_MMC:
> > @@ -913,6 +916,7 @@ static void sdma_get_pc(struct sdma_channel
> *sdmac,
> > per_2_emi = sdma->script_addrs->asrc_2_mcu_addr;
> > emi_2_per = sdma->script_addrs->asrc_2_mcu_addr;
> > per_2_per = sdma->script_addrs->per_2_per_addr;
> > + sdmac->is_ram_script = true;
> > break;
> > case IMX_DMATYPE_ASRC_SP:
> > per_2_emi = sdma->script_addrs->shp_2_mcu_addr;
> > @@ -1309,6 +1313,11 @@ static struct sdma_desc
> > *sdma_transfer_init(struct sdma_channel *sdmac, {
> > struct sdma_desc *desc;
> >
> > + if (!sdmac->sdma->fw_loaded && sdmac->is_ram_script) {
> > + dev_warn_once(sdmac->sdma->dev, "sdma firmware not ready!\n");
> > + goto err_out;
> > + }
> > +
> > desc = kzalloc((sizeof(*desc)), GFP_NOWAIT);
> > if (!desc)
> > goto err_out;
> > @@ -1559,6 +1568,8 @@ static int sdma_config_write(struct dma_chan
> > *chan, {
> > struct sdma_channel *sdmac = to_sdma_chan(chan);
> >
> > + sdmac->is_ram_script = false;
> > +
> While it's working correctly, I find it confusing to have this initialization at this
> point in the code. Please fold this into sdma_get_pc(), where it gets changed as
> needed.
Here 'is_ram_script = false' just clear is_ram_script so that the later sdma_get_pc()
could set is_ram_script correctly if it's a ram script. Yes, move it to early part of sdma_get_pc
also works.
>
> Other than this small issue, this patch is:
> Reviewed-by: Lucas Stach <l.stach@pengutronix.de>
>
> > if (direction == DMA_DEV_TO_MEM) {
> > sdmac->per_address = dmaengine_cfg->src_addr;
> > sdmac->watermark_level = dmaengine_cfg->src_maxburst * @@
> -1738,6
> > +1749,8 @@ static void sdma_load_firmware(const struct firmware *fw,
> > void *context)
> >
> > sdma_add_scripts(sdma, addr);
> >
> > + sdma->fw_loaded = true;
> > +
> > dev_info(sdma->dev, "loaded firmware %d.%d\n",
> > header->version_major,
> > header->version_minor);
>
next prev parent reply other threads:[~2021-07-12 3:20 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-07 15:30 [PATCH v14 00/12] add ecspi ERR009165 for i.mx6/7 soc family Robin Gong
2021-04-07 15:30 ` [PATCH v14 01/12] Revert "ARM: dts: imx6q: Use correct SDMA script for SPI5 core" Robin Gong
2021-04-07 15:30 ` [PATCH v14 02/12] Revert "ARM: dts: imx6: Use correct SDMA script for SPI cores" Robin Gong
2021-04-07 15:30 ` [PATCH v14 03/12] Revert "dmaengine: imx-sdma: refine to load context only once" Robin Gong
2021-04-07 15:30 ` [PATCH v14 04/12] dmaengine: imx-sdma: remove duplicated sdma_load_context Robin Gong
2021-04-07 15:30 ` [PATCH v14 05/12] dmaengine: dma: imx-sdma: add fw_loaded and is_ram_script Robin Gong
2021-07-09 9:24 ` Lucas Stach
2021-07-12 3:20 ` Robin Gong [this message]
2021-04-07 15:30 ` [PATCH v14 06/12] dmaengine: imx-sdma: add mcu_2_ecspi script Robin Gong
2021-07-09 9:32 ` Lucas Stach
2021-04-07 15:30 ` [PATCH v14 07/12] spi: imx: fix ERR009165 Robin Gong
2021-07-09 9:35 ` Lucas Stach
2021-04-07 15:30 ` [PATCH v14 08/12] spi: imx: remove ERR009165 workaround on i.mx6ul Robin Gong
2021-07-09 9:41 ` Lucas Stach
2021-07-12 3:48 ` Robin Gong
2021-07-12 9:30 ` Lucas Stach
2021-07-13 9:12 ` Robin Gong
2021-07-13 9:30 ` Lucas Stach
2021-04-07 15:30 ` [PATCH v14 09/12] dmaengine: imx-sdma: remove ERR009165 " Robin Gong
2021-07-09 9:44 ` Lucas Stach
2021-07-12 4:03 ` Robin Gong
2021-07-12 9:33 ` Lucas Stach
2021-07-13 9:14 ` Robin Gong
2021-04-07 15:30 ` [PATCH v14 10/12] dma: imx-sdma: add i.mx6ul compatible name Robin Gong
2021-04-07 15:30 ` [PATCH v14 11/12] dmaengine: imx-sdma: add uart rom script Robin Gong
2021-07-09 9:55 ` Lucas Stach
2021-04-07 15:30 ` [PATCH v14 12/12] dmaengine: imx-sdma: add terminated list for freed descriptor in worker Robin Gong
2021-04-12 9:39 ` Vinod Koul
2021-04-13 5:05 ` Robin Gong
2021-06-15 6:06 ` Vinod Koul
2021-07-09 9:55 ` Lucas Stach
2021-06-11 13:51 ` [PATCH v14 00/12] add ecspi ERR009165 for i.mx6/7 soc family Fabio Estevam
2021-06-15 1:55 ` Robin Gong
2021-06-15 6:07 ` Vinod Koul
2021-06-15 6:36 ` Robin Gong
2021-06-15 12:07 ` Vinod Koul
2021-06-15 14:10 ` Robin Gong
2021-06-16 10:16 ` Vinod Koul
2021-06-16 10:44 ` Robin Gong
2021-06-15 2:12 ` Fabio Estevam
2021-06-15 2:17 ` Robin 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=VE1PR04MB668833FAAEEA2F5D0C076A6C89159@VE1PR04MB6688.eurprd04.prod.outlook.com \
--to=yibin.gong@nxp.com \
--cc=broonie@kernel.org \
--cc=catalin.marinas@arm.com \
--cc=dan.j.williams@intel.com \
--cc=devicetree@vger.kernel.org \
--cc=dmaengine@vger.kernel.org \
--cc=festevam@gmail.com \
--cc=frieder.schrempf@kontron.de \
--cc=kernel@pengutronix.de \
--cc=l.stach@pengutronix.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-imx@nxp.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-spi@vger.kernel.org \
--cc=m.felsch@pengutronix.de \
--cc=mark.rutland@arm.com \
--cc=martin.fuzzey@flowbird.group \
--cc=matthias.schiffer@ew.tq-group.com \
--cc=robh+dt@kernel.org \
--cc=s.hauer@pengutronix.de \
--cc=shawnguo@kernel.org \
--cc=u.kleine-koenig@pengutronix.de \
--cc=vkoul@kernel.org \
--cc=will.deacon@arm.com \
--cc=xiaoning.wang@nxp.com \
/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).