From: Frank Li <Frank.li@oss.nxp.com>
To: Linus Walleij <linusw@kernel.org>
Cc: Vinod Koul <vkoul@kernel.org>, Frank Li <Frank.Li@kernel.org>,
dmaengine@vger.kernel.org, phone-devel@vger.kernel.org,
sashiko-bot@kernel.org
Subject: Re: [PATCH v5 04/23] dmaengine: ste_dma40: Fix failed start cleanup
Date: Mon, 21 Sep 2026 17:10:23 -0500 [thread overview]
Message-ID: <arGrT2T_Fs6tazPd@SMW015318> (raw)
In-Reply-To: <20260920-dma40-fixes-v5-4-5c55cd7f92f9@kernel.org>
On Sun, Sep 20, 2026 at 08:59:39PM +0200, Linus Walleij wrote:
> If d40_start() fails after a queued descriptor has been moved to the
> active list, d40_queue_start() currently returns NULL without unwinding
> the transfer state or clearing the channel busy flag.
>
> Fix this pre-existing error path by completing the descriptor through the
> normal tasklet path, clearing the busy flag, balancing the runtime PM
> reference and returning an error pointer to distinguish the failure from
> the no-work case. Do not free the descriptor directly, since it has
> already been submitted and has a DMA cookie.
>
> When starting the next queued transfer from the completion handler, put
> the completed descriptor on the done list first. This preserves FIFO
> completion order if the new transfer fails to start and prevents the
> completed cookie from moving backwards.
>
> Use done-list membership rather than the cyclic flag to identify terminal
> descriptors in the tasklet. A cyclic descriptor that failed to start is
> then completed and removed instead of remaining permanently at the head
> of the done list.
>
> Fixes: 7d83a854a1a4 ("dma40: remove "hardware link with previous jobs" code")
> Reported-by: sashiko-bot@kernel.org
> Closes: https://lore.kernel.org/dmaengine/20260618051539.15E201F000E9@smtp.kernel.org/
> Assisted-by: LLM
> Signed-off-by: Linus Walleij <linusw@kernel.org>
> ---
Reviewed-by: Frank Li <Frank.Li@nxp.com>
> drivers/dma/ste_dma40.c | 25 +++++++++++++++++--------
> 1 file changed, 17 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/dma/ste_dma40.c b/drivers/dma/ste_dma40.c
> index 1f9e8c7249b1..280a0d2f16c5 100644
> --- a/drivers/dma/ste_dma40.c
> +++ b/drivers/dma/ste_dma40.c
> @@ -1650,8 +1650,15 @@ static struct d40_desc *d40_queue_start(struct d40_chan *d40c)
> /* Start dma job */
> err = d40_start(d40c);
>
> - if (err)
> - return NULL;
> + if (err) {
> + d40_desc_remove(d40d);
> + d40_desc_done(d40c, d40d);
> + d40c->pending_tx++;
> + d40c->busy = false;
> + pm_runtime_put_autosuspend(d40c->base->dev);
> + tasklet_schedule(&d40c->tasklet);
> + return ERR_PTR(err);
> + }
> }
>
> return d40d;
> @@ -1698,14 +1705,14 @@ static void dma_tc_handle(struct d40_chan *d40c)
> return;
> }
>
> + d40_desc_remove(d40d);
> + d40_desc_done(d40c, d40d);
> +
> if (d40_queue_start(d40c) == NULL) {
> d40c->busy = false;
>
> pm_runtime_put_autosuspend(d40c->base->dev);
> }
> -
> - d40_desc_remove(d40d);
> - d40_desc_done(d40c, d40d);
> }
>
> d40c->pending_tx += callbacks;
> @@ -1719,20 +1726,22 @@ static void dma_tasklet(struct tasklet_struct *t)
> struct d40_desc *d40d;
> unsigned long flags;
> bool callback_active;
> + bool from_done;
> struct dmaengine_desc_callback cb;
>
> spin_lock_irqsave(&d40c->lock, flags);
>
> /* Get first entry from the done list */
> d40d = d40_first_done(d40c);
> - if (d40d == NULL) {
> + from_done = !!d40d;
> + if (!from_done) {
> /* Check if we have reached here for cyclic job */
> d40d = d40_first_active_get(d40c);
> if (d40d == NULL || !d40d->cyclic)
> goto check_pending_tx;
> }
>
> - if (!d40d->cyclic)
> + if (from_done)
> dma_cookie_complete(&d40d->txd);
>
> /*
> @@ -1748,7 +1757,7 @@ static void dma_tasklet(struct tasklet_struct *t)
> callback_active = !!(d40d->txd.flags & DMA_PREP_INTERRUPT);
> dmaengine_desc_get_callback(&d40d->txd, &cb);
>
> - if (!d40d->cyclic) {
> + if (from_done) {
> if (async_tx_test_ack(&d40d->txd)) {
> d40_desc_remove(d40d);
> d40_desc_free(d40c, d40d);
>
> --
> 2.55.0
>
next prev parent reply other threads:[~2026-09-21 22:10 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-20 18:59 [PATCH v5 00/23] dmaengine: ste_dma40: Fix numerous accumulated bugs Linus Walleij
2026-09-20 18:59 ` [PATCH v5 01/23] dmaengine: ste_dma40: Fix physical cyclic capability Linus Walleij
2026-09-21 16:39 ` Frank Li
2026-09-20 18:59 ` [PATCH v5 02/23] dmaengine: ste_dma40: Fix cyclic transfer residue Linus Walleij
2026-09-21 16:57 ` Frank Li
2026-09-20 18:59 ` [PATCH v5 03/23] dmaengine: ste_dma40: Recover coalesced cyclic callbacks Linus Walleij
2026-09-21 21:51 ` Frank Li
2026-09-22 21:13 ` Linus Walleij
2026-09-20 18:59 ` [PATCH v5 04/23] dmaengine: ste_dma40: Fix failed start cleanup Linus Walleij
2026-09-21 22:10 ` Frank Li [this message]
2026-09-20 18:59 ` [PATCH v5 05/23] dmaengine: ste_dma40: Fix probe runtime PM disable Linus Walleij
2026-09-21 22:16 ` Frank Li
2026-09-20 18:59 ` [PATCH v5 06/23] dmaengine: ste_dma40: Check runtime PM in IRQ Linus Walleij
2026-09-21 22:19 ` Frank Li
2026-09-20 18:59 ` [PATCH v5 07/23] dmaengine: ste_dma40: Handle runtime PM resume errors Linus Walleij
2026-09-22 19:23 ` Frank Li
2026-09-20 18:59 ` [PATCH v5 08/23] dmaengine: ste_dma40: Return IRQ_NONE without interrupt status Linus Walleij
2026-09-20 19:10 ` sashiko-bot
2026-09-20 21:26 ` Linus Walleij
2026-09-22 19:37 ` Frank Li
2026-09-22 23:17 ` Linus Walleij
2026-09-20 18:59 ` [PATCH v5 09/23] dmaengine: ste_dma40: Init hardware before registration Linus Walleij
2026-09-20 18:59 ` [PATCH v5 10/23] dmaengine: ste_dma40: Fix probe IRQ leak Linus Walleij
2026-09-20 18:59 ` [PATCH v5 11/23] dmaengine: ste_dma40: Fix DMA registration unwind Linus Walleij
2026-09-20 18:59 ` [PATCH v5 12/23] dmaengine: ste_dma40: Fix LCLA allocation order Linus Walleij
2026-09-20 18:59 ` [PATCH v5 13/23] dmaengine: ste_dma40: Fix probe LCLA free Linus Walleij
2026-09-20 18:59 ` [PATCH v5 14/23] dmaengine: ste_dma40: Put the LCPA SRAM node Linus Walleij
2026-09-20 18:59 ` [PATCH v5 15/23] dmaengine: ste_dma40: Fix memcpy channel parsing Linus Walleij
2026-09-20 18:59 ` [PATCH v5 16/23] dmaengine: ste_dma40: Validate disabled channel indexes Linus Walleij
2026-09-20 18:59 ` [PATCH v5 17/23] dmaengine: ste_dma40: Validate DMA specifier length Linus Walleij
2026-09-20 18:59 ` [PATCH v5 18/23] dmaengine: ste_dma40: Reject direction changes after allocation Linus Walleij
2026-09-20 18:59 ` [PATCH v5 19/23] dmaengine: ste_dma40: Fix logical channel bounds check Linus Walleij
2026-09-20 18:59 ` [PATCH v5 20/23] dmaengine: ste_dma40: Fix event group bounds Linus Walleij
2026-09-20 18:59 ` [PATCH v5 21/23] dmaengine: ste_dma40: Search all blocks for fixed logical channels Linus Walleij
2026-09-20 18:59 ` [PATCH v5 22/23] dmaengine: ste_dma40: Validate fixed physical channel indexes Linus Walleij
2026-09-20 18:59 ` [PATCH v5 23/23] dmaengine: ste_dma40: Validate memcpy configuration Linus Walleij
-- strict thread matches above, loose matches on Subject: below --
2026-09-22 23:30 [PATCH v5 00/23] dmaengine: ste_dma40: Fix numerous accumulated bugs Linus Walleij
2026-09-22 23:30 ` [PATCH v5 04/23] dmaengine: ste_dma40: Fix failed start cleanup Linus Walleij
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=arGrT2T_Fs6tazPd@SMW015318 \
--to=frank.li@oss.nxp.com \
--cc=Frank.Li@kernel.org \
--cc=dmaengine@vger.kernel.org \
--cc=linusw@kernel.org \
--cc=phone-devel@vger.kernel.org \
--cc=sashiko-bot@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