Re: [PATCH] dmaengine: fix cyclic dma usage

[Nicolas Ferre]

On 05/11/2012 08:24 AM, Vinod Koul :
> 
>>From 24db9e25a31ac46327253f11908463c48518dec8 Mon Sep 17 00:00:00 2001
> From: Vinod Koul <vinod.koul@xxxxxxxxxxxxxxx>
> Date: Fri, 11 May 2012 11:48:21 +0530
> Subject: [PATCH] dmaengine: fix cyclic dma usage
> 
> for cyclic dma, dont mark the descriptor as complete.
> Fix the remaining users of cyclic dma which do so
> 
> Signed-off-by: Vinod Koul <vinod.koul@xxxxxxxxxxxxxxx>

Vinod,

Thanks for taking care of this, I have tested:
Tested-by: Nicolas Ferre <nicolas.ferre@xxxxxxxxx>
and:
Acked-by: Nicolas Ferre <nicolas.ferre@xxxxxxxxx>


> ---
> Looking for tested by for these two
> ---
>  drivers/dma/at_hdmac.c   |    4 +++-
>  drivers/dma/ep93xx_dma.c |    4 +++-
>  2 files changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/dma/at_hdmac.c b/drivers/dma/at_hdmac.c
> index 445fdf8..bf0d7e4 100644
> --- a/drivers/dma/at_hdmac.c
> +++ b/drivers/dma/at_hdmac.c
> @@ -245,7 +245,9 @@ atc_chain_complete(struct at_dma_chan *atchan, struct at_desc *desc)
>  	dev_vdbg(chan2dev(&atchan->chan_common),
>  		"descriptor %u complete\n", txd->cookie);
>  
> -	dma_cookie_complete(txd);
> +	/* mark the descriptor as complete for non cyclic cases only */
> +	if (!atc_chan_is_cyclic(atchan))
> +		dma_cookie_complete(txd);
>  
>  	/* move children to free_list */
>  	list_splice_init(&desc->tx_list, &atchan->free_list);
> diff --git a/drivers/dma/ep93xx_dma.c b/drivers/dma/ep93xx_dma.c
> index e6f133b..f6e9b57 100644
> --- a/drivers/dma/ep93xx_dma.c
> +++ b/drivers/dma/ep93xx_dma.c
> @@ -703,7 +703,9 @@ static void ep93xx_dma_tasklet(unsigned long data)
>  	desc = ep93xx_dma_get_active(edmac);
>  	if (desc) {
>  		if (desc->complete) {
> -			dma_cookie_complete(&desc->txd);
> +			/* mark descriptor complete for non cyclic case only */
> +			if (!test_bit(EP93XX_DMA_IS_CYCLIC, &edmac->flags))
> +				dma_cookie_complete(&desc->txd);
>  			list_splice_init(&edmac->active, &list);
>  		}
>  		callback = desc->txd.callback;


-- 
Nicolas Ferre
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/