From: Linus Walleij <linusw@kernel.org>
To: Vinod Koul <vkoul@kernel.org>, Frank Li <Frank.Li@kernel.org>
Cc: dmaengine@vger.kernel.org, phone-devel@vger.kernel.org,
Linus Walleij <linusw@kernel.org>,
sashiko-bot@kernel.org
Subject: [PATCH v4 18/23] dmaengine: ste_dma40: Reject direction changes after allocation
Date: Sun, 20 Sep 2026 00:22:29 +0200 [thread overview]
Message-ID: <20260920-dma40-fixes-v4-18-d751b2d9c23f@kernel.org> (raw)
In-Reply-To: <20260920-dma40-fixes-v4-0-d751b2d9c23f@kernel.org>
Logical channel allocation uses the configured direction to select the
source or destination allocation mask, derive the logical channel number,
and choose the LCPA location.
d40_set_runtime_config_write() nevertheless overwrites the configured
direction when a transfer is prepared for the opposite direction.
d40_free_dma() then clears the wrong allocation mask, leaking the original
resource and potentially releasing one used by another client.
Reject directions that differ from the direction used during allocation
and propagate runtime configuration errors to callers. Skip slave runtime
configuration for memcpy transfers, which also use d40_prep_sg() but do
not require it.
Fixes: 95e1400fa131 ("DMAENGINE: add runtime slave config to DMA40 v3")
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>
---
drivers/dma/ste_dma40.c | 29 ++++++++++++++---------------
1 file changed, 14 insertions(+), 15 deletions(-)
diff --git a/drivers/dma/ste_dma40.c b/drivers/dma/ste_dma40.c
index 7cd063e81328..35cee6e48558 100644
--- a/drivers/dma/ste_dma40.c
+++ b/drivers/dma/ste_dma40.c
@@ -2384,7 +2384,13 @@ d40_prep_sg(struct dma_chan *dchan, struct scatterlist *sg_src,
return NULL;
}
- d40_set_runtime_config_write(dchan, &chan->slave_config, direction);
+ if (direction != DMA_MEM_TO_MEM) {
+ ret = d40_set_runtime_config_write(dchan,
+ &chan->slave_config,
+ direction);
+ if (ret)
+ return NULL;
+ }
spin_lock_irqsave(&chan->lock, flags);
@@ -2857,6 +2863,13 @@ static int d40_set_runtime_config_write(struct dma_chan *chan,
return -EINVAL;
}
+ if (direction != cfg->dir) {
+ chan_err(d40c,
+ "transfer direction %d differs from allocated direction %d\n",
+ direction, cfg->dir);
+ return -EINVAL;
+ }
+
src_addr_width = config->src_addr_width;
src_maxburst = config->src_maxburst;
dst_addr_width = config->dst_addr_width;
@@ -2865,13 +2878,6 @@ static int d40_set_runtime_config_write(struct dma_chan *chan,
if (direction == DMA_DEV_TO_MEM) {
config_addr = config->src_addr;
- if (cfg->dir != DMA_DEV_TO_MEM)
- dev_dbg(d40c->base->dev,
- "channel was not configured for peripheral "
- "to memory transfer (%d) overriding\n",
- cfg->dir);
- cfg->dir = DMA_DEV_TO_MEM;
-
/* Configure the memory side */
if (dst_addr_width == DMA_SLAVE_BUSWIDTH_UNDEFINED)
dst_addr_width = src_addr_width;
@@ -2881,13 +2887,6 @@ static int d40_set_runtime_config_write(struct dma_chan *chan,
} else if (direction == DMA_MEM_TO_DEV) {
config_addr = config->dst_addr;
- if (cfg->dir != DMA_MEM_TO_DEV)
- dev_dbg(d40c->base->dev,
- "channel was not configured for memory "
- "to peripheral transfer (%d) overriding\n",
- cfg->dir);
- cfg->dir = DMA_MEM_TO_DEV;
-
/* Configure the memory side */
if (src_addr_width == DMA_SLAVE_BUSWIDTH_UNDEFINED)
src_addr_width = dst_addr_width;
--
2.55.0
next prev parent reply other threads:[~2026-09-19 22:22 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-19 22:22 [PATCH v4 00/23] dmaengine: ste_dma40: Fix numerous accumulated bugs Linus Walleij
2026-09-19 22:22 ` [PATCH v4 01/23] dmaengine: ste_dma40: Fix physical cyclic capability Linus Walleij
2026-09-19 22:22 ` [PATCH v4 02/23] dmaengine: ste_dma40: Fix cyclic transfer residue Linus Walleij
2026-09-19 22:22 ` [PATCH v4 03/23] dmaengine: ste_dma40: Recover coalesced cyclic callbacks Linus Walleij
2026-09-19 22:37 ` sashiko-bot
2026-09-19 22:22 ` [PATCH v4 04/23] dmaengine: ste_dma40: Fix failed start cleanup Linus Walleij
2026-09-19 22:22 ` [PATCH v4 05/23] dmaengine: ste_dma40: Fix probe runtime PM disable Linus Walleij
2026-09-19 22:22 ` [PATCH v4 06/23] dmaengine: ste_dma40: Check runtime PM in IRQ Linus Walleij
2026-09-19 22:22 ` [PATCH v4 07/23] dmaengine: ste_dma40: Handle runtime PM resume errors Linus Walleij
2026-09-19 22:22 ` [PATCH v4 08/23] dmaengine: ste_dma40: Return IRQ_NONE without interrupt status Linus Walleij
2026-09-19 22:36 ` sashiko-bot
2026-09-19 22:22 ` [PATCH v4 09/23] dmaengine: ste_dma40: Init hardware before registration Linus Walleij
2026-09-19 22:22 ` [PATCH v4 10/23] dmaengine: ste_dma40: Fix probe IRQ leak Linus Walleij
2026-09-19 22:22 ` [PATCH v4 11/23] dmaengine: ste_dma40: Fix DMA registration unwind Linus Walleij
2026-09-19 22:22 ` [PATCH v4 12/23] dmaengine: ste_dma40: Fix LCLA allocation order Linus Walleij
2026-09-19 22:22 ` [PATCH v4 13/23] dmaengine: ste_dma40: Fix probe LCLA free Linus Walleij
2026-09-19 22:22 ` [PATCH v4 14/23] dmaengine: ste_dma40: Put the LCPA SRAM node Linus Walleij
2026-09-19 22:22 ` [PATCH v4 15/23] dmaengine: ste_dma40: Fix memcpy channel parsing Linus Walleij
2026-09-19 22:22 ` [PATCH v4 16/23] dmaengine: ste_dma40: Validate disabled channel indexes Linus Walleij
2026-09-19 22:22 ` [PATCH v4 17/23] dmaengine: ste_dma40: Validate DMA specifier length Linus Walleij
2026-09-19 22:22 ` Linus Walleij [this message]
2026-09-19 22:22 ` [PATCH v4 19/23] dmaengine: ste_dma40: Fix logical channel bounds check Linus Walleij
2026-09-19 22:22 ` [PATCH v4 20/23] dmaengine: ste_dma40: Fix event group bounds Linus Walleij
2026-09-19 22:22 ` [PATCH v4 21/23] dmaengine: ste_dma40: Search all blocks for fixed logical channels Linus Walleij
2026-09-19 22:22 ` [PATCH v4 22/23] dmaengine: ste_dma40: Validate fixed physical channel indexes Linus Walleij
2026-09-19 22:22 ` [PATCH v4 23/23] dmaengine: ste_dma40: Validate memcpy configuration 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=20260920-dma40-fixes-v4-18-d751b2d9c23f@kernel.org \
--to=linusw@kernel.org \
--cc=Frank.Li@kernel.org \
--cc=dmaengine@vger.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