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

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

dmaengine: stm32-dma: fix DMA IRQ status handling 



Update the way Transfer Complete and Half Transfer Complete status are
acknowledge. Even if HTI is not enabled its status is shown when reading
registers, driver has to clear it gently and not raise an error.

Signed-off-by: default avatarPierre-Yves MORDRET <pierre-yves.mordret@st.com>
Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
parent a2b6103b

drivers/dma/stm32-dma.c

+25 −4
Original line number Diff line number Diff line
@@ -34,9 +34,14 @@ 
#define STM32_DMA_LIFCR			0x0008 /* DMA Low Int Flag Clear Reg */

#define STM32_DMA_HIFCR			0x000c /* DMA High Int Flag Clear Reg */

#define STM32_DMA_TCI			BIT(5) /* Transfer Complete Interrupt */

#define STM32_DMA_HTI			BIT(4) /* Half Transfer Interrupt */

#define STM32_DMA_TEI			BIT(3) /* Transfer Error Interrupt */

#define STM32_DMA_DMEI			BIT(2) /* Direct Mode Error Interrupt */

#define STM32_DMA_FEI			BIT(0) /* FIFO Error Interrupt */

#define STM32_DMA_MASKI			(STM32_DMA_TCI \

					 | STM32_DMA_TEI \

					 | STM32_DMA_DMEI \

					 | STM32_DMA_FEI)



/* DMA Stream x Configuration Register */

#define STM32_DMA_SCR(x)		(0x0010 + 0x18 * (x)) /* x = 0..7 */
@@ -643,13 +648,29 @@ static irqreturn_t stm32_dma_chan_irq(int irq, void *devid) 
	status = stm32_dma_irq_status(chan);

	scr = stm32_dma_read(dmadev, STM32_DMA_SCR(chan->id));



	if ((status & STM32_DMA_TCI) && (scr & STM32_DMA_SCR_TCIE)) {

	if (status & STM32_DMA_TCI) {

		stm32_dma_irq_clear(chan, STM32_DMA_TCI);

		if (scr & STM32_DMA_SCR_TCIE)

			stm32_dma_handle_chan_done(chan);



	} else {

		status &= ~STM32_DMA_TCI;

	}

	if (status & STM32_DMA_HTI) {

		stm32_dma_irq_clear(chan, STM32_DMA_HTI);

		status &= ~STM32_DMA_HTI;

	}

	if (status & STM32_DMA_FEI) {

		stm32_dma_irq_clear(chan, STM32_DMA_FEI);

		status &= ~STM32_DMA_FEI;

		if (!(scr & STM32_DMA_SCR_EN))

			dev_err(chan2dev(chan), "FIFO Error\n");

		else

			dev_dbg(chan2dev(chan), "FIFO over/underrun\n");

	}

	if (status) {

		stm32_dma_irq_clear(chan, status);

		dev_err(chan2dev(chan), "DMA error: status=0x%08x\n", status);

		if (!(scr & STM32_DMA_SCR_EN))

			dev_err(chan2dev(chan), "chan disabled by HW\n");

	}



	spin_unlock(&chan->vchan.lock);