On Fri, Dec 12, 2025 at 05:24:48PM -0500, Frank Li wrote: > Use common dw_edma_core_start() for both edma and hdmi. Remove .start()
s/edma/eDMA s/hdmi/HDMA Here and below. > callback functions at edma and hdmi. > > HDMI set CYCLE_BIT for each chunk. Now only set it when first is true. The > logic is the same because previous ll_max is -1, so first is always true. > How ll_max is related to 'desc->xfer_sz'? - Mani > Signed-off-by: Frank Li <[email protected]> > --- > drivers/dma/dw-edma/dw-edma-core.c | 24 ++++++++++++++++-- > drivers/dma/dw-edma/dw-edma-core.h | 7 ----- > drivers/dma/dw-edma/dw-edma-v0-core.c | 48 > ----------------------------------- > drivers/dma/dw-edma/dw-hdma-v0-core.c | 43 +++---------------------------- > 4 files changed, 25 insertions(+), 97 deletions(-) > > diff --git a/drivers/dma/dw-edma/dw-edma-core.c > b/drivers/dma/dw-edma/dw-edma-core.c > index > 5b12af20cb37156a8dec440401d956652b890d53..37918f733eb4d36c7ced6418b85a885affadc8f7 > 100644 > --- a/drivers/dma/dw-edma/dw-edma-core.c > +++ b/drivers/dma/dw-edma/dw-edma-core.c > @@ -163,9 +163,29 @@ static void vchan_free_desc(struct virt_dma_desc *vdesc) > dw_edma_free_desc(vd2dw_edma_desc(vdesc)); > } > > +static void dw_edma_core_start(struct dw_edma_chunk *chunk, bool first) > +{ > + struct dw_edma_chan *chan = chunk->chan; > + struct dw_edma_burst *child; > + u32 i = 0; > + int j; > + > + j = chunk->bursts_alloc; > + list_for_each_entry(child, &chunk->burst->list, list) { > + j--; > + dw_edma_core_ll_data(chan, child, i++, chunk->cb, !j); > + } > + > + dw_edma_core_ll_link(chan, i, chunk->cb, chan->ll_region.paddr); > + > + if (first) > + dw_edma_core_ch_enable(chan); > + > + dw_edma_core_ch_doorbell(chan); > +} > + > static int dw_edma_start_transfer(struct dw_edma_chan *chan) > { > - struct dw_edma *dw = chan->dw; > struct dw_edma_chunk *child; > struct dw_edma_desc *desc; > struct virt_dma_desc *vd; > @@ -183,7 +203,7 @@ static int dw_edma_start_transfer(struct dw_edma_chan > *chan) > if (!child) > return 0; > > - dw_edma_core_start(dw, child, !desc->xfer_sz); > + dw_edma_core_start(child, !desc->xfer_sz); > desc->xfer_sz += child->xfer_sz; > dw_edma_free_burst(child); > list_del(&child->list); > diff --git a/drivers/dma/dw-edma/dw-edma-core.h > b/drivers/dma/dw-edma/dw-edma-core.h > index > 2b5defae133c360f142394f9fab35c4748a893da..7a0d8405eb7feaedf4b19fd83bbeb5d24781bb7b > 100644 > --- a/drivers/dma/dw-edma/dw-edma-core.h > +++ b/drivers/dma/dw-edma/dw-edma-core.h > @@ -124,7 +124,6 @@ struct dw_edma_core_ops { > enum dma_status (*ch_status)(struct dw_edma_chan *chan); > irqreturn_t (*handle_int)(struct dw_edma_irq *dw_irq, enum dw_edma_dir > dir, > dw_edma_handler_t done, dw_edma_handler_t > abort); > - void (*start)(struct dw_edma_chunk *chunk, bool first); > void (*ll_data)(struct dw_edma_chan *chan, struct dw_edma_burst *burst, > u32 idx, bool cb, bool irq); > void (*ll_link)(struct dw_edma_chan *chan, u32 idx, bool cb, u64 addr); > @@ -195,12 +194,6 @@ dw_edma_core_handle_int(struct dw_edma_irq *dw_irq, enum > dw_edma_dir dir, > return dw_irq->dw->core->handle_int(dw_irq, dir, done, abort); > } > > -static inline > -void dw_edma_core_start(struct dw_edma *dw, struct dw_edma_chunk *chunk, > bool first) > -{ > - dw->core->start(chunk, first); > -} > - > static inline > void dw_edma_core_ch_config(struct dw_edma_chan *chan) > { > diff --git a/drivers/dma/dw-edma/dw-edma-v0-core.c > b/drivers/dma/dw-edma/dw-edma-v0-core.c > index > 59ee219f1abddd48806dec953ce96afdc87ffdab..c5f381d00b9773e52c1134cfea3ac3a04c7bef52 > 100644 > --- a/drivers/dma/dw-edma/dw-edma-v0-core.c > +++ b/drivers/dma/dw-edma/dw-edma-v0-core.c > @@ -379,36 +379,6 @@ static void dw_edma_v0_core_ch_enable(struct > dw_edma_chan *chan) > upper_32_bits(chan->ll_region.paddr)); > } > > -static void dw_edma_v0_core_write_chunk(struct dw_edma_chunk *chunk) > -{ > - struct dw_edma_burst *child; > - struct dw_edma_chan *chan = chunk->chan; > - u32 control = 0, i = 0; > - int j; > - > - if (chunk->cb) > - control = DW_EDMA_V0_CB; > - > - j = chunk->bursts_alloc; > - list_for_each_entry(child, &chunk->burst->list, list) { > - j--; > - if (!j) { > - control |= DW_EDMA_V0_LIE; > - if (!(chan->dw->chip->flags & DW_EDMA_CHIP_LOCAL)) > - control |= DW_EDMA_V0_RIE; > - } > - > - dw_edma_v0_write_ll_data(chan, i++, control, child->sz, > - child->sar, child->dar); > - } > - > - control = DW_EDMA_V0_LLP | DW_EDMA_V0_TCB; > - if (!chunk->cb) > - control |= DW_EDMA_V0_CB; > - > - dw_edma_v0_write_ll_link(chan, i, control, chan->ll_region.paddr); > -} > - > static void dw_edma_v0_sync_ll_data(struct dw_edma_chan *chan) > { > /* > @@ -423,23 +393,6 @@ static void dw_edma_v0_sync_ll_data(struct dw_edma_chan > *chan) > readl(chan->ll_region.vaddr.io); > } > > -static void dw_edma_v0_core_start(struct dw_edma_chunk *chunk, bool first) > -{ > - struct dw_edma_chan *chan = chunk->chan; > - struct dw_edma *dw = chan->dw; > - > - dw_edma_v0_core_write_chunk(chunk); > - > - if (first) > - dw_edma_v0_core_ch_enable(chan); > - > - dw_edma_v0_sync_ll_data(chan); > - > - /* Doorbell */ > - SET_RW_32(dw, chan->dir, doorbell, > - FIELD_PREP(EDMA_V0_DOORBELL_CH_MASK, chan->id)); > -} > - > static void dw_edma_v0_core_ch_config(struct dw_edma_chan *chan) > { > struct dw_edma *dw = chan->dw; > @@ -562,7 +515,6 @@ static const struct dw_edma_core_ops dw_edma_v0_core = { > .ch_count = dw_edma_v0_core_ch_count, > .ch_status = dw_edma_v0_core_ch_status, > .handle_int = dw_edma_v0_core_handle_int, > - .start = dw_edma_v0_core_start, > .ll_data = dw_edma_v0_core_ll_data, > .ll_link = dw_edma_v0_core_ll_link, > .ch_doorbell = dw_edma_v0_core_ch_doorbell, > diff --git a/drivers/dma/dw-edma/dw-hdma-v0-core.c > b/drivers/dma/dw-edma/dw-hdma-v0-core.c > index > 94350bb2bdcd6e29d8a42380160a5bd77caf4680..7f9fe3a6edd94583fd09c80a8d79527ed6383a8c > 100644 > --- a/drivers/dma/dw-edma/dw-hdma-v0-core.c > +++ b/drivers/dma/dw-edma/dw-hdma-v0-core.c > @@ -217,26 +217,10 @@ static void dw_hdma_v0_core_ch_enable(struct > dw_edma_chan *chan) > lower_32_bits(chan->ll_region.paddr)); > SET_CH_32(dw, chan->dir, chan->id, llp.msb, > upper_32_bits(chan->ll_region.paddr)); > -} > - > -static void dw_hdma_v0_core_write_chunk(struct dw_edma_chunk *chunk) > -{ > - struct dw_edma_chan *chan = chunk->chan; > - struct dw_edma_burst *child; > - u32 control = 0, i = 0; > - > - if (chunk->cb) > - control = DW_HDMA_V0_CB; > - > - list_for_each_entry(child, &chunk->burst->list, list) > - dw_hdma_v0_write_ll_data(chan, i++, control, child->sz, > - child->sar, child->dar); > - > - control = DW_HDMA_V0_LLP | DW_HDMA_V0_TCB; > - if (!chunk->cb) > - control |= DW_HDMA_V0_CB; > > - dw_hdma_v0_write_ll_link(chan, i, control, > chunk->chan->ll_region.paddr); > + /* Set consumer cycle */ > + SET_CH_32(dw, chan->dir, chan->id, cycle_sync, > + HDMA_V0_CONSUMER_CYCLE_STAT | HDMA_V0_CONSUMER_CYCLE_BIT); > } > > static void dw_hdma_v0_sync_ll_data(struct dw_edma_chan *chan) > @@ -253,26 +237,6 @@ static void dw_hdma_v0_sync_ll_data(struct dw_edma_chan > *chan) > readl(chan->ll_region.vaddr.io); > } > > -static void dw_hdma_v0_core_start(struct dw_edma_chunk *chunk, bool first) > -{ > - struct dw_edma_chan *chan = chunk->chan; > - struct dw_edma *dw = chan->dw; > - > - dw_hdma_v0_core_write_chunk(chunk); > - > - if (first) > - dw_hdma_v0_core_ch_enable(chan); > - > - /* Set consumer cycle */ > - SET_CH_32(dw, chan->dir, chan->id, cycle_sync, > - HDMA_V0_CONSUMER_CYCLE_STAT | HDMA_V0_CONSUMER_CYCLE_BIT); > - > - dw_hdma_v0_sync_ll_data(chan); > - > - /* Doorbell */ > - SET_CH_32(dw, chan->dir, chan->id, doorbell, HDMA_V0_DOORBELL_START); > -} > - > static void dw_hdma_v0_core_ch_config(struct dw_edma_chan *chan) > { > struct dw_edma *dw = chan->dw; > @@ -332,7 +296,6 @@ static const struct dw_edma_core_ops dw_hdma_v0_core = { > .ch_count = dw_hdma_v0_core_ch_count, > .ch_status = dw_hdma_v0_core_ch_status, > .handle_int = dw_hdma_v0_core_handle_int, > - .start = dw_hdma_v0_core_start, > .ll_data = dw_hdma_v0_core_ll_data, > .ll_link = dw_hdma_v0_core_ll_link, > .ch_doorbell = dw_hdma_v0_core_ch_doorbell, > > -- > 2.34.1 > -- மணிவண்ணன் சதாசிவம்
