Commit 689d3c5e authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Vinod Koul
Browse files

dmaengine: omap-dma: Fix polled channel completion detection and handling 



When based on the CCR_ENABLE bit the channel is stopped we should not call
omap_dma_callback(), only change the return value to DMA_COMPLETE. Client
drivers will do the right thing to clean up the channel after the transfer
has been completed.
Check the CCR_ENABLE only if the channel is running and not paused since
pause in sDMA means that the channel is stopped.
This will fix one hard to reproduce race condition when the channel is
terminated during transfer (affecting cyclic operation).

Fixes: 1a7cf7b2 ("dmaengine: omap-dma: Handle cases when the channel is polled for completion")

Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
parent f55532a0

drivers/dma/omap-dma.c

+16 −6
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ struct omap_chan { 
	unsigned dma_sig;

	bool cyclic;

	bool paused;

	bool running;



	int dma_ch;

	struct omap_desc *desc;
@@ -294,6 +295,8 @@ static void omap_dma_start(struct omap_chan *c, struct omap_desc *d) 


	/* Enable channel */

	omap_dma_chan_write(c, CCR, d->ccr | CCR_ENABLE);



	c->running = true;

}



static void omap_dma_stop(struct omap_chan *c)
@@ -355,6 +358,8 @@ static void omap_dma_stop(struct omap_chan *c) 


		omap_dma_chan_write(c, CLNK_CTRL, val);

	}



	c->running = false;

}



static void omap_dma_start_sg(struct omap_chan *c, struct omap_desc *d,
@@ -673,15 +678,20 @@ static enum dma_status omap_dma_tx_status(struct dma_chan *chan, 
	struct omap_chan *c = to_omap_dma_chan(chan);

	struct virt_dma_desc *vd;

	enum dma_status ret;

	uint32_t ccr;

	unsigned long flags;



	ccr = omap_dma_chan_read(c, CCR);

	/* The channel is no longer active, handle the completion right away */

	ret = dma_cookie_status(chan, cookie, txstate);



	if (!c->paused && c->running) {

		uint32_t ccr = omap_dma_chan_read(c, CCR);

		/*

		 * The channel is no longer active, set the return value

		 * accordingly

		 */

		if (!(ccr & CCR_ENABLE))

		omap_dma_callback(c->dma_ch, 0, c);

			ret = DMA_COMPLETE;

	}



	ret = dma_cookie_status(chan, cookie, txstate);

	if (ret == DMA_COMPLETE || !txstate)

		return ret;

CRA Git | Maintained and supported by SUSTech CRA and CCSE