From: Lucas Stach <l.stach@pengutronix.de>
To: Robin Gong <yibin.gong@nxp.com>,
vkoul@kernel.org, mark.rutland@arm.com, broonie@kernel.org,
robh+dt@kernel.org, catalin.marinas@arm.com, will.deacon@arm.com,
shawnguo@kernel.org, festevam@gmail.com, s.hauer@pengutronix.de,
martin.fuzzey@flowbird.group, u.kleine-koenig@pengutronix.de,
dan.j.williams@intel.com, matthias.schiffer@ew.tq-group.com,
frieder.schrempf@kontron.de, m.felsch@pengutronix.de,
xiaoning.wang@nxp.com
Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-spi@vger.kernel.org, linux-imx@nxp.com,
kernel@pengutronix.de, dmaengine@vger.kernel.org,
linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH v15 05/12] dmaengine: dma: imx-sdma: add fw_loaded and is_ram_script
Date: Tue, 13 Jul 2021 12:34:13 +0200 [thread overview]
Message-ID: <b3e94d1dfe77ec53686ed0be04a17b33c3fc37fa.camel@pengutronix.de> (raw)
In-Reply-To: <1626201709-19643-6-git-send-email-yibin.gong@nxp.com>
Am Mittwoch, dem 14.07.2021 um 02:41 +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>
> Reviewed-by: Lucas Stach <l.stach@pengutronix.de>
> 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 665ccbf..639a783 100644
> --- a/drivers/dma/imx-sdma.c
> +++ b/drivers/dma/imx-sdma.c
> @@ -435,6 +435,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)
> @@ -498,6 +499,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,
> @@ -953,6 +955,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:
> @@ -967,6 +970,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;
> @@ -1363,6 +1367,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;
> @@ -1613,6 +1622,8 @@ static int sdma_config_write(struct dma_chan *chan,
> {
> struct sdma_channel *sdmac = to_sdma_chan(chan);
>
> + sdmac->is_ram_script = false;
> +
Again, I think this initialization should move into sdma_get_pc() to
move it into close proximity of the code where it gets overwritten to
true. This would make this flow of events much easier to see when
reading the driver code.
Regards,
Lucas
> if (direction == DMA_DEV_TO_MEM) {
> sdmac->per_address = dmaengine_cfg->src_addr;
> sdmac->watermark_level = dmaengine_cfg->src_maxburst *
> @@ -1792,6 +1803,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-13 10:34 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-13 18:41 [PATCH v15 00/12] add ecspi ERR009165 for i.mx6/7 soc family Robin Gong
2021-07-13 18:41 ` [PATCH v15 01/12] Revert "ARM: dts: imx6q: Use correct SDMA script for SPI5 core" Robin Gong
2021-07-13 18:41 ` [PATCH v15 02/12] Revert "ARM: dts: imx6: Use correct SDMA script for SPI cores" Robin Gong
2021-07-13 18:41 ` [PATCH v15 03/12] Revert "dmaengine: imx-sdma: refine to load context only once" Robin Gong
2021-07-13 18:41 ` [PATCH v15 04/12] dmaengine: imx-sdma: remove duplicated sdma_load_context Robin Gong
2021-07-13 18:41 ` [PATCH v15 05/12] dmaengine: dma: imx-sdma: add fw_loaded and is_ram_script Robin Gong
2021-07-13 10:34 ` Lucas Stach [this message]
2021-07-13 18:41 ` [PATCH v15 06/12] dmaengine: imx-sdma: add mcu_2_ecspi script Robin Gong
2021-07-13 18:41 ` [PATCH v15 07/12] spi: imx: fix ERR009165 Robin Gong
2021-07-13 18:41 ` [PATCH v15 08/12] spi: imx: remove ERR009165 workaround on i.mx6ul Robin Gong
2021-07-13 10:34 ` Lucas Stach
2021-07-13 18:41 ` [PATCH v15 09/12] dmaengine: imx-sdma: remove ERR009165 " Robin Gong
2021-07-13 10:36 ` Lucas Stach
2021-07-13 18:41 ` [PATCH v15 10/12] dma: imx-sdma: add i.mx6ul compatible name Robin Gong
2021-07-13 18:41 ` [PATCH v15 11/12] dmaengine: imx-sdma: add uart rom script Robin Gong
2022-04-01 16:51 ` Russell King (Oracle)
2021-07-13 18:41 ` [PATCH v15 12/12] dmaengine: imx-sdma: add terminated list for freed descriptor in worker 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=b3e94d1dfe77ec53686ed0be04a17b33c3fc37fa.camel@pengutronix.de \
--to=l.stach@pengutronix.de \
--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=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 \
--cc=yibin.gong@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).