dmaengine: ste_dma40: Recover coalesced cyclic callbacks

DMA40 has one terminal-count status bit per channel, so cyclic period
interrupts can coalesce.

Use the memory-side pointer displacement to queue the minimum observable
number of callbacks. If sampling fails, queue one callback and invalidate
the saved position; the next successful sample resynchronizes without
recounting it.

The pointer is modulo the cyclic buffer: a displacement of d periods can
mean d plus n complete iterations of the buffer. Report d, so the driver
could have missed n iterations of the buffer; DMA40 has no counter to
recover them. For an unchanged pointer, report one callback rather than
risk a spurious full-buffer burst.

This condition has not been seen in practice and is only a product of
review comments that the buffer can miss interrupts.

The preceding cyclic-residue fix ensures that every cyclic period fits in
one LLI, so each boundary corresponds to one client callback.

Fixes: 0c842b5510 ("dma40: cyclic xfer support")
Assisted-by: LLM
Signed-off-by: Linus Walleij <linusw@kernel.org>
Reviewed-by: Frank Li <Frank.Li@nxp.com>
Link: https://patch.msgid.link/20260927-dma40-fixes-v7-3-89f595e8851d@kernel.org
Signed-off-by: Vinod Koul <vkoul@kernel.org>
This commit is contained in:
Linus Walleij 2026-09-27 11:03:16 +02:00 committed by Vinod Koul
parent c80edceff2
commit db28400d92

View File

@ -384,11 +384,14 @@ struct d40_lli_pool {
* @cyclic_dma_addr: Start address of the cyclic buffer.
* @cyclic_buf_len: Length of the cyclic buffer.
* @cyclic_residue: Last valid cyclic residue sample.
* @cyclic_period_len: Length of one cyclic period.
* @cyclic_callback_pos: Position after the callbacks already queued.
* @txd: DMA engine struct. Used for among other things for communication
* during a transfer.
* @node: List entry.
* @is_in_client_list: true if the client owns this descriptor.
* @cyclic: true if this is a cyclic job
* @cyclic_callback_pos_valid: Whether cyclic_callback_pos is reliable.
*
* This descriptor is used for both logical and physical transfers.
*/
@ -405,12 +408,15 @@ struct d40_desc {
dma_addr_t cyclic_dma_addr;
size_t cyclic_buf_len;
size_t cyclic_residue;
size_t cyclic_period_len;
size_t cyclic_callback_pos;
struct dma_async_tx_descriptor txd;
struct list_head node;
bool is_in_client_list;
bool cyclic;
bool cyclic_callback_pos_valid;
};
/**
@ -1482,6 +1488,61 @@ static bool d40_cyclic_offset(struct d40_chan *d40c, struct d40_desc *d40d,
return false;
}
static unsigned int d40_cyclic_periods_elapsed(struct d40_chan *d40c,
struct d40_desc *d40d)
{
size_t current_pos;
size_t delta;
size_t offset;
unsigned int periods;
if (!d40d->cyclic_period_len)
return 1;
if (!d40_cyclic_offset(d40c, d40d, &offset)) {
d40d->cyclic_callback_pos_valid = false;
return 1;
}
current_pos = rounddown(offset, d40d->cyclic_period_len);
if (!d40_residue(d40c) && current_pos != offset)
current_pos += d40d->cyclic_period_len;
if (current_pos == d40d->cyclic_buf_len)
current_pos = 0;
if (!d40d->cyclic_callback_pos_valid) {
/*
* The previous interrupt was reported without a pointer
* sample. Resynchronize without using the stale position,
* which would count that callback again.
*/
d40d->cyclic_callback_pos = current_pos;
d40d->cyclic_callback_pos_valid = true;
return 1;
}
/*
* The pointer wraps with the cyclic buffer, so its displacement is
* only the minimum number of elapsed periods. Complete buffer laps
* are not observable.
*/
delta = (current_pos + d40d->cyclic_buf_len -
d40d->cyclic_callback_pos) % d40d->cyclic_buf_len;
periods = delta / d40d->cyclic_period_len;
if (!periods) {
/*
* The TC status is a single latched bit. An unchanged pointer
* cannot distinguish a complete lap from a repeated interrupt,
* so do not amplify it into a buffer's worth of callbacks.
*/
periods = 1;
}
d40d->cyclic_callback_pos = current_pos;
return periods;
}
static bool d40_tx_is_linked(struct d40_chan *d40c)
{
bool is_link;
@ -1604,6 +1665,7 @@ static struct d40_desc *d40_queue_start(struct d40_chan *d40c)
static void dma_tc_handle(struct d40_chan *d40c)
{
struct d40_desc *d40d;
unsigned int callbacks = 1;
/* Get first active entry from list */
d40d = d40_first_active_get(d40c);
@ -1628,6 +1690,8 @@ static void dma_tc_handle(struct d40_chan *d40c)
if (d40d->lli_current == d40d->lli_len)
d40d->lli_current = 0;
}
callbacks = d40_cyclic_periods_elapsed(d40c, d40d);
} else {
d40_lcla_free_all(d40c, d40d);
@ -1648,7 +1712,7 @@ static void dma_tc_handle(struct d40_chan *d40c)
d40_desc_done(d40c, d40d);
}
d40c->pending_tx++;
d40c->pending_tx += callbacks;
tasklet_schedule(&d40c->tasklet);
}
@ -2633,6 +2697,9 @@ dma40_prep_dma_cyclic(struct dma_chan *chan, dma_addr_t dma_addr,
desc->cyclic_dma_addr = buf_addr;
desc->cyclic_buf_len = buf_len;
desc->cyclic_residue = buf_len;
desc->cyclic_period_len = period_len;
desc->cyclic_callback_pos = 0;
desc->cyclic_callback_pos_valid = true;
}
kfree(sg);