Skip to content

Commit db60a63

Browse files
ADESTMvinodkoul
authored andcommitted
dmaengine: stm32-dma: introduce stm32_dma_sg_inc to manage chan->next_sg
chan->next_sg is used to know which transfer will start after the ongoing one. It is incremented for each new transfer, either on transfer start for non-cyclic transfers, or on transfer complete interrupt for cyclic transfers. For cyclic transfer, when the last item is reached, chan->next_sg must be reinitialized to the first item. Signed-off-by: Amelie Delaunay <amelie.delaunay@foss.st.com> Link: https://lore.kernel.org/r/20220505115611.38845-2-amelie.delaunay@foss.st.com Signed-off-by: Vinod Koul <vkoul@kernel.org>
1 parent d0b360e commit db60a63

1 file changed

Lines changed: 9 additions & 5 deletions

File tree

drivers/dma/stm32-dma.c

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -535,6 +535,13 @@ static void stm32_dma_dump_reg(struct stm32_dma_chan *chan)
535535
dev_dbg(chan2dev(chan), "SFCR: 0x%08x\n", sfcr);
536536
}
537537

538+
static void stm32_dma_sg_inc(struct stm32_dma_chan *chan)
539+
{
540+
chan->next_sg++;
541+
if (chan->desc->cyclic && (chan->next_sg == chan->desc->num_sgs))
542+
chan->next_sg = 0;
543+
}
544+
538545
static void stm32_dma_configure_next_sg(struct stm32_dma_chan *chan);
539546

540547
static void stm32_dma_start_transfer(struct stm32_dma_chan *chan)
@@ -575,7 +582,7 @@ static void stm32_dma_start_transfer(struct stm32_dma_chan *chan)
575582
stm32_dma_write(dmadev, STM32_DMA_SM1AR(chan->id), reg->dma_sm1ar);
576583
stm32_dma_write(dmadev, STM32_DMA_SNDTR(chan->id), reg->dma_sndtr);
577584

578-
chan->next_sg++;
585+
stm32_dma_sg_inc(chan);
579586

580587
/* Clear interrupt status if it is there */
581588
status = stm32_dma_irq_status(chan);
@@ -606,9 +613,6 @@ static void stm32_dma_configure_next_sg(struct stm32_dma_chan *chan)
606613
dma_scr = stm32_dma_read(dmadev, STM32_DMA_SCR(id));
607614

608615
if (dma_scr & STM32_DMA_SCR_DBM) {
609-
if (chan->next_sg == chan->desc->num_sgs)
610-
chan->next_sg = 0;
611-
612616
sg_req = &chan->desc->sg_req[chan->next_sg];
613617

614618
if (dma_scr & STM32_DMA_SCR_CT) {
@@ -630,7 +634,7 @@ static void stm32_dma_handle_chan_done(struct stm32_dma_chan *chan)
630634
if (chan->desc) {
631635
if (chan->desc->cyclic) {
632636
vchan_cyclic_callback(&chan->desc->vdesc);
633-
chan->next_sg++;
637+
stm32_dma_sg_inc(chan);
634638
stm32_dma_configure_next_sg(chan);
635639
} else {
636640
chan->busy = false;

0 commit comments

Comments
 (0)