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

Commit 7f3ff14b authored by Jiada Wang's avatar Jiada Wang Committed by Vinod Koul
Browse files

dmaengine: imx-sdma: add 1ms delay to ensure SDMA channel is stopped 



sdma_disable_channel() cannot ensure dma is stopped to access
module's FIFOs. There is chance SDMA core is running and accessing
BD when disable of corresponding channel, this may cause sometimes
even after call of .sdma_disable_channel(), SDMA core still be
running and accessing module's FIFOs.

According to NXP R&D team a delay of one BD SDMA cost time (maximum
is 1ms) should be added after disable of the channel bit, to ensure
SDMA core has really been stopped after SDMA clients call
.device_terminate_all.

This patch introduces adds a new function sdma_disable_channel_with_delay()
which simply adds 1ms delay after call sdma_disable_channel(),
and set it as .device_terminate_all.

Signed-off-by: default avatarJiada Wang <jiada_wang@mentor.com>
Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
parent 1175f83c

drivers/dma/imx-sdma.c

+16 −1
Original line number Diff line number Diff line
@@ -937,6 +937,21 @@ static int sdma_disable_channel(struct dma_chan *chan) 
	return 0;

}



static int sdma_disable_channel_with_delay(struct dma_chan *chan)

{

	sdma_disable_channel(chan);



	/*

	 * According to NXP R&D team a delay of one BD SDMA cost time

	 * (maximum is 1ms) should be added after disable of the channel

	 * bit, to ensure SDMA core has really been stopped after SDMA

	 * clients call .device_terminate_all.

	 */

	mdelay(1);



	return 0;

}



static void sdma_set_watermarklevel_for_p2p(struct sdma_channel *sdmac)

{

	struct sdma_engine *sdma = sdmac->sdma;
@@ -1828,7 +1843,7 @@ static int sdma_probe(struct platform_device *pdev) 
	sdma->dma_device.device_prep_slave_sg = sdma_prep_slave_sg;

	sdma->dma_device.device_prep_dma_cyclic = sdma_prep_dma_cyclic;

	sdma->dma_device.device_config = sdma_config;

	sdma->dma_device.device_terminate_all = sdma_disable_channel;

	sdma->dma_device.device_terminate_all = sdma_disable_channel_with_delay;

	sdma->dma_device.src_addr_widths = BIT(DMA_SLAVE_BUSWIDTH_4_BYTES);

	sdma->dma_device.dst_addr_widths = BIT(DMA_SLAVE_BUSWIDTH_4_BYTES);

	sdma->dma_device.directions = BIT(DMA_DEV_TO_MEM) | BIT(DMA_MEM_TO_DEV);