From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795031009; b=w098hbDPA43LxSv9OdEnDPz7+xykjhfCDaL5jWoRNM9WME0+aZQMp2XP0YDW5Lsf8bUy fyZ1Mg6YJLrxEF7IzJDwXdE03Uf690xyO0CWEHW1PkHwXckCT+TtWWZl4wJECHoNCP8bk LTEvZyB38mNbsnLoV+z1i3Xp9lVIuYk/OTsp++E2rQnZW1gN8AUKrozTeWtRoa+HJe70r p46aRJE/PXSHb9p5trT0mZV1iRCnsZByL58KT7kU/EGsZwdhmKMP9rjQ4xM/yxHJAituY ybPNllq7VSq842PyINwi8F2FaaFRDdZEQsaD4bRPjaKh7YlR3msmgs4URMyeTydlEvA== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795031009; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=PQtwcghfPZ8OK8FkQKV6SHpmz1qc1lYZCrufwaFLfZo=; b=M0s4lw9ls3sGIyjGuP0hVhx1y+1EefHMjfg2t38+DlLigMW+2Az1KPUe8Om54o4XrHrW 4gOrl87rAMPwDjG5oJwHgI78P7uPlXRBJOHmjvmJAxaLim9SfVtmeOUkrzw4p3kgXBB60 a+Fn+FrS725WEhE03Ys/9zkWE+B4fbfhlTMVQu3+jMAvQlIy8p/H2k/S0AShtJNj9wJKK 5/HGN3Z2YIu4z1buM7mQ51wsKoYqSTgXccVlq/fLSy+on1IhYhli3cuH8cBAQNSGCthWU ZJr4dLdsqRfa7zhSpdr4UMGNUH7O7muDOq9RULhduDzqEpOJdMcou/OPo1RrcXHUthw== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=q1sKBA6I; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 224F5606A331; Wed, 18 Nov 2026 19:43:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=q1sKBA6I Received: by smtp.kernel.org (Postfix) with ESMTPSA id 73D251F000C4; Wed, 18 Nov 2026 19:43:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795031009; bh=PQtwcghfPZ8OK8FkQKV6SHpmz1qc1lYZCrufwaFLfZo=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=q1sKBA6IpoTvmluR1rm9p+G/U4PQ72IfT3GqsBakeEMzaDP4x2yA52HtgnNdl0+R9 d2o3oTvT+TKzTVTNUdSPNp7aPZcSZXZC2BpjVJg5QH6BS0fZ1d/eG+KKS6glZoX/VB mGJruW8SmjuWyPDQAiI2hPpgGzDszvhf+hWgAFJM= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, sashiko-bot@kernel.org, Frank Li , Linus Walleij , Vinod Koul , Sasha Levin Subject: [PATCH 6.12 0879/1756] dmaengine: ste_dma40: Fix failed start cleanup Date: Wed, 18 Nov 2026 15:50:06 +0100 Message-ID: <20261118150044.481041616@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150007.957976754@linuxfoundation.org> References: <20261118150007.957976754@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Linus Walleij [ Upstream commit 8175ead5727173d4b96d1e830e696765d75ade71 ] 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 Link: https://lore.kernel.org/dmaengine/20260618051539.15E201F000E9@smtp.kernel.org/ Signed-off-by: Linus Walleij Link: https://patch.msgid.link/20260927-dma40-fixes-v7-4-89f595e8851d@kernel.org Signed-off-by: Vinod Koul Signed-off-by: Sasha Levin --- 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 28b34a279cef3..2f636c7333d24 100644 --- a/drivers/dma/ste_dma40.c +++ b/drivers/dma/ste_dma40.c @@ -1533,8 +1533,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; @@ -1578,15 +1585,15 @@ 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_mark_last_busy(d40c->base->dev); pm_runtime_put_autosuspend(d40c->base->dev); } - - d40_desc_remove(d40d); - d40_desc_done(d40c, d40d); } d40c->pending_tx++; @@ -1600,20 +1607,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); /* @@ -1629,7 +1638,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.53.0