2012-05-11 06:30:55

by Vinod Koul

Subject: [PATCH] dmaengine: fix cyclic dma usage

>From 24db9e25a31ac46327253f11908463c48518dec8 Mon Sep 17 00:00:00 2001
From: Vinod Koul <[email protected]>
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 <[email protected]>
---
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;
--
1.7.0.4


--
~Vinod

2012-05-11 09:41:08

by Nicolas Ferre

Subject: Re: [PATCH] dmaengine: fix cyclic dma usage

On 05/11/2012 08:24 AM, Vinod Koul :
>
>>From 24db9e25a31ac46327253f11908463c48518dec8 Mon Sep 17 00:00:00 2001
> From: Vinod Koul <[email protected]>
> 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 <[email protected]>

Vinod,

Thanks for taking care of this, I have tested:
Tested-by: Nicolas Ferre <[email protected]>
and:
Acked-by: Nicolas Ferre <[email protected]>


> ---
> 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

2012-05-12 19:33:41

by Mika Westerberg

Subject: Re: [PATCH] dmaengine: fix cyclic dma usage

On Fri, May 11, 2012 at 11:54:09AM +0530, Vinod Koul wrote:
>
> >From 24db9e25a31ac46327253f11908463c48518dec8 Mon Sep 17 00:00:00 2001
> From: Vinod Koul <[email protected]>
> 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 <[email protected]>

On ep93xx works perfectly.

Tested-by: Mika Westerberg <[email protected]>

2012-05-15 03:21:31

by Vinod Koul

Subject: Re: [PATCH] dmaengine: fix cyclic dma usage

On Sat, 2012-05-12 at 22:32 +0300, Mika Westerberg wrote:
> On Fri, May 11, 2012 at 11:54:09AM +0530, Vinod Koul wrote:
> >
> > >From 24db9e25a31ac46327253f11908463c48518dec8 Mon Sep 17 00:00:00 2001
> > From: Vinod Koul <[email protected]>
> > 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 <[email protected]>
>
> On ep93xx works perfectly.
>
> Tested-by: Mika Westerberg <[email protected]>
Thanks, applied now.

--
~Vinod