From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8B4D941A55D; Thu, 24 Sep 2026 08:35:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790238925; cv=none; b=SnFjR98ihcgKQBtuOJC+UW7oXX3tI076NPcP5QgkDGUVQ+pSMz4wcwehA0jrPggo/4MnmsBBJL8UqjUCcRZNgK/SHaeZu/iF6o9LhM/bPRLGJ+JUvsI/1u83YW6rSz1XRZBPdj2ISxNQ0XW6UELM5TxGvo70Jo95K/8UnHM6WqE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790238925; c=relaxed/simple; bh=7M9BI0OxHoBwxfvZwlu408Ad2xT/oXOmebU9jpMPxUA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=flmCoJRBHlipbICbOLdbKhfoBhIsvHvtCZxZd2MXW5CNybUDb+jkwNKDk2rJ/wr/3UZ3bcHBTksM5xctcnP8lGQ2BjseFd/qGc2gF39d6uCI8lXk13080tqqpvM0UwBJhxh0Kg5H+JHsqIJR3GUerFuM8uGxg+7sdriGb08ZisI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=FCnAmFyl; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="FCnAmFyl" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D721D1F00893; Thu, 24 Sep 2026 08:35:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1790238924; bh=FhUzkmZHJthTSJS9zdyjHnbhP7ynpom3y296vpXKR2M=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=FCnAmFylQVIZpOyt6FxIA4c4uLXRNmTOwO5za7OdU9l9QM4vRUs7MQhtGH14OKba7 Su7DjCZqkMT3SXpVvTYTiGBL8QnRoGstZ5CD8sm1ToxxD9iz9A5FsbPwK8yuRFKxJ0 1nUxkRxpVAkmFldXseS47oTyW3QaQ3cgvy3L87OqJz9T3xhrVyPEuuUBDrMCwpxU7o 9e/I/ifK9MrOlGLeHf22kLWng8SrnY7za6brHtRpFZIQv5vr9qFsLT+K04FQo58OpX EGDqQWIMVi7ozW00zRNODPAeK7X+ucp8Vh8y2uW2VAc0H1KWahBnOFaAH8dGPSrBcv BackuipbkTMXA== From: Linus Walleij Date: Thu, 24 Sep 2026 10:35:16 +0200 Subject: [PATCH v6 04/23] dmaengine: ste_dma40: Fix failed start cleanup Precedence: bulk X-Mailing-List: phone-devel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260924-dma40-fixes-v6-4-fdb6755020a2@kernel.org> References: <20260924-dma40-fixes-v6-0-fdb6755020a2@kernel.org> In-Reply-To: <20260924-dma40-fixes-v6-0-fdb6755020a2@kernel.org> To: Vinod Koul , Frank Li Cc: dmaengine@vger.kernel.org, phone-devel@vger.kernel.org, Linus Walleij , sashiko-bot@kernel.org, Frank Li X-Mailer: b4 0.14.3 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/ Reviewed-by: Frank Li Assisted-by: LLM Signed-off-by: Linus Walleij --- 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 7384a50cb895..621ae9ffcd57 100644 --- a/drivers/dma/ste_dma40.c +++ b/drivers/dma/ste_dma40.c @@ -1662,8 +1662,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; @@ -1710,14 +1717,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; @@ -1731,20 +1738,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); /* @@ -1760,7 +1769,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