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

Commit 96a2af41 authored by Russell King - ARM Linux's avatar Russell King - ARM Linux Committed by Vinod Koul
Browse files

dmaengine: consolidate tx_status functions 



Now that we have the completed cookie in the dma_chan structure, we
can consolidate the tx_status functions by providing a function to set
the txstate structure and returning the DMA status.  We also provide
a separate helper to set the residue for cookies which are still in
progress.

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
Tested-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Acked-by: default avatarJassi Brar <jassisinghbrar@gmail.com>
[imx-sdma.c & mxs-dma.c]
Tested-by: default avatarShawn Guo <shawn.guo@linaro.org>
Signed-off-by: default avatarVinod Koul <vinod.koul@linux.intel.com>
parent f7fbce07

drivers/dma/amba-pl08x.c

+4 −18
Original line number Diff line number Diff line
@@ -964,31 +964,17 @@ static enum dma_status pl08x_dma_tx_status(struct dma_chan *chan, 
		dma_cookie_t cookie, struct dma_tx_state *txstate)

{

	struct pl08x_dma_chan *plchan = to_pl08x_chan(chan);

	dma_cookie_t last_used;

	dma_cookie_t last_complete;

	enum dma_status ret;

	u32 bytesleft = 0;



	last_used = plchan->chan.cookie;

	last_complete = plchan->chan.completed_cookie;



	ret = dma_async_is_complete(cookie, last_complete, last_used);

	if (ret == DMA_SUCCESS) {

		dma_set_tx_state(txstate, last_complete, last_used, 0);

	ret = dma_cookie_status(chan, cookie, txstate);

	if (ret == DMA_SUCCESS)

		return ret;

	}



	/*

	 * This cookie not complete yet

	 * Get number of bytes left in the active transactions and queue

	 */

	last_used = plchan->chan.cookie;

	last_complete = plchan->chan.completed_cookie;



	/* Get number of bytes left in the active transactions and queue */

	bytesleft = pl08x_getbytes_chan(plchan);



	dma_set_tx_state(txstate, last_complete, last_used,

			 bytesleft);

	dma_set_residue(txstate, pl08x_getbytes_chan(plchan));



	if (plchan->state == PL08X_CHAN_PAUSED)

		return DMA_PAUSED;

drivers/dma/at_hdmac.c

+6 −12
Original line number Diff line number Diff line
@@ -996,26 +996,20 @@ atc_tx_status(struct dma_chan *chan, 


	spin_lock_irqsave(&atchan->lock, flags);



	last_complete = chan->completed_cookie;

	last_used = chan->cookie;



	ret = dma_async_is_complete(cookie, last_complete, last_used);

	ret = dma_cookie_status(chan, cookie, txstate);

	if (ret != DMA_SUCCESS) {

		atc_cleanup_descriptors(atchan);



		ret = dma_cookie_status(chan, cookie, txstate);

	}



	last_complete = chan->completed_cookie;

	last_used = chan->cookie;



		ret = dma_async_is_complete(cookie, last_complete, last_used);

	}



	spin_unlock_irqrestore(&atchan->lock, flags);



	if (ret != DMA_SUCCESS)

		dma_set_tx_state(txstate, last_complete, last_used,

			atc_first_active(atchan)->len);

	else

		dma_set_tx_state(txstate, last_complete, last_used, 0);

		dma_set_residue(txstate, atc_first_active(atchan)->len);



	if (atc_chan_is_paused(atchan))

		ret = DMA_PAUSED;

drivers/dma/coh901318.c

+4 −9
Original line number Diff line number Diff line
@@ -1151,17 +1151,12 @@ coh901318_tx_status(struct dma_chan *chan, dma_cookie_t cookie, 
		 struct dma_tx_state *txstate)

{

	struct coh901318_chan *cohc = to_coh901318_chan(chan);

	dma_cookie_t last_used;

	dma_cookie_t last_complete;

	int ret;



	last_complete = chan->completed_cookie;

	last_used = chan->cookie;

	enum dma_status ret;



	ret = dma_async_is_complete(cookie, last_complete, last_used);

	ret = dma_cookie_status(chan, cookie, txstate);

	/* FIXME: should be conditional on ret != DMA_SUCCESS? */

	dma_set_residue(txstate, coh901318_get_bytes_left(chan));



	dma_set_tx_state(txstate, last_complete, last_used,

			 coh901318_get_bytes_left(chan));

	if (ret == DMA_IN_PROGRESS && cohc->stopped)

		ret = DMA_PAUSED;

drivers/dma/dmaengine.h

+31 −0
Original line number Diff line number Diff line
@@ -45,4 +45,35 @@ static inline void dma_cookie_complete(struct dma_async_tx_descriptor *tx) 
	tx->cookie = 0;

}



/**

 * dma_cookie_status - report cookie status

 * @chan: dma channel

 * @cookie: cookie we are interested in

 * @state: dma_tx_state structure to return last/used cookies

 *

 * Report the status of the cookie, filling in the state structure if

 * non-NULL.  No locking is required.

 */

static inline enum dma_status dma_cookie_status(struct dma_chan *chan,

	dma_cookie_t cookie, struct dma_tx_state *state)

{

	dma_cookie_t used, complete;



	used = chan->cookie;

	complete = chan->completed_cookie;

	barrier();

	if (state) {

		state->last = complete;

		state->used = used;

		state->residue = 0;

	}

	return dma_async_is_complete(cookie, complete, used);

}



static inline void dma_set_residue(struct dma_tx_state *state, u32 residue)

{

	if (state)

		state->residue = residue;

}



#endif

drivers/dma/dw_dmac.c

+4 −15
Original line number Diff line number Diff line
@@ -979,28 +979,17 @@ dwc_tx_status(struct dma_chan *chan, 
	      struct dma_tx_state *txstate)

{

	struct dw_dma_chan	*dwc = to_dw_dma_chan(chan);

	dma_cookie_t		last_used;

	dma_cookie_t		last_complete;

	int			ret;

	enum dma_status		ret;



	last_complete = chan->completed_cookie;

	last_used = chan->cookie;



	ret = dma_async_is_complete(cookie, last_complete, last_used);

	ret = dma_cookie_status(chan, cookie, txstate);

	if (ret != DMA_SUCCESS) {

		dwc_scan_descriptors(to_dw_dma(chan->device), dwc);



		last_complete = chan->completed_cookie;

		last_used = chan->cookie;



		ret = dma_async_is_complete(cookie, last_complete, last_used);

		ret = dma_cookie_status(chan, cookie, txstate);

	}



	if (ret != DMA_SUCCESS)

		dma_set_tx_state(txstate, last_complete, last_used,

				dwc_first_active(dwc)->len);

	else

		dma_set_tx_state(txstate, last_complete, last_used, 0);

		dma_set_residue(txstate, dwc_first_active(dwc)->len);



	if (dwc->paused)

		return DMA_PAUSED;