github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-11-07 06:17:02 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

dmaengine: dw-edma: Prepare LL progress event handling

Browse Source 
A later patch records each observed LL event (STOP or PROGRESS) together
with the LLP sample taken in the same interrupt-handler pass. It needs a
provider operation to clear stale LL interrupt status before a channel
restart. Add it.

Centralize runtime request updates in dw_edma_set_request(). A later
patch uses it to cancel a pending LL recheck when STOP or PAUSE changes
the channel policy. Rename the existing workqueue event bits to
distinguish them from provider IRQ events.

No functional change.

Reviewed-by: Frank Li <Frank.Li@nxp.com>
Signed-off-by: Koichiro Den <den@valinux.co.jp>
Link: https://patch.msgid.link/20260820173439.2004068-9-den@valinux.co.jp
Signed-off-by: Vinod Koul <vkoul@kernel.org>
This commit is contained in:
Koichiro Den 2026-08-21 02:34:37 +09:00 committed by Vinod Koul
parent 080b8cfa01
commit 33ea2d4e68
4 changed files with 29 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
drivers/dma/dw-edma/dw-edma-core.c
View File

@ -30,9 +30,9 @@ struct dw_edma_desc *vd2dw_edma_desc(struct virt_dma_desc *vd)
return container_of(vd, struct dw_edma_desc, vd);
}
enum dw_edma_irq_event {
DW_EDMA_IRQ_DONE = BIT(0),
DW_EDMA_IRQ_ABORT = BIT(1),
enum dw_edma_deferred_event {
DW_EDMA_DEFERRED_DONE = BIT(0),
DW_EDMA_DEFERRED_ABORT = BIT(1),
};
static inline
@ -73,6 +73,13 @@ static void vchan_free_desc(struct virt_dma_desc *vdesc)
kfree(vd2dw_edma_desc(vdesc));
}
/* Must be called with vc.lock held. */
static void
dw_edma_set_request(struct dw_edma_chan *chan, enum dw_edma_request request)
{
chan->request = request;
}
static void dw_hdma_set_callback_result(struct virt_dma_desc *vd,
enum dmaengine_tx_result result)
{
@ -243,7 +250,7 @@ static void dw_edma_finish_termination(struct dw_edma_chan *chan)
if (!chan->non_ll && dw_edma_ll_pending(chan))
dw_edma_core_reset_ll(chan);
chan->request = EDMA_REQ_NONE;
dw_edma_set_request(chan, EDMA_REQ_NONE);
chan->status = EDMA_ST_IDLE;
}
@ -360,7 +367,7 @@ static int dw_edma_device_pause(struct dma_chan *dchan)
else if (chan->request != EDMA_REQ_NONE)
err = -EPERM;
else
chan->request = EDMA_REQ_PAUSE;
dw_edma_set_request(chan, EDMA_REQ_PAUSE);
return err;
}
@ -410,10 +417,10 @@ static int dw_edma_device_terminate_all(struct dma_chan *dchan)
} else if (chan->request > EDMA_REQ_PAUSE) {
err = -EPERM;
} else {
chan->request = EDMA_REQ_STOP;
dw_edma_set_request(chan, EDMA_REQ_STOP);
}
if (chan->status == EDMA_ST_IDLE)
chan->request = EDMA_REQ_NONE;
dw_edma_set_request(chan, EDMA_REQ_NONE);
return err;
}
@ -724,7 +731,7 @@ static void dw_edma_done_interrupt(struct dw_edma_chan *chan)
}
if (chan->request == EDMA_REQ_PAUSE) {
chan->request = EDMA_REQ_NONE;
dw_edma_set_request(chan, EDMA_REQ_NONE);
chan->status = EDMA_ST_PAUSE;
break;
}
@ -764,7 +771,7 @@ static void dw_edma_abort_interrupt(struct dw_edma_chan *chan)
}
if (!chan->non_ll)
dw_edma_core_reset_ll(chan);
chan->request = EDMA_REQ_NONE;
dw_edma_set_request(chan, EDMA_REQ_NONE);
chan->status = EDMA_ST_IDLE;
spin_unlock_irqrestore(&chan->vc.lock, flags);
}
@ -778,15 +785,15 @@ static void dw_edma_irq_work(struct work_struct *work)
do {
events = atomic_xchg(&chan->irq_pending, 0);
if (events & DW_EDMA_IRQ_DONE)
if (events & DW_EDMA_DEFERRED_DONE)
dw_edma_done_interrupt(chan);
if (events & DW_EDMA_IRQ_ABORT)
if (events & DW_EDMA_DEFERRED_ABORT)
dw_edma_abort_interrupt(chan);
} while (atomic_read(&chan->irq_pending));
}
static void dw_edma_queue_irq_work(struct dw_edma_chan *chan,
enum dw_edma_irq_event event)
enum dw_edma_deferred_event event)
{
atomic_or(event, &chan->irq_pending);
queue_work(chan->dw->wq, &chan->irq_work);
@ -794,12 +801,12 @@ static void dw_edma_queue_irq_work(struct dw_edma_chan *chan,
static void dw_edma_done_interrupt_deferred(struct dw_edma_chan *chan)
{
dw_edma_queue_irq_work(chan, DW_EDMA_IRQ_DONE);
dw_edma_queue_irq_work(chan, DW_EDMA_DEFERRED_DONE);
}
static void dw_edma_abort_interrupt_deferred(struct dw_edma_chan *chan)
{
dw_edma_queue_irq_work(chan, DW_EDMA_IRQ_ABORT);
dw_edma_queue_irq_work(chan, DW_EDMA_DEFERRED_ABORT);
}
static void dw_edma_emul_irq_ack(struct irq_data *d)

6
drivers/dma/dw-edma/dw-edma-core.h
View File

@ -163,6 +163,7 @@ struct dw_edma_core_ops {
void (*ll_link)(struct dw_edma_chan *chan, u32 idx, bool cb, u64 addr);
void (*ll_clear)(struct dw_edma_chan *chan, u32 idx);
int (*ll_cur_idx)(struct dw_edma_chan *chan);
void (*ll_irq_clear)(struct dw_edma_chan *chan);
void (*ch_doorbell)(struct dw_edma_chan *chan);
void (*ch_enable)(struct dw_edma_chan *chan);
void (*ch_config)(struct dw_edma_chan *chan);
@ -284,6 +285,11 @@ static inline void dw_edma_core_ll_clear(struct dw_edma_chan *chan, u32 idx)
chan->dw->core->ll_clear(chan, idx);
}
static inline void dw_edma_core_ll_irq_clear(struct dw_edma_chan *chan)
{
chan->dw->core->ll_irq_clear(chan);
}
static inline void dw_edma_core_ch_doorbell(struct dw_edma_chan *chan)
{
chan->dw->core->ch_doorbell(chan);

1
drivers/dma/dw-edma/dw-edma-v0-core.c
View File

@ -686,6 +686,7 @@ static const struct dw_edma_core_ops dw_edma_v0_core = {
.ll_link = dw_edma_v0_core_ll_link,
.ll_clear = dw_edma_v0_core_ll_clear,
.ll_cur_idx = dw_edma_v0_core_ll_cur_idx,
.ll_irq_clear = dw_edma_v0_core_clear_done_int,
.ch_doorbell = dw_edma_v0_core_ch_doorbell,
.ch_enable = dw_edma_v0_core_ch_enable,
.ch_config = dw_edma_v0_core_ch_config,

1
drivers/dma/dw-edma/dw-hdma-v0-core.c
View File

@ -442,6 +442,7 @@ static const struct dw_edma_core_ops dw_hdma_v0_core = {
.ll_link = dw_hdma_v0_core_ll_link,
.ll_clear = dw_hdma_v0_core_ll_clear,
.ll_cur_idx = dw_hdma_v0_core_ll_cur_idx,
.ll_irq_clear = dw_hdma_v0_core_clear_done_int,
.ch_doorbell = dw_hdma_v0_core_ch_doorbell,
.ch_enable = dw_hdma_v0_core_ch_enable,
.ch_config = dw_hdma_v0_core_ch_config,