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

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

dmaengine: consolidate assignment of DMA cookies 



Everyone deals with assigning DMA cookies in the same way (it's part of
the API so they should be), so lets consolidate the common code into a
helper function to avoid this duplication.

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 d2ebfb33

drivers/dma/amba-pl08x.c

+3 −6
Original line number Diff line number Diff line
@@ -921,13 +921,10 @@ static dma_cookie_t pl08x_tx_submit(struct dma_async_tx_descriptor *tx) 
	struct pl08x_dma_chan *plchan = to_pl08x_chan(tx->chan);

	struct pl08x_txd *txd = to_pl08x_txd(tx);

	unsigned long flags;

	dma_cookie_t cookie;



	spin_lock_irqsave(&plchan->lock, flags);



	plchan->chan.cookie += 1;

	if (plchan->chan.cookie < 0)

		plchan->chan.cookie = 1;

	tx->cookie = plchan->chan.cookie;

	cookie = dma_cookie_assign(tx);



	/* Put this onto the pending list */

	list_add_tail(&txd->node, &plchan->pend_list);
@@ -947,7 +944,7 @@ static dma_cookie_t pl08x_tx_submit(struct dma_async_tx_descriptor *tx) 


	spin_unlock_irqrestore(&plchan->lock, flags);



	return tx->cookie;

	return cookie;

}



static struct dma_async_tx_descriptor *pl08x_prep_dma_interrupt(

drivers/dma/at_hdmac.c

+1 −22
Original line number Diff line number Diff line
@@ -192,27 +192,6 @@ static void atc_desc_chain(struct at_desc **first, struct at_desc **prev, 
	*prev = desc;

}



/**

 * atc_assign_cookie - compute and assign new cookie

 * @atchan: channel we work on

 * @desc: descriptor to assign cookie for

 *

 * Called with atchan->lock held and bh disabled

 */

static dma_cookie_t

atc_assign_cookie(struct at_dma_chan *atchan, struct at_desc *desc)

{

	dma_cookie_t cookie = atchan->chan_common.cookie;



	if (++cookie < 0)

		cookie = 1;



	atchan->chan_common.cookie = cookie;

	desc->txd.cookie = cookie;



	return cookie;

}



/**

 * atc_dostart - starts the DMA engine for real

 * @atchan: the channel we want to start
@@ -548,7 +527,7 @@ static dma_cookie_t atc_tx_submit(struct dma_async_tx_descriptor *tx) 
	unsigned long		flags;



	spin_lock_irqsave(&atchan->lock, flags);

	cookie = atc_assign_cookie(atchan, desc);

	cookie = dma_cookie_assign(tx);



	if (list_empty(&atchan->active_list)) {

		dev_vdbg(chan2dev(tx->chan), "tx_submit: started %u\n",

drivers/dma/coh901318.c

+3 −17
Original line number Diff line number Diff line
@@ -318,20 +318,6 @@ static int coh901318_prep_linked_list(struct coh901318_chan *cohc, 


	return 0;

}

static dma_cookie_t

coh901318_assign_cookie(struct coh901318_chan *cohc,

			struct coh901318_desc *cohd)

{

	dma_cookie_t cookie = cohc->chan.cookie;



	if (++cookie < 0)

		cookie = 1;



	cohc->chan.cookie = cookie;

	cohd->desc.cookie = cookie;



	return cookie;

}



static struct coh901318_desc *

coh901318_desc_get(struct coh901318_chan *cohc)
@@ -966,16 +952,16 @@ coh901318_tx_submit(struct dma_async_tx_descriptor *tx) 
						   desc);

	struct coh901318_chan *cohc = to_coh901318_chan(tx->chan);

	unsigned long flags;

	dma_cookie_t cookie;



	spin_lock_irqsave(&cohc->lock, flags);



	tx->cookie = coh901318_assign_cookie(cohc, cohd);

	cookie = dma_cookie_assign(tx);



	coh901318_desc_queue(cohc, cohd);



	spin_unlock_irqrestore(&cohc->lock, flags);



	return tx->cookie;

	return cookie;

}



static struct dma_async_tx_descriptor *

drivers/dma/dmaengine.h

+20 −0
Original line number Diff line number Diff line
@@ -7,4 +7,24 @@ 


#include <linux/dmaengine.h>



/**

 * dma_cookie_assign - assign a DMA engine cookie to the descriptor

 * @tx: descriptor needing cookie

 *

 * Assign a unique non-zero per-channel cookie to the descriptor.

 * Note: caller is expected to hold a lock to prevent concurrency.

 */

static inline dma_cookie_t dma_cookie_assign(struct dma_async_tx_descriptor *tx)

{

	struct dma_chan *chan = tx->chan;

	dma_cookie_t cookie;



	cookie = chan->cookie + 1;

	if (cookie < DMA_MIN_COOKIE)

		cookie = DMA_MIN_COOKIE;

	tx->cookie = chan->cookie = cookie;



	return cookie;

}



#endif

drivers/dma/dw_dmac.c

+1 −16
Original line number Diff line number Diff line
@@ -157,21 +157,6 @@ static void dwc_desc_put(struct dw_dma_chan *dwc, struct dw_desc *desc) 
	}

}



/* Called with dwc->lock held and bh disabled */

static dma_cookie_t

dwc_assign_cookie(struct dw_dma_chan *dwc, struct dw_desc *desc)

{

	dma_cookie_t cookie = dwc->chan.cookie;



	if (++cookie < 0)

		cookie = 1;



	dwc->chan.cookie = cookie;

	desc->txd.cookie = cookie;



	return cookie;

}



static void dwc_initialize(struct dw_dma_chan *dwc)

{

	struct dw_dma *dw = to_dw_dma(dwc->chan.device);
@@ -603,7 +588,7 @@ static dma_cookie_t dwc_tx_submit(struct dma_async_tx_descriptor *tx) 
	unsigned long		flags;



	spin_lock_irqsave(&dwc->lock, flags);

	cookie = dwc_assign_cookie(dwc, desc);

	cookie = dma_cookie_assign(tx);



	/*

	 * REVISIT: We should attempt to chain as many descriptors as