On Tuesday, March 06, 2012 3:35 PM, Russell King wrote:
>
> 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: Russell King <rmk+ker...@arm.linux.org.uk>
> ---
<snip>
> drivers/dma/dmaengine.h | 20 ++++++++++++++++++++
<snip>
> drivers/dma/ep93xx_dma.c | 9 +--------
<snip>
> diff --git a/drivers/dma/dmaengine.h b/drivers/dma/dmaengine.h
> index 968570d..7692c86 100644
> --- a/drivers/dma/dmaengine.h
> +++ b/drivers/dma/dmaengine.h
> @@ -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
<snip>
> diff --git a/drivers/dma/ep93xx_dma.c b/drivers/dma/ep93xx_dma.c
> index 3260198..e5aaae8 100644
> --- a/drivers/dma/ep93xx_dma.c
> +++ b/drivers/dma/ep93xx_dma.c
> @@ -783,17 +783,10 @@ static dma_cookie_t ep93xx_dma_tx_submit(struct
> dma_async_tx_descriptor *tx)
> unsigned long flags;
>
> spin_lock_irqsave(&edmac->lock, flags);
> -
> - cookie = edmac->chan.cookie;
> -
> - if (++cookie < 0)
> - cookie = 1;
> + cookie = dma_cookie_assign(tx);
>
> desc = container_of(tx, struct ep93xx_dma_desc, txd);
>
> - edmac->chan.cookie = cookie;
> - desc->txd.cookie = cookie;
> -
> /*
> * If nothing is currently prosessed, we push this descriptor
> * directly to the hardware. Otherwise we put the descriptor
For ep93xx:
Tested-by: H Hartley Sweeten <hswee...@visionengravers.com>
Acked-by: H Hartley Sweeten <hswee...@visionengravers.com>
_______________________________________________
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev
