* [PATCH v6 1/7] dmaengine: dw-axi-dmac: keep cyclic mode in the descriptor
2026-11-16 6:00 [PATCH v6 0/7] dmaengine: dw-axi-dmac: fix termination and pause acknowledgment James Hilliard
@ 2026-11-16 6:00 ` James Hilliard
2026-11-16 6:00 ` [PATCH v6 2/7] dmaengine: dw-axi-dmac: poll the correct enable bit during termination James Hilliard
` (6 subsequent siblings)
7 siblings, 0 replies; 11+ messages in thread
From: James Hilliard @ 2026-11-16 6:00 UTC (permalink / raw)
To: Eugeniy Paltsev, Vinod Koul, Frank Li, Sergey Khimich,
Andy Shevchenko, Sia Jee Heng
Cc: Mitch Barnett, dmaengine, linux-kernel, James Hilliard, stable
dw_axi_dma_chan_prep_cyclic() sets chan->cyclic before allocating all the
hardware descriptors and leaves it set when preparation fails. The flag
also survives cyclic transfer errors and channel resource release. A
subsequent noncyclic transfer then takes the cyclic completion path,
leaving its cookie incomplete and its descriptor on the issued list.
Its zero period_len can also cause a division by zero.
Resetting the flag on failure or channel allocation is not sufficient:
preparing cyclic work while an ordinary transfer is active changes how
that transfer's completion interrupt is handled.
Store the mode in each descriptor and use the completed descriptor's
mode in the interrupt handler. Cyclic preparation sets only its own
descriptor's flag, while the zero-initialized noncyclic descriptors keep
it clear. Error recovery and channel reuse then use the next descriptor's
mode without relying on channel-wide cleanup.
Fixes: 1deb96c0fa58 ("dmaegine: dw-axi-dmac: Support device_prep_dma_cyclic()")
Closes: https://lore.kernel.org/r/sashiko-outbox-208213@kernel.org/
Cc: stable@vger.kernel.org
Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
---
drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c | 35 ++++++++++++--------------
drivers/dma/dw-axi-dmac/dw-axi-dmac.h | 2 +-
2 files changed, 17 insertions(+), 20 deletions(-)
diff --git a/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c b/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c
index 7520c78f55cc..6dae63024721 100644
--- a/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c
+++ b/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c
@@ -801,7 +801,7 @@ dw_axi_dma_chan_prep_cyclic(struct dma_chan *dchan, dma_addr_t dma_addr,
chan->direction = direction;
desc->chan = chan;
- chan->cyclic = true;
+ desc->cyclic = true;
desc->length = 0;
desc->period_len = period_len;
@@ -1117,25 +1117,23 @@ static void axi_chan_block_xfer_complete(struct axi_dma_chan *chan)
goto out;
}
- if (chan->cyclic) {
- desc = vd_to_axi_desc(vd);
- if (desc) {
- llp = lo_hi_readq(chan->chan_regs + CH_LLP);
- for (i = 0; i < count; i++) {
- hw_desc = &desc->hw_desc[i];
- if (hw_desc->llp == llp) {
- axi_chan_irq_clear(chan, hw_desc->lli->status_lo);
- hw_desc->lli->ctl_hi |= cpu_to_le32(CH_CTL_H_LLI_VALID);
- desc->completed_blocks = i;
-
- if (((hw_desc->len * (i + 1)) % desc->period_len) == 0)
- vchan_cyclic_callback(vd);
- break;
- }
+ desc = vd_to_axi_desc(vd);
+ if (desc->cyclic) {
+ llp = lo_hi_readq(chan->chan_regs + CH_LLP);
+ for (i = 0; i < count; i++) {
+ hw_desc = &desc->hw_desc[i];
+ if (hw_desc->llp == llp) {
+ axi_chan_irq_clear(chan, hw_desc->lli->status_lo);
+ hw_desc->lli->ctl_hi |= cpu_to_le32(CH_CTL_H_LLI_VALID);
+ desc->completed_blocks = i;
+
+ if (((hw_desc->len * (i + 1)) % desc->period_len) == 0)
+ vchan_cyclic_callback(vd);
+ break;
}
-
- axi_chan_enable(chan);
}
+
+ axi_chan_enable(chan);
} else {
/* Remove the completed descriptor from issued list before completing */
list_del(&vd->node);
@@ -1204,7 +1202,6 @@ static int dma_chan_terminate_all(struct dma_chan *dchan)
vchan_get_all_descriptors(&chan->vc, &head);
- chan->cyclic = false;
spin_unlock_irqrestore(&chan->vc.lock, flags);
vchan_dma_desc_free_list(&chan->vc, &head);
diff --git a/drivers/dma/dw-axi-dmac/dw-axi-dmac.h b/drivers/dma/dw-axi-dmac/dw-axi-dmac.h
index d8dd07efe60f..3c86e5d468ea 100644
--- a/drivers/dma/dw-axi-dmac/dw-axi-dmac.h
+++ b/drivers/dma/dw-axi-dmac/dw-axi-dmac.h
@@ -50,7 +50,6 @@ struct axi_dma_chan {
struct axi_dma_desc *desc;
struct dma_slave_config config;
enum dma_transfer_direction direction;
- bool cyclic;
/* these other elements are all protected by vc.lock */
bool is_paused;
};
@@ -105,6 +104,7 @@ struct axi_dma_desc {
u32 length;
u32 period_len;
u32 nr_hw_descs;
+ bool cyclic;
};
struct axi_dma_chan_config {
--
2.53.0
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH v6 2/7] dmaengine: dw-axi-dmac: poll the correct enable bit during termination
2026-11-16 6:00 [PATCH v6 0/7] dmaengine: dw-axi-dmac: fix termination and pause acknowledgment James Hilliard
2026-11-16 6:00 ` [PATCH v6 1/7] dmaengine: dw-axi-dmac: keep cyclic mode in the descriptor James Hilliard
@ 2026-11-16 6:00 ` James Hilliard
2026-11-16 6:00 ` [PATCH v6 3/7] dmaengine: dw-axi-dmac: retain descriptors when termination times out James Hilliard
` (5 subsequent siblings)
7 siblings, 0 replies; 11+ messages in thread
From: James Hilliard @ 2026-11-16 6:00 UTC (permalink / raw)
To: Eugeniy Paltsev, Vinod Koul, Frank Li, Sergey Khimich,
Andy Shevchenko, Sia Jee Heng
Cc: Mitch Barnett, dmaengine, linux-kernel, James Hilliard, stable
For channels 16 through 31, the channel enable bits occupy bits 32 through
47 of the extended DMAC_CHEN register. dma_chan_terminate_all() only reads
the low word and tests BIT(chan->id), so it can conclude that an upper-bank
channel has stopped while its actual enable bit remains set. Descriptors
can then be freed while hardware still owns them.
Poll axi_chan_is_hw_enable(), which already handles both register banks
and the smaller channel layouts, instead of constructing another mask.
Fixes: 495e18b16e3d ("dmaengine: dw-axi-dmac: Add support DMAX_NUM_CHANNELS > 16")
Cc: stable@vger.kernel.org
Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
---
drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c b/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c
index 6dae63024721..405ab9a78955 100644
--- a/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c
+++ b/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c
@@ -28,6 +28,7 @@
#include <linux/property.h>
#include <linux/reset.h>
#include <linux/slab.h>
+#include <linux/time64.h>
#include <linux/types.h>
#include "dw-axi-dmac.h"
@@ -1179,17 +1180,17 @@ static irqreturn_t dw_axi_dma_interrupt(int irq, void *dev_id)
static int dma_chan_terminate_all(struct dma_chan *dchan)
{
struct axi_dma_chan *chan = dchan_to_axi_dma_chan(dchan);
- u32 chan_active = BIT(chan->id) << DMAC_CHAN_EN_SHIFT;
unsigned long flags;
- u32 val;
+ bool enabled;
int ret;
LIST_HEAD(head);
axi_chan_disable(chan);
- ret = readl_poll_timeout_atomic(chan->chip->regs + DMAC_CHEN, val,
- !(val & chan_active), 1000, 50000);
- if (ret == -ETIMEDOUT)
+ ret = readx_poll_timeout_atomic(axi_chan_is_hw_enable, chan,
+ enabled, !enabled,
+ 1 * USEC_PER_MSEC, 50 * USEC_PER_MSEC);
+ if (ret)
dev_warn(dmaengine_chan_dev(dchan),
"%s failed to stop\n", axi_chan_name(chan));
--
2.53.0
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH v6 3/7] dmaengine: dw-axi-dmac: retain descriptors when termination times out
2026-11-16 6:00 [PATCH v6 0/7] dmaengine: dw-axi-dmac: fix termination and pause acknowledgment James Hilliard
2026-11-16 6:00 ` [PATCH v6 1/7] dmaengine: dw-axi-dmac: keep cyclic mode in the descriptor James Hilliard
2026-11-16 6:00 ` [PATCH v6 2/7] dmaengine: dw-axi-dmac: poll the correct enable bit during termination James Hilliard
@ 2026-11-16 6:00 ` James Hilliard
2026-11-16 6:00 ` [PATCH v6 4/7] dmaengine: dw-axi-dmac: use atomic polling for suspend acknowledgment James Hilliard
` (4 subsequent siblings)
7 siblings, 0 replies; 11+ messages in thread
From: James Hilliard @ 2026-11-16 6:00 UTC (permalink / raw)
To: Eugeniy Paltsev, Vinod Koul, Frank Li, Sergey Khimich,
Andy Shevchenko, Sia Jee Heng
Cc: Mitch Barnett, dmaengine, linux-kernel, James Hilliard, stable
dma_chan_terminate_all() warns when the channel enable bit does not clear,
but then frees the descriptors and returns success. Its synchronize
callback only drains virtual-channel callbacks, so terminate_sync() can
also report success while hardware still accesses the transfer.
Return the polling error before detaching descriptors or changing the
peripheral routing. This keeps the transfer resources available while
the channel remains enabled and lets the caller retry termination without
treating the timeout as a successful stop.
Hold the channel lock across disabling, polling and descriptor detachment
so an interrupt handler cannot restart the channel between the stop check
and cleanup.
Fixes: 1deb96c0fa58 ("dmaegine: dw-axi-dmac: Support device_prep_dma_cyclic()")
Cc: stable@vger.kernel.org
Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
---
drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c b/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c
index 405ab9a78955..040c12d07db2 100644
--- a/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c
+++ b/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c
@@ -1185,22 +1185,25 @@ static int dma_chan_terminate_all(struct dma_chan *dchan)
int ret;
LIST_HEAD(head);
+ spin_lock_irqsave(&chan->vc.lock, flags);
+
axi_chan_disable(chan);
ret = readx_poll_timeout_atomic(axi_chan_is_hw_enable, chan,
enabled, !enabled,
1 * USEC_PER_MSEC, 50 * USEC_PER_MSEC);
- if (ret)
+ if (ret) {
+ spin_unlock_irqrestore(&chan->vc.lock, flags);
dev_warn(dmaengine_chan_dev(dchan),
"%s failed to stop\n", axi_chan_name(chan));
+ return ret;
+ }
if (chan->direction != DMA_MEM_TO_MEM)
dw_axi_dma_set_hw_channel(chan, false);
if (chan->direction == DMA_MEM_TO_DEV)
dw_axi_dma_set_byte_halfword(chan, false);
- spin_lock_irqsave(&chan->vc.lock, flags);
-
vchan_get_all_descriptors(&chan->vc, &head);
spin_unlock_irqrestore(&chan->vc.lock, flags);
--
2.53.0
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH v6 4/7] dmaengine: dw-axi-dmac: use atomic polling for suspend acknowledgment
2026-11-16 6:00 [PATCH v6 0/7] dmaengine: dw-axi-dmac: fix termination and pause acknowledgment James Hilliard
` (2 preceding siblings ...)
2026-11-16 6:00 ` [PATCH v6 3/7] dmaengine: dw-axi-dmac: retain descriptors when termination times out James Hilliard
@ 2026-11-16 6:00 ` James Hilliard
2026-11-16 6:00 ` [PATCH v6 5/7] dmaengine: dw-axi-dmac: preserve pending pause requests James Hilliard
` (3 subsequent siblings)
7 siblings, 0 replies; 11+ messages in thread
From: James Hilliard @ 2026-11-16 6:00 UTC (permalink / raw)
To: Eugeniy Paltsev, Vinod Koul, Frank Li, Sergey Khimich,
Andy Shevchenko, Sia Jee Heng
Cc: Mitch Barnett, dmaengine, linux-kernel, James Hilliard, stable
The pause loop delays after its final status read, so an acknowledgment
that arrives during that delay is cleared without being observed and
the caller receives -EAGAIN.
Use readx_poll_timeout_atomic() to check the status after the final delay.
Keep the two-microsecond polling interval, 40-microsecond timeout and
-EAGAIN return value when suspension is not acknowledged.
Fixes: 1fe20f1b8454 ("dmaengine: Introduce DW AXI DMAC driver")
Cc: stable@vger.kernel.org
Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
---
drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c b/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c
index 040c12d07db2..1a53fbc951a9 100644
--- a/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c
+++ b/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c
@@ -1219,7 +1219,8 @@ static int dma_chan_pause(struct dma_chan *dchan)
{
struct axi_dma_chan *chan = dchan_to_axi_dma_chan(dchan);
unsigned long flags;
- unsigned int timeout = 20; /* timeout iterations */
+ u32 status;
+ int ret;
u64 val;
spin_lock_irqsave(&chan->vc.lock, flags);
@@ -1250,12 +1251,9 @@ static int dma_chan_pause(struct dma_chan *dchan)
}
}
- do {
- if (axi_chan_irq_read(chan) & DWAXIDMAC_IRQ_SUSPENDED)
- break;
-
- udelay(2);
- } while (--timeout);
+ ret = readx_poll_timeout_atomic(axi_chan_irq_read, chan,
+ status, status & DWAXIDMAC_IRQ_SUSPENDED,
+ 2, 40);
axi_chan_irq_clear(chan, DWAXIDMAC_IRQ_SUSPENDED);
@@ -1263,7 +1261,7 @@ static int dma_chan_pause(struct dma_chan *dchan)
spin_unlock_irqrestore(&chan->vc.lock, flags);
- return timeout ? 0 : -EAGAIN;
+ return ret ? -EAGAIN : 0;
}
/* Called in chan locked context */
--
2.53.0
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH v6 5/7] dmaengine: dw-axi-dmac: preserve pending pause requests
2026-11-16 6:00 [PATCH v6 0/7] dmaengine: dw-axi-dmac: fix termination and pause acknowledgment James Hilliard
` (3 preceding siblings ...)
2026-11-16 6:00 ` [PATCH v6 4/7] dmaengine: dw-axi-dmac: use atomic polling for suspend acknowledgment James Hilliard
@ 2026-11-16 6:00 ` James Hilliard
2026-11-16 6:00 ` [PATCH v6 6/7] dmaengine: dw-axi-dmac: retain descriptors until callbacks drain James Hilliard
` (2 subsequent siblings)
7 siblings, 0 replies; 11+ messages in thread
From: James Hilliard @ 2026-11-16 6:00 UTC (permalink / raw)
To: Eugeniy Paltsev, Vinod Koul, Frank Li, Sergey Khimich,
Andy Shevchenko, Sia Jee Heng
Cc: Mitch Barnett, dmaengine, linux-kernel, James Hilliard, stable
dma_chan_pause() clears SUSPENDED even when polling times out. Hardware
can set that status after the last poll, and the unconditional clear then
discards an acknowledgment the caller never observed. Another channel's
interrupt can also consume the status because the shared IRQ handler
clears every channel's status before taking its lock.
Leave SUSPENDED to the pause and resume paths. Track the suspend request
separately from its acknowledgment so a timeout can be followed by either
a pause retry or a resume. Wait for acknowledgment before clearing the
hardware request, since hardware ignores an earlier clear. If that wait
also times out, return -EAGAIN with the request still pending.
A completed transfer is also quiescent, but its completion handler may
still need to advance a cyclic descriptor. Defer that restart while a
pause is pending, and resume it without reprogramming the first LLI.
Track the active descriptor until its completion handler runs so that
resume and issue_pending cannot restart a completed cyclic segment or
reissue a completed noncyclic descriptor while its IRQ is pending.
Start queued work after the active descriptor is retired, respecting the
pause request.
Clear stale suspension status at the start of a new descriptor rather
than at each cyclic restart. Reset the software state after successful
termination and when allocating a channel for a new client.
Store the lock-protected pause flags as bitfields in existing padding.
Fixes: 1fe20f1b8454 ("dmaengine: Introduce DW AXI DMAC driver")
Cc: stable@vger.kernel.org
Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
---
drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c | 98 ++++++++++++++++++++++----
drivers/dma/dw-axi-dmac/dw-axi-dmac.h | 8 ++-
2 files changed, 90 insertions(+), 16 deletions(-)
diff --git a/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c b/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c
index 1a53fbc951a9..cd9a5b45d295 100644
--- a/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c
+++ b/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c
@@ -481,6 +481,8 @@ static void axi_chan_block_xfer_start(struct axi_dma_chan *chan,
irq_mask |= DWAXIDMAC_IRQ_SUSPENDED;
axi_chan_irq_set(chan, irq_mask);
+ axi_chan_irq_clear(chan, DWAXIDMAC_IRQ_SUSPENDED);
+ chan->desc = first;
axi_chan_enable(chan);
}
@@ -489,6 +491,9 @@ static void axi_chan_start_first_queued(struct axi_dma_chan *chan)
struct axi_dma_desc *desc;
struct virt_dma_desc *vd;
+ if (chan->desc || chan->pause_requested)
+ return;
+
vd = vchan_next_desc(&chan->vc);
if (!vd)
return;
@@ -543,6 +548,10 @@ static int dma_chan_alloc_chan_resources(struct dma_chan *dchan)
pm_runtime_put(chan->chip->dev);
return -ENOMEM;
}
+ chan->desc = NULL;
+ chan->pause_requested = false;
+ chan->is_paused = false;
+ chan->cyclic_restart = false;
dev_vdbg(dmaengine_chan_dev(dchan), "%s: allocating\n", axi_chan_name(chan));
return 0;
@@ -1087,6 +1096,8 @@ static noinline void axi_chan_handle_err(struct axi_dma_chan *chan, u32 status)
vchan_cookie_complete(vd);
/* Try to restart the controller */
+ chan->desc = NULL;
+ chan->cyclic_restart = false;
axi_chan_start_first_queued(chan);
out:
@@ -1134,11 +1145,18 @@ static void axi_chan_block_xfer_complete(struct axi_dma_chan *chan)
}
}
- axi_chan_enable(chan);
+ if (chan->pause_requested) {
+ chan->is_paused = true;
+ chan->cyclic_restart = true;
+ } else {
+ axi_chan_enable(chan);
+ }
} else {
/* Remove the completed descriptor from issued list before completing */
list_del(&vd->node);
vchan_cookie_complete(vd);
+ chan->desc = NULL;
+ axi_chan_start_first_queued(chan);
}
out:
@@ -1160,6 +1178,8 @@ static irqreturn_t dw_axi_dma_interrupt(int irq, void *dev_id)
for (i = 0; i < dw->hdata->nr_channels; i++) {
chan = &dw->chan[i];
status = axi_chan_irq_read(chan);
+ /* Leave suspension status for the pause and resume paths. */
+ status &= ~DWAXIDMAC_IRQ_SUSPENDED;
axi_chan_irq_clear(chan, status);
dev_vdbg(chip->dev, "%s %u IRQ status: 0x%08x\n",
@@ -1206,6 +1226,11 @@ static int dma_chan_terminate_all(struct dma_chan *dchan)
vchan_get_all_descriptors(&chan->vc, &head);
+ axi_chan_irq_clear(chan, DWAXIDMAC_IRQ_SUSPENDED);
+ chan->desc = NULL;
+ chan->pause_requested = false;
+ chan->is_paused = false;
+ chan->cyclic_restart = false;
spin_unlock_irqrestore(&chan->vc.lock, flags);
vchan_dma_desc_free_list(&chan->vc, &head);
@@ -1215,16 +1240,49 @@ static int dma_chan_terminate_all(struct dma_chan *dchan)
return 0;
}
+static bool axi_chan_is_suspended(struct axi_dma_chan *chan)
+{
+ if (axi_chan_is_hw_enable(chan))
+ return axi_chan_irq_read(chan) & DWAXIDMAC_IRQ_SUSPENDED;
+
+ /* A completed transfer cannot acknowledge a new suspend request. */
+ axi_chan_disable(chan);
+ return true;
+}
+
+/* A timed-out request can still be acknowledged. */
+static int axi_chan_wait_for_suspend(struct axi_dma_chan *chan)
+ __must_hold(&chan->vc.lock)
+{
+ bool suspended;
+ int ret;
+
+ if (chan->is_paused)
+ return 0;
+
+ ret = readx_poll_timeout_atomic(axi_chan_is_suspended, chan,
+ suspended, suspended, 2, 40);
+ if (ret)
+ return -EAGAIN;
+
+ axi_chan_irq_clear(chan, DWAXIDMAC_IRQ_SUSPENDED);
+ chan->is_paused = true;
+ return 0;
+}
+
static int dma_chan_pause(struct dma_chan *dchan)
{
struct axi_dma_chan *chan = dchan_to_axi_dma_chan(dchan);
unsigned long flags;
- u32 status;
int ret;
u64 val;
spin_lock_irqsave(&chan->vc.lock, flags);
+ chan->pause_requested = true;
+ if (chan->is_paused || !axi_chan_is_hw_enable(chan))
+ goto wait;
+
if (chan->chip->dw->hdata->nr_channels >= DMAC_CHAN_16) {
val = axi_dma_ioread64(chan->chip, DMAC_CHSUSPREG);
if (chan->id >= DMAC_CHAN_16) {
@@ -1251,17 +1309,11 @@ static int dma_chan_pause(struct dma_chan *dchan)
}
}
- ret = readx_poll_timeout_atomic(axi_chan_irq_read, chan,
- status, status & DWAXIDMAC_IRQ_SUSPENDED,
- 2, 40);
-
- axi_chan_irq_clear(chan, DWAXIDMAC_IRQ_SUSPENDED);
-
- chan->is_paused = true;
-
+wait:
+ ret = axi_chan_wait_for_suspend(chan);
spin_unlock_irqrestore(&chan->vc.lock, flags);
- return ret ? -EAGAIN : 0;
+ return ret;
}
/* Called in chan locked context */
@@ -1295,6 +1347,8 @@ static inline void axi_chan_resume(struct axi_dma_chan *chan)
}
}
+ axi_chan_irq_clear(chan, DWAXIDMAC_IRQ_SUSPENDED);
+ chan->pause_requested = false;
chan->is_paused = false;
}
@@ -1302,15 +1356,31 @@ static int dma_chan_resume(struct dma_chan *dchan)
{
struct axi_dma_chan *chan = dchan_to_axi_dma_chan(dchan);
unsigned long flags;
+ int ret;
spin_lock_irqsave(&chan->vc.lock, flags);
- if (chan->is_paused)
- axi_chan_resume(chan);
+ ret = 0;
+ if (!chan->pause_requested)
+ goto out;
+
+ /* Hardware ignores resume until the suspend request is acknowledged. */
+ ret = axi_chan_wait_for_suspend(chan);
+ if (ret)
+ goto out;
+
+ axi_chan_resume(chan);
+ if (chan->cyclic_restart) {
+ chan->cyclic_restart = false;
+ axi_chan_enable(chan);
+ } else {
+ axi_chan_start_first_queued(chan);
+ }
+out:
spin_unlock_irqrestore(&chan->vc.lock, flags);
- return 0;
+ return ret;
}
static int axi_dma_suspend(struct axi_dma_chip *chip)
diff --git a/drivers/dma/dw-axi-dmac/dw-axi-dmac.h b/drivers/dma/dw-axi-dmac/dw-axi-dmac.h
index 3c86e5d468ea..b18c9880711a 100644
--- a/drivers/dma/dw-axi-dmac/dw-axi-dmac.h
+++ b/drivers/dma/dw-axi-dmac/dw-axi-dmac.h
@@ -42,6 +42,12 @@ struct axi_dma_chan {
void __iomem *chan_regs;
u8 id;
u8 hw_handshake_num;
+
+ /* Protected by vc.lock. */
+ bool pause_requested:1;
+ bool is_paused:1;
+ bool cyclic_restart:1;
+
atomic_t descs_allocated;
struct dma_pool *desc_pool;
@@ -50,8 +56,6 @@ struct axi_dma_chan {
struct axi_dma_desc *desc;
struct dma_slave_config config;
enum dma_transfer_direction direction;
- /* these other elements are all protected by vc.lock */
- bool is_paused;
};
struct dw_axi_dma {
--
2.53.0
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH v6 6/7] dmaengine: dw-axi-dmac: retain descriptors until callbacks drain
2026-11-16 6:00 [PATCH v6 0/7] dmaengine: dw-axi-dmac: fix termination and pause acknowledgment James Hilliard
` (4 preceding siblings ...)
2026-11-16 6:00 ` [PATCH v6 5/7] dmaengine: dw-axi-dmac: preserve pending pause requests James Hilliard
@ 2026-11-16 6:00 ` James Hilliard
2026-11-16 6:00 ` [PATCH v6 7/7] dmaengine: dw-axi-dmac: serialize interrupt status with channel reuse James Hilliard
2026-11-17 2:42 ` [PATCH v6 0/7] dmaengine: dw-axi-dmac: fix termination and pause acknowledgment Mitch Barnett
7 siblings, 0 replies; 11+ messages in thread
From: James Hilliard @ 2026-11-16 6:00 UTC (permalink / raw)
To: Eugeniy Paltsev, Vinod Koul, Frank Li, Sergey Khimich,
Andy Shevchenko, Sia Jee Heng
Cc: Mitch Barnett, dmaengine, linux-kernel, James Hilliard,
Wang YuWei, stable
Termination frees every descriptor while a pending period callback can
still refer to one through vc->cyclic. An executing callback has already
cleared that pointer, but still receives a pointer to the descriptor's
tx_result and can use it after termination frees the descriptor.
An error interrupt can also move the cyclic descriptor to desc_completed
before termination. Looking only at the head of desc_issued therefore
does not cover every pending cyclic callback.
Use vchan_terminate_all() after stopping the channel to clear the pending
alias and move the collected descriptors to desc_terminated. The existing
synchronize callback drains the tasklet before reclaiming that list.
Descriptors already detached onto the tasklet's private completed list
remain owned by the tasklet. Repeated termination preserves the retired
list, including when called from a completion callback.
Fixes: 1deb96c0fa58 ("dmaegine: dw-axi-dmac: Support device_prep_dma_cyclic()")
Reported-by: Wang YuWei <1973615295@qq.com>
Link: https://lore.kernel.org/r/tencent_C00D995A9F70206DFD1330DCB1222EEBCB07@qq.com/
Reported-by: Mitch Barnett <mitch@accuratesound.ca>
Cc: Wang YuWei <1973615295@qq.com>
Cc: stable@vger.kernel.org
Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
---
drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c b/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c
index cd9a5b45d295..97098367535f 100644
--- a/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c
+++ b/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c
@@ -1203,7 +1203,6 @@ static int dma_chan_terminate_all(struct dma_chan *dchan)
unsigned long flags;
bool enabled;
int ret;
- LIST_HEAD(head);
spin_lock_irqsave(&chan->vc.lock, flags);
@@ -1224,7 +1223,7 @@ static int dma_chan_terminate_all(struct dma_chan *dchan)
if (chan->direction == DMA_MEM_TO_DEV)
dw_axi_dma_set_byte_halfword(chan, false);
- vchan_get_all_descriptors(&chan->vc, &head);
+ vchan_terminate_all(&chan->vc);
axi_chan_irq_clear(chan, DWAXIDMAC_IRQ_SUSPENDED);
chan->desc = NULL;
@@ -1233,8 +1232,6 @@ static int dma_chan_terminate_all(struct dma_chan *dchan)
chan->cyclic_restart = false;
spin_unlock_irqrestore(&chan->vc.lock, flags);
- vchan_dma_desc_free_list(&chan->vc, &head);
-
dev_vdbg(dmaengine_chan_dev(dchan), "terminated: %s\n", axi_chan_name(chan));
return 0;
--
2.53.0
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH v6 7/7] dmaengine: dw-axi-dmac: serialize interrupt status with channel reuse
2026-11-16 6:00 [PATCH v6 0/7] dmaengine: dw-axi-dmac: fix termination and pause acknowledgment James Hilliard
` (5 preceding siblings ...)
2026-11-16 6:00 ` [PATCH v6 6/7] dmaengine: dw-axi-dmac: retain descriptors until callbacks drain James Hilliard
@ 2026-11-16 6:00 ` James Hilliard
2026-11-16 6:22 ` sashiko-bot
2026-11-17 2:42 ` [PATCH v6 0/7] dmaengine: dw-axi-dmac: fix termination and pause acknowledgment Mitch Barnett
7 siblings, 1 reply; 11+ messages in thread
From: James Hilliard @ 2026-11-16 6:00 UTC (permalink / raw)
To: Eugeniy Paltsev, Vinod Koul, Frank Li, Sergey Khimich,
Andy Shevchenko, Sia Jee Heng
Cc: Mitch Barnett, dmaengine, linux-kernel, James Hilliard, stable
The interrupt handler reads and acknowledges channel status before taking
the channel lock. Termination can finish and a new transfer can start
before the handler takes that lock. The saved completion or error status
then applies to the new descriptor, stopping it and completing its cookie
before its DMA transfer has finished.
Termination also leaves completion and error status pending. A subsequent
interrupt can consume that status after the channel has been reused, even
if no handler was running when the old transfer was stopped.
Read and acknowledge status under the channel lock and keep it held while
processing the event. Move locking out of the completion and error helpers
into their sole caller, and clear all channel status after a successful
stop. Status collection, descriptor ownership and channel reuse then share
the same serialization.
Initialize the virtual channels before requesting the shared IRQs so every
lock is ready before the interrupt handler can run.
Fixes: 1fe20f1b8454 ("dmaengine: Introduce DW AXI DMAC driver")
Cc: stable@vger.kernel.org
Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
---
drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c | 31 ++++++++++++--------------
1 file changed, 14 insertions(+), 17 deletions(-)
diff --git a/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c b/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c
index 97098367535f..0116c44d3bef 100644
--- a/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c
+++ b/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c
@@ -20,6 +20,7 @@
#include <linux/iopoll.h>
#include <linux/io-64-nonatomic-lo-hi.h>
#include <linux/kernel.h>
+#include <linux/lockdep.h>
#include <linux/module.h>
#include <linux/of.h>
#include <linux/of_dma.h>
@@ -1071,9 +1072,8 @@ static void axi_chan_list_dump_lli(struct axi_dma_chan *chan,
static noinline void axi_chan_handle_err(struct axi_dma_chan *chan, u32 status)
{
struct virt_dma_desc *vd;
- unsigned long flags;
- spin_lock_irqsave(&chan->vc.lock, flags);
+ lockdep_assert_held(&chan->vc.lock);
axi_chan_disable(chan);
@@ -1082,7 +1082,7 @@ static noinline void axi_chan_handle_err(struct axi_dma_chan *chan, u32 status)
if (!vd) {
dev_err(vchan_chan_dev(&chan->vc), "BUG: %s, IRQ with no descriptors\n",
axi_chan_name(chan));
- goto out;
+ return;
}
/* Remove the completed descriptor from issued list */
list_del(&vd->node);
@@ -1099,9 +1099,6 @@ static noinline void axi_chan_handle_err(struct axi_dma_chan *chan, u32 status)
chan->desc = NULL;
chan->cyclic_restart = false;
axi_chan_start_first_queued(chan);
-
-out:
- spin_unlock_irqrestore(&chan->vc.lock, flags);
}
static void axi_chan_block_xfer_complete(struct axi_dma_chan *chan)
@@ -1110,11 +1107,11 @@ static void axi_chan_block_xfer_complete(struct axi_dma_chan *chan)
struct axi_dma_hw_desc *hw_desc;
struct axi_dma_desc *desc;
struct virt_dma_desc *vd;
- unsigned long flags;
u64 llp;
int i;
- spin_lock_irqsave(&chan->vc.lock, flags);
+ lockdep_assert_held(&chan->vc.lock);
+
if (unlikely(axi_chan_is_hw_enable(chan))) {
dev_err(vchan_chan_dev(&chan->vc), "BUG: %s caught DWAXIDMAC_IRQ_DMA_TRF, but channel not idle!\n",
axi_chan_name(chan));
@@ -1126,7 +1123,7 @@ static void axi_chan_block_xfer_complete(struct axi_dma_chan *chan)
if (!vd) {
dev_err(vchan_chan_dev(&chan->vc), "BUG: %s, IRQ with no descriptors\n",
axi_chan_name(chan));
- goto out;
+ return;
}
desc = vd_to_axi_desc(vd);
@@ -1158,9 +1155,6 @@ static void axi_chan_block_xfer_complete(struct axi_dma_chan *chan)
chan->desc = NULL;
axi_chan_start_first_queued(chan);
}
-
-out:
- spin_unlock_irqrestore(&chan->vc.lock, flags);
}
static irqreturn_t dw_axi_dma_interrupt(int irq, void *dev_id)
@@ -1168,6 +1162,7 @@ static irqreturn_t dw_axi_dma_interrupt(int irq, void *dev_id)
struct axi_dma_chip *chip = dev_id;
struct dw_axi_dma *dw = chip->dw;
struct axi_dma_chan *chan;
+ unsigned long flags;
u32 status, i;
@@ -1177,6 +1172,7 @@ static irqreturn_t dw_axi_dma_interrupt(int irq, void *dev_id)
/* Poll, clear and process every channel interrupt status */
for (i = 0; i < dw->hdata->nr_channels; i++) {
chan = &dw->chan[i];
+ spin_lock_irqsave(&chan->vc.lock, flags);
status = axi_chan_irq_read(chan);
/* Leave suspension status for the pause and resume paths. */
status &= ~DWAXIDMAC_IRQ_SUSPENDED;
@@ -1189,6 +1185,7 @@ static irqreturn_t dw_axi_dma_interrupt(int irq, void *dev_id)
axi_chan_handle_err(chan, status);
else if (status & DWAXIDMAC_IRQ_DMA_TRF)
axi_chan_block_xfer_complete(chan);
+ spin_unlock_irqrestore(&chan->vc.lock, flags);
}
/* Re-enable interrupts */
@@ -1225,7 +1222,7 @@ static int dma_chan_terminate_all(struct dma_chan *dchan)
vchan_terminate_all(&chan->vc);
- axi_chan_irq_clear(chan, DWAXIDMAC_IRQ_SUSPENDED);
+ axi_chan_irq_clear(chan, DWAXIDMAC_IRQ_ALL);
chan->desc = NULL;
chan->pause_requested = false;
chan->is_paused = false;
@@ -1599,10 +1596,6 @@ static int dw_probe(struct platform_device *pdev)
if (!dw->chan)
return -ENOMEM;
- ret = axi_req_irqs(pdev, chip);
- if (ret)
- return ret;
-
INIT_LIST_HEAD(&dw->dma.channels);
for (i = 0; i < hdata->nr_channels; i++) {
struct axi_dma_chan *chan = &dw->chan[i];
@@ -1616,6 +1609,10 @@ static int dw_probe(struct platform_device *pdev)
vchan_init(&chan->vc, &dw->dma);
}
+ ret = axi_req_irqs(pdev, chip);
+ if (ret)
+ return ret;
+
/* Set capabilities */
dma_cap_set(DMA_MEMCPY, dw->dma.cap_mask);
dma_cap_set(DMA_SLAVE, dw->dma.cap_mask);
--
2.53.0
^ permalink raw reply related [flat|nested] 11+ messages in thread* Re: [PATCH v6 7/7] dmaengine: dw-axi-dmac: serialize interrupt status with channel reuse
2026-11-16 6:00 ` [PATCH v6 7/7] dmaengine: dw-axi-dmac: serialize interrupt status with channel reuse James Hilliard
@ 2026-11-16 6:22 ` sashiko-bot
0 siblings, 0 replies; 11+ messages in thread
From: sashiko-bot @ 2026-11-16 6:22 UTC (permalink / raw)
To: James Hilliard; +Cc: dmaengine, vkoul, Frank.Li
Thank you for your contribution! Sashiko AI review found 1 potential
issue to consider:
- [Medium] dmaengine: dw-axi-dmac: premature axi_req_irqs() call in
dw_probe()
--
commit 6c849580a58ee4adc45dc13e6749fbe0bf5958b1
Author: James Hilliard <james.hilliard1@gmail.com>
dmaengine: dw-axi-dmac: serialize interrupt status with channel reuse
This commit moves channel interrupt status reading and clearing under
chan->vc.lock, clears all channel interrupts in dma_chan_terminate_all(),
and moves axi_req_irqs() after vchan_init() in dw_probe().
> diff --git a/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c b/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c
> index 97098367535f0..0116c44d3bef1 100644
> --- a/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c
> +++ b/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c
[ ... ]
> @@ -1599,10 +1596,6 @@ static int dw_probe(struct platform_device *pdev)
> if (!dw->chan)
> return -ENOMEM;
>
> - ret = axi_req_irqs(pdev, chip);
> - if (ret)
> - return ret;
> -
> INIT_LIST_HEAD(&dw->dma.channels);
> for (i = 0; i < hdata->nr_channels; i++) {
> struct axi_dma_chan *chan = &dw->chan[i];
> @@ -1616,6 +1609,10 @@ static int dw_probe(struct platform_device *pdev)
> vchan_init(&chan->vc, &dw->dma);
> }
>
> + ret = axi_req_irqs(pdev, chip);
> + if (ret)
> + return ret;
[Severity: Medium]
Is axi_req_irqs() still called too early in dw_probe()?
axi_req_irqs() registers dw_axi_dma_interrupt() with IRQF_SHARED, so the
handler can run immediately when another device on the shared line
asserts an interrupt or when CONFIG_DEBUG_SHIRQ is enabled. At this
point in dw_probe(), axi_dma_resume() has not yet enabled chip->clks,
axi_dma_hw_init() has not masked channel interrupts, and
dmaenginem_async_device_register() has not allocated
chan->vc.chan.chan_dev:
drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c:dw_probe() {
...
ret = axi_dma_resume(chip);
if (ret < 0)
goto err_pm_disable;
axi_dma_hw_init(chip);
pm_runtime_put(chip->dev);
ret = dmaenginem_async_device_register(&dw->dma);
...
}
If dw_axi_dma_interrupt() runs before those steps, it accesses DMAC
registers while the clocks are disabled, enables global DMAC interrupts
before per-channel interrupts are masked, and dereferences a NULL
chan->vc.chan.chan_dev in axi_chan_name() or vchan_chan_dev().
--
Sashiko AI review · https://sashiko.dev/#/patchset/20261115-submit-dw-axi-dma-stop-pause-v1-v6-0-bcb23d1e7029@gmail.com?part=7
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v6 0/7] dmaengine: dw-axi-dmac: fix termination and pause acknowledgment
2026-11-16 6:00 [PATCH v6 0/7] dmaengine: dw-axi-dmac: fix termination and pause acknowledgment James Hilliard
` (6 preceding siblings ...)
2026-11-16 6:00 ` [PATCH v6 7/7] dmaengine: dw-axi-dmac: serialize interrupt status with channel reuse James Hilliard
@ 2026-11-17 2:42 ` Mitch Barnett
2026-11-17 3:19 ` James Hilliard
7 siblings, 1 reply; 11+ messages in thread
From: Mitch Barnett @ 2026-11-17 2:42 UTC (permalink / raw)
To: James Hilliard, Eugeniy Paltsev, Vinod Koul, Frank Li,
Sergey Khimich, Andy Shevchenko, Sia Jee Heng
Cc: dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org,
Wang YuWei
Hi James,
Thank you for incorporating the descriptor-callback lifetime and IRQ/channel-reuse fixes in v6.
We've continued investigating the remaining STOP/ABORT safety question on our Raspberry Pi 5 (RP1) test system, particularly the lifetime of client-owned ALSA PCM buffers after unsuccessful DMA termination.
We've completed several additional investigations against Raspberry Pi Linux 6.18.50, pinned at cff533aec2fa601846766b32ff57204e0a61bed7:
1. DMAengine/ALSA STOP contract (V24R33): Eight source-executed host tests passed. A simulated dmaengine_terminate_async() failure (-ETIMEDOUT) is not propagated by snd_dmaengine_pcm_trigger(). The snd_dmaengine_pcm_sync_stop() path returns success after callback synchronization without independently verifying hardware quiescence.
2. ALSA buffer lifetime (V24R34/V24R35): Twelve further source-executed host cases passed. The pinned ALSA core can release managed dynamic buffers despite an hw_free error. Preallocated buffers can be detached and subsequently reused. This exposes a potential client-memory lifetime problem independently of the DMA driver's descriptor pool.
3. Live RP1 configuration (V24R36–V24R39): Read-only inspection confirmed the HiFiBerry Digi sound card bound through snd-rpi-wm8804 and designware-i2s. The live I²S1 device tree contains TX/RX DMA mappings and no I²S interrupt property. However, its PCM streams do not expose the expected prealloc entries, and we're still reconciling the effective PCM component and allocator.
These are source-level tests and read-only hardware configuration checks. We have not reproduced a client-buffer use-after-free on RP1 hardware.
We've also prepared an isolated combination incorporating Raspberry Pi's per-channel ABORT implementation (PR #7654). It compiles against our matching kernel source, but we have deliberately not installed or exercised it on the hardware.
Our remaining concern is that retaining DMA descriptors does not establish that independently owned PCM pages are safe to release. The Synopsys DW_axi_dmac documentation cautions that an ABORT does not necessarily complete outstanding AXI transactions.
Could you or the other DMAengine maintainers clarify two points?
1. Hardware quiescence: Is there an RP1-specific hardware condition, or supported controller recovery sequence, that positively guarantees all outstanding DMA transactions have completed after a failed STOP followed by ABORT? In particular, does this account for in-flight AXI/PCIe writes and the shared DMA master?
2. Client-buffer ownership: If no such guarantee exists, what would be the preferred upstream approach to preventing ALSA from freeing or reusing DMA-addressable PCM memory after an unrecoverable termination failure? Would this require a coordinated DMAengine/ALSA fail-closed mechanism, including the HW_FREE, error-cleanup, close, and device-removal paths?
We're holding off on forced STOP/ABORT testing until we can establish a defensible memory-lifetime contract.
Any guidance on the hardware guarantee or appropriate upstream design would be greatly appreciated.
Thanks again for your work on this.
Kind regards,
Mitch Barnett
Accurate Sound
References:
Raspberry Pi per-channel ABORT implementation:
https://github.com/raspberrypi/linux/pull/7654
Pinned Raspberry Pi kernel source:
https://github.com/raspberrypi/linux/tree/cff533aec2fa601846766b32ff57204e0a61bed7
________________________________________
From: James Hilliard <james.hilliard1@gmail.com>
Sent: Sunday, November 15, 2026 10:00 PM
To: Eugeniy Paltsev <Eugeniy.Paltsev@synopsys.com>; Vinod Koul <vkoul@kernel.org>; Frank Li <Frank.Li@kernel.org>; Sergey Khimich <serghox@gmail.com>; Andy Shevchenko <andriy.shevchenko@linux.intel.com>; Sia Jee Heng <jee.heng.sia@intel.com>
Cc: Mitch Barnett <mitch@accuratesound.ca>; dmaengine@vger.kernel.org <dmaengine@vger.kernel.org>; linux-kernel@vger.kernel.org <linux-kernel@vger.kernel.org>; James Hilliard <james.hilliard1@gmail.com>; stable@vger.kernel.org <stable@vger.kernel.org>; Wang YuWei <1973615295@qq.com>
Subject: [PATCH v6 0/7] dmaengine: dw-axi-dmac: fix termination and pause acknowledgment
Keep cyclic mode in each descriptor so failed preparation and queued
work cannot change the completion handling of another transfer.
Use the layout-aware channel enable check during termination and retain
transfer resources when the channel does not stop. Preserve suspension
status for the pause and resume paths, including acknowledgments that
arrive after a polling timeout or during another channel's interrupt.
Keep a pending pause across cyclic segment completion and resume the
segment only after the client releases the pause. Track the active
descriptor until completion so queued work cannot reissue it while its
interrupt is pending.
Retain terminated descriptors until their callbacks have drained, including
cyclic descriptors that error handling has moved to the completed list.
Serialize interrupt status collection with channel reuse so an old event
cannot complete a replacement transfer.
This series uses the shared virt-dma descriptor-retirement helper [0].
[0] https://lore.kernel.org/r/20261115-submit-sun4i-dma-callback-lifetime-v1-v2-1-fb7d258702f8@gmail.com/
Assisted-by: Codex:gpt-6-astra
Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
---
Changes in v6:
- Retain descriptors through callback synchronization using the posted
virt-dma helper, covering pending, executing and error-completed cyclic
callbacks raised in Mitch's follow-up.
- Serialize interrupt status collection with channel reuse and clear old
completion and error status after successful termination.
- Link to v5: https://patch.msgid.link/20261113-submit-dw-axi-dma-stop-pause-v1-v5-0-8523a27b5788@gmail.com
Changes in v5:
- Use a positive enabled-channel condition in the suspend-status helper,
following Andy's review.
- Initialize the resume result immediately before its first use.
- Separate the lock-protected channel bitfields from the preceding fields.
- Link to v4: https://patch.msgid.link/20261112-submit-dw-axi-dma-stop-pause-v1-v4-0-3ebc24b243db@gmail.com
Changes in v4:
- Add a preparatory fix for cyclic mode leaking between transfers,
following Sashiko's review. Store the mode in each descriptor so
failed preparation, error recovery and queued work cannot change
another transfer's completion handling.
- Link to v3: https://patch.msgid.link/20261110-submit-dw-axi-dma-stop-pause-v1-v3-0-35fdfba8b61d@gmail.com
Changes in v3:
- Wrap the atomic polling calls by argument group and correct their
continuation indentation, following Andy's review.
- Move the termination return-value check simplification into the
channel-enable polling patch.
- Separate the pause-loop conversion to atomic polling from the
pending-request and cyclic-restart changes.
- Annotate the suspend-wait helper with its channel-lock requirement.
- Pack the lock-protected flags into existing padding while keeping
cyclic separately writable, following Andy's review.
- Link to v2: https://patch.msgid.link/20261109-submit-dw-axi-dma-stop-pause-v1-v2-0-64adc48df793@gmail.com
Changes in v2:
- Use readx_poll_timeout_atomic() for the single-argument status helpers
and express the termination polling interval and timeout in milliseconds,
following Andy's review.
- Track pending suspend requests separately from confirmed suspension so
resume can handle acknowledgments received after a pause timeout.
- Use the atomic polling helper, including its final status check, and
report -EAGAIN if resume cannot yet cancel a pending suspend request.
- Defer cyclic restart while paused and track the active descriptor until
completion, preventing resume or issue_pending from reissuing it.
- Reset pause state on successful termination and channel allocation;
clear stale status when starting a new descriptor.
- Link to v1: https://patch.msgid.link/20261108-submit-dw-axi-dma-stop-pause-v1-v1-0-c48ec19e9ee4@gmail.com
To: Eugeniy Paltsev <Eugeniy.Paltsev@synopsys.com>
To: Vinod Koul <vkoul@kernel.org>
To: Frank Li <Frank.Li@kernel.org>
To: Sergey Khimich <serghox@gmail.com>
To: Sia Jee Heng <jee.heng.sia@intel.com>
To: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: dmaengine@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
---
James Hilliard (7):
dmaengine: dw-axi-dmac: keep cyclic mode in the descriptor
dmaengine: dw-axi-dmac: poll the correct enable bit during termination
dmaengine: dw-axi-dmac: retain descriptors when termination times out
dmaengine: dw-axi-dmac: use atomic polling for suspend acknowledgment
dmaengine: dw-axi-dmac: preserve pending pause requests
dmaengine: dw-axi-dmac: retain descriptors until callbacks drain
dmaengine: dw-axi-dmac: serialize interrupt status with channel reuse
drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c | 183 +++++++++++++++++--------
drivers/dma/dw-axi-dmac/dw-axi-dmac.h | 10 +-
2 files changed, 130 insertions(+), 63 deletions(-)
---
base-commit: 6628e7d4c6b25c8d18f1345e3a20d21829aae7e4
base-tree: git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git fixes
change-id: 20261108-submit-dw-axi-dma-stop-pause-v1-c93f1e767169
prerequisite-patch-id: fc343480330da5ff95e5271997fa71107977c2b8
Best regards,
--
James Hilliard <james.hilliard1@gmail.com>
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PATCH v6 0/7] dmaengine: dw-axi-dmac: fix termination and pause acknowledgment
2026-11-17 2:42 ` [PATCH v6 0/7] dmaengine: dw-axi-dmac: fix termination and pause acknowledgment Mitch Barnett
@ 2026-11-17 3:19 ` James Hilliard
0 siblings, 0 replies; 11+ messages in thread
From: James Hilliard @ 2026-11-17 3:19 UTC (permalink / raw)
To: Mitch Barnett
Cc: Eugeniy Paltsev, Vinod Koul, Frank Li, Sergey Khimich,
Andy Shevchenko, Sia Jee Heng, dmaengine@vger.kernel.org,
linux-kernel@vger.kernel.org, Wang YuWei
On Mon, Nov 16, 2026 at 7:43 PM Mitch Barnett <mitch@accuratesound.ca> wrote:
>
> Hi James,
>
> Thank you for incorporating the descriptor-callback lifetime and IRQ/channel-reuse fixes in v6.
>
> We've continued investigating the remaining STOP/ABORT safety question on our Raspberry Pi 5 (RP1) test system, particularly the lifetime of client-owned ALSA PCM buffers after unsuccessful DMA termination.
>
> We've completed several additional investigations against Raspberry Pi Linux 6.18.50, pinned at cff533aec2fa601846766b32ff57204e0a61bed7:
>
> 1. DMAengine/ALSA STOP contract (V24R33): Eight source-executed host tests passed. A simulated dmaengine_terminate_async() failure (-ETIMEDOUT) is not propagated by snd_dmaengine_pcm_trigger(). The snd_dmaengine_pcm_sync_stop() path returns success after callback synchronization without independently verifying hardware quiescence.
>
> 2. ALSA buffer lifetime (V24R34/V24R35): Twelve further source-executed host cases passed. The pinned ALSA core can release managed dynamic buffers despite an hw_free error. Preallocated buffers can be detached and subsequently reused. This exposes a potential client-memory lifetime problem independently of the DMA driver's descriptor pool.
>
> 3. Live RP1 configuration (V24R36–V24R39): Read-only inspection confirmed the HiFiBerry Digi sound card bound through snd-rpi-wm8804 and designware-i2s. The live I²S1 device tree contains TX/RX DMA mappings and no I²S interrupt property. However, its PCM streams do not expose the expected prealloc entries, and we're still reconciling the effective PCM component and allocator.
>
> These are source-level tests and read-only hardware configuration checks. We have not reproduced a client-buffer use-after-free on RP1 hardware.
>
> We've also prepared an isolated combination incorporating Raspberry Pi's per-channel ABORT implementation (PR #7654). It compiles against our matching kernel source, but we have deliberately not installed or exercised it on the hardware.
>
> Our remaining concern is that retaining DMA descriptors does not establish that independently owned PCM pages are safe to release. The Synopsys DW_axi_dmac documentation cautions that an ABORT does not necessarily complete outstanding AXI transactions.
I checked the corresponding mainline paths. Mainline currently warns on
a termination timeout, frees the descriptors and returns success. The v6
change retains those descriptors and returns the error, but that does
not protect a client buffer if the caller ignores the error and proceeds
with cleanup. The final channel-resource release path also still needs
to account for unsuccessful termination.
This is a remaining limitation of the failed-stop handling, rather than
a problem introduced by the descriptor-retention change.
>
> Could you or the other DMAengine maintainers clarify two points?
>
> 1. Hardware quiescence: Is there an RP1-specific hardware condition, or supported controller recovery sequence, that positively guarantees all outstanding DMA transactions have completed after a failed STOP followed by ABORT? In particular, does this account for in-flight AXI/PCIe writes and the shared DMA master?
I cannot confirm an RP1-specific guarantee. The 1.02a databook also
appears internally inconsistent: section 2.15.5 on page 92 describes
completing initiated AXI transfers before reporting the channel aborted,
whereas the CH1_ABORT description on page 178 explicitly warns that
those transfers might not have completed.
That needs clarification before relying on CH_EN clearing after ABORT
as permission to release memory. Mainline does not currently use ABORT,
so the software lifetime issue exists independently of that mechanism.
>
> 2. Client-buffer ownership: If no such guarantee exists, what would be the preferred upstream approach to preventing ALSA from freeing or reusing DMA-addressable PCM memory after an unrecoverable termination failure? Would this require a coordinated DMAengine/ALSA fail-closed mechanism, including the HW_FREE, error-cleanup, close, and device-removal paths?
The DMAengine synchronize contract already requires transfers to have
stopped, as well as callbacks to have finished. DW AXI currently only
calls vchan_synchronize(), which cannot establish hardware quiescence
after termination has failed.
Simply propagating the error through snd_dmaengine_pcm_trigger() would
not be sufficient: the PCM core ignores the STOP return value, and
managed-buffer cleanup proceeds even when hw_free returns an error.
A provider recovery path that guarantees the hardware has stopped
before synchronization returns could avoid introducing new PCM buffer
ownership rules. If that guarantee cannot be provided and cleanup is
allowed to continue, retaining only the descriptor pool is insufficient:
the client buffers and their DMA mappings must also remain valid, with
reuse and removal covered as well.
>
> We're holding off on forced STOP/ABORT testing until we can establish a defensible memory-lifetime contract.
>
> Any guidance on the hardware guarantee or appropriate upstream design would be greatly appreciated.
>
> Thanks again for your work on this.
>
> Kind regards,
> Mitch Barnett
> Accurate Sound
>
> References:
>
> Raspberry Pi per-channel ABORT implementation:
> https://github.com/raspberrypi/linux/pull/7654
>
> Pinned Raspberry Pi kernel source:
> https://github.com/raspberrypi/linux/tree/cff533aec2fa601846766b32ff57204e0a61bed7
>
> ________________________________________
> From: James Hilliard <james.hilliard1@gmail.com>
> Sent: Sunday, November 15, 2026 10:00 PM
> To: Eugeniy Paltsev <Eugeniy.Paltsev@synopsys.com>; Vinod Koul <vkoul@kernel.org>; Frank Li <Frank.Li@kernel.org>; Sergey Khimich <serghox@gmail.com>; Andy Shevchenko <andriy.shevchenko@linux.intel.com>; Sia Jee Heng <jee.heng.sia@intel.com>
> Cc: Mitch Barnett <mitch@accuratesound.ca>; dmaengine@vger.kernel.org <dmaengine@vger.kernel.org>; linux-kernel@vger.kernel.org <linux-kernel@vger.kernel.org>; James Hilliard <james.hilliard1@gmail.com>; stable@vger.kernel.org <stable@vger.kernel.org>; Wang YuWei <1973615295@qq.com>
> Subject: [PATCH v6 0/7] dmaengine: dw-axi-dmac: fix termination and pause acknowledgment
>
> Keep cyclic mode in each descriptor so failed preparation and queued
> work cannot change the completion handling of another transfer.
>
> Use the layout-aware channel enable check during termination and retain
> transfer resources when the channel does not stop. Preserve suspension
> status for the pause and resume paths, including acknowledgments that
> arrive after a polling timeout or during another channel's interrupt.
>
> Keep a pending pause across cyclic segment completion and resume the
> segment only after the client releases the pause. Track the active
> descriptor until completion so queued work cannot reissue it while its
> interrupt is pending.
>
> Retain terminated descriptors until their callbacks have drained, including
> cyclic descriptors that error handling has moved to the completed list.
> Serialize interrupt status collection with channel reuse so an old event
> cannot complete a replacement transfer.
>
> This series uses the shared virt-dma descriptor-retirement helper [0].
>
> [0] https://lore.kernel.org/r/20261115-submit-sun4i-dma-callback-lifetime-v1-v2-1-fb7d258702f8@gmail.com/
>
> Assisted-by: Codex:gpt-6-astra
> Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
> ---
> Changes in v6:
> - Retain descriptors through callback synchronization using the posted
> virt-dma helper, covering pending, executing and error-completed cyclic
> callbacks raised in Mitch's follow-up.
> - Serialize interrupt status collection with channel reuse and clear old
> completion and error status after successful termination.
> - Link to v5: https://patch.msgid.link/20261113-submit-dw-axi-dma-stop-pause-v1-v5-0-8523a27b5788@gmail.com
>
> Changes in v5:
> - Use a positive enabled-channel condition in the suspend-status helper,
> following Andy's review.
> - Initialize the resume result immediately before its first use.
> - Separate the lock-protected channel bitfields from the preceding fields.
> - Link to v4: https://patch.msgid.link/20261112-submit-dw-axi-dma-stop-pause-v1-v4-0-3ebc24b243db@gmail.com
>
> Changes in v4:
> - Add a preparatory fix for cyclic mode leaking between transfers,
> following Sashiko's review. Store the mode in each descriptor so
> failed preparation, error recovery and queued work cannot change
> another transfer's completion handling.
> - Link to v3: https://patch.msgid.link/20261110-submit-dw-axi-dma-stop-pause-v1-v3-0-35fdfba8b61d@gmail.com
>
> Changes in v3:
> - Wrap the atomic polling calls by argument group and correct their
> continuation indentation, following Andy's review.
> - Move the termination return-value check simplification into the
> channel-enable polling patch.
> - Separate the pause-loop conversion to atomic polling from the
> pending-request and cyclic-restart changes.
> - Annotate the suspend-wait helper with its channel-lock requirement.
> - Pack the lock-protected flags into existing padding while keeping
> cyclic separately writable, following Andy's review.
> - Link to v2: https://patch.msgid.link/20261109-submit-dw-axi-dma-stop-pause-v1-v2-0-64adc48df793@gmail.com
>
> Changes in v2:
> - Use readx_poll_timeout_atomic() for the single-argument status helpers
> and express the termination polling interval and timeout in milliseconds,
> following Andy's review.
> - Track pending suspend requests separately from confirmed suspension so
> resume can handle acknowledgments received after a pause timeout.
> - Use the atomic polling helper, including its final status check, and
> report -EAGAIN if resume cannot yet cancel a pending suspend request.
> - Defer cyclic restart while paused and track the active descriptor until
> completion, preventing resume or issue_pending from reissuing it.
> - Reset pause state on successful termination and channel allocation;
> clear stale status when starting a new descriptor.
> - Link to v1: https://patch.msgid.link/20261108-submit-dw-axi-dma-stop-pause-v1-v1-0-c48ec19e9ee4@gmail.com
>
> To: Eugeniy Paltsev <Eugeniy.Paltsev@synopsys.com>
> To: Vinod Koul <vkoul@kernel.org>
> To: Frank Li <Frank.Li@kernel.org>
> To: Sergey Khimich <serghox@gmail.com>
> To: Sia Jee Heng <jee.heng.sia@intel.com>
> To: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> Cc: dmaengine@vger.kernel.org
> Cc: linux-kernel@vger.kernel.org
>
> ---
> James Hilliard (7):
> dmaengine: dw-axi-dmac: keep cyclic mode in the descriptor
> dmaengine: dw-axi-dmac: poll the correct enable bit during termination
> dmaengine: dw-axi-dmac: retain descriptors when termination times out
> dmaengine: dw-axi-dmac: use atomic polling for suspend acknowledgment
> dmaengine: dw-axi-dmac: preserve pending pause requests
> dmaengine: dw-axi-dmac: retain descriptors until callbacks drain
> dmaengine: dw-axi-dmac: serialize interrupt status with channel reuse
>
> drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c | 183 +++++++++++++++++--------
> drivers/dma/dw-axi-dmac/dw-axi-dmac.h | 10 +-
> 2 files changed, 130 insertions(+), 63 deletions(-)
> ---
> base-commit: 6628e7d4c6b25c8d18f1345e3a20d21829aae7e4
> base-tree: git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git fixes
> change-id: 20261108-submit-dw-axi-dma-stop-pause-v1-c93f1e767169
> prerequisite-patch-id: fc343480330da5ff95e5271997fa71107977c2b8
>
> Best regards,
> --
> James Hilliard <james.hilliard1@gmail.com>
^ permalink raw reply [flat|nested] 11+ messages in thread