[PATCH] dmaengine: ste_dma40: do not remove descriptors for cyclic transfers

[PATCH] dmaengine: ste_dma40: do not remove descriptors for cyclic transfers

[Fabio Baltieri]

Fix dma_tc_handle() to call d40_desc_remove() and d40_desc_done() only
for non-cyclic transfers, as this was breaking ux500_pcm since
introduced in:

d49278e dmaengine: dma40: Add support to split up large elements

Reported-by: Shreshtha Kumar Sahu <shreshthakumar.sahu@stericsson.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Fabio Baltieri <fabio.baltieri@linaro.org>
---

Hello Vinod,

the bug fixed by this patch was around for some time, but the affected
driver (ux500_pcm) will be enabled in next release cycle for other
reasons so this patch can safely go on -next.

Would you take it your tree?

Thanks,
Fabio

 drivers/dma/ste_dma40.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/dma/ste_dma40.c b/drivers/dma/ste_dma40.c
index ad860a2..1734fee 100644
--- a/drivers/dma/ste_dma40.c
+++ b/drivers/dma/ste_dma40.c
@@ -1570,10 +1570,10 @@ static void dma_tc_handle(struct d40_chan *d40c)
 			d40c->busy = false;
 		pm_runtime_mark_last_busy(d40c->base->dev);
 		pm_runtime_put_autosuspend(d40c->base->dev);
-	}
 
-	d40_desc_remove(d40d);
-	d40_desc_done(d40c, d40d);
+		d40_desc_remove(d40d);
+		d40_desc_done(d40c, d40d);
+	}
 
 	d40c->pending_tx++;
 	tasklet_schedule(&d40c->tasklet);
-- 
1.7.12.1

Re: [PATCH] dmaengine: ste_dma40: do not remove descriptors for cyclic transfers

[Vinod Koul]

On Thu, Feb 14, 2013 at 10:03:10AM +0100, Fabio Baltieri wrote:
> Fix dma_tc_handle() to call d40_desc_remove() and d40_desc_done() only
> for non-cyclic transfers, as this was breaking ux500_pcm since
> introduced in:
> 
> d49278e dmaengine: dma40: Add support to split up large elements
> 
> Reported-by: Shreshtha Kumar Sahu <shreshthakumar.sahu@stericsson.com>
> Acked-by: Linus Walleij <linus.walleij@linaro.org>
> Signed-off-by: Fabio Baltieri <fabio.baltieri@linaro.org>
> ---
> 
> Hello Vinod,
> 
> the bug fixed by this patch was around for some time, but the affected
> driver (ux500_pcm) will be enabled in next release cycle for other
> reasons so this patch can safely go on -next.
> 
> Would you take it your tree?
Sure, applied thanks

--
~Vinod
> 
> Thanks,
> Fabio
> 
>  drivers/dma/ste_dma40.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/dma/ste_dma40.c b/drivers/dma/ste_dma40.c
> index ad860a2..1734fee 100644
> --- a/drivers/dma/ste_dma40.c
> +++ b/drivers/dma/ste_dma40.c
> @@ -1570,10 +1570,10 @@ static void dma_tc_handle(struct d40_chan *d40c)
>  			d40c->busy = false;
>  		pm_runtime_mark_last_busy(d40c->base->dev);
>  		pm_runtime_put_autosuspend(d40c->base->dev);
> -	}
>  
> -	d40_desc_remove(d40d);
> -	d40_desc_done(d40c, d40d);
> +		d40_desc_remove(d40d);
> +		d40_desc_done(d40c, d40d);
> +	}
>  
>  	d40c->pending_tx++;
>  	tasklet_schedule(&d40c->tasklet);
> -- 
> 1.7.12.1
>