Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e57cb3b3 authored by Pierre Yves MORDRET's avatar Pierre Yves MORDRET Committed by Vinod Koul
Browse files

dmaengine: stm32-dma: fix incomplete configuration in cyclic mode 



When in cyclic mode, the configuration is updated after having started the
DMA hardware (STM32_DMA_SCR_EN) leading to incomplete configuration of
SMxAR registers.

Signed-off-by: default avatarPierre-Yves MORDRET <pierre-yves.mordret@st.com>
Signed-off-by: default avatarHugues Fruchet <hugues.fruchet@st.com>
Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
parent 951f44cb

drivers/dma/stm32-dma.c

+6 −2
Original line number Diff line number Diff line
@@ -441,6 +441,8 @@ static void stm32_dma_dump_reg(struct stm32_dma_chan *chan) 
	dev_dbg(chan2dev(chan), "SFCR:  0x%08x\n", sfcr);

}



static void stm32_dma_configure_next_sg(struct stm32_dma_chan *chan);



static void stm32_dma_start_transfer(struct stm32_dma_chan *chan)

{

	struct stm32_dma_device *dmadev = stm32_dma_get_dev(chan);
@@ -483,6 +485,9 @@ static void stm32_dma_start_transfer(struct stm32_dma_chan *chan) 
	if (status)

		stm32_dma_irq_clear(chan, status);



	if (chan->desc->cyclic)

		stm32_dma_configure_next_sg(chan);



	stm32_dma_dump_reg(chan);



	/* Start DMA */
@@ -576,8 +581,7 @@ static void stm32_dma_issue_pending(struct dma_chan *c) 
	if (vchan_issue_pending(&chan->vchan) && !chan->desc && !chan->busy) {

		dev_dbg(chan2dev(chan), "vchan %p: issued\n", &chan->vchan);

		stm32_dma_start_transfer(chan);

		if (chan->desc->cyclic)

			stm32_dma_configure_next_sg(chan);



	}

	spin_unlock_irqrestore(&chan->vchan.lock, flags);

}