2015-12-21 19:10:45

by Måns Rullgård

[permalink] [raw]
Subject: [PATCH] dmaengine: dw: clear LLP_[SD]_EN bits in last descriptor of a chain

The datasheet requires that the LLP_[SD]_EN bits be cleared whenever
LLP.LOC is zero, i.e. in the last descriptor of a multi-block chain.
Make the driver do this.

Signed-off-by: Mans Rullgard <[email protected]>
---
drivers/dma/dw/core.c | 2 ++
1 file changed, 2 insertions(+)

diff --git a/drivers/dma/dw/core.c b/drivers/dma/dw/core.c
index 7067b6ddc1db..ca7cafc82f6b 100644
--- a/drivers/dma/dw/core.c
+++ b/drivers/dma/dw/core.c
@@ -751,6 +751,7 @@ dwc_prep_dma_memcpy(struct dma_chan *chan, dma_addr_t dest, dma_addr_t src,
prev->lli.ctllo |= DWC_CTLL_INT_EN;

prev->lli.llp = 0;
+ prev->lli.ctllo &= ~(DWC_CTLL_LLP_D_EN | DWC_CTLL_LLP_S_EN);
first->txd.flags = flags;
first->total_len = len;

@@ -912,6 +913,7 @@ slave_sg_fromdev_fill_desc:
prev->lli.ctllo |= DWC_CTLL_INT_EN;

prev->lli.llp = 0;
+ prev->lli.ctllo &= ~(DWC_CTLL_LLP_D_EN | DWC_CTLL_LLP_S_EN);
first->total_len = total_len;

return &first->txd;
--
2.6.3


2015-12-21 19:36:08

by Andy Shevchenko

[permalink] [raw]
Subject: Re: [PATCH] dmaengine: dw: clear LLP_[SD]_EN bits in last descriptor of a chain

On Mon, 2015-12-21 at 19:10 +0000, Mans Rullgard wrote:
> The datasheet requires that the LLP_[SD]_EN bits be cleared whenever
> LLP.LOC is zero, i.e. in the last descriptor of a multi-block chain.
> Make the driver do this.

Acked-by: Andy Shevchenko <[email protected]>

>
> Signed-off-by: Mans Rullgard <[email protected]>
> ---
>  drivers/dma/dw/core.c | 2 ++
>  1 file changed, 2 insertions(+)
>
> diff --git a/drivers/dma/dw/core.c b/drivers/dma/dw/core.c
> index 7067b6ddc1db..ca7cafc82f6b 100644
> --- a/drivers/dma/dw/core.c
> +++ b/drivers/dma/dw/core.c
> @@ -751,6 +751,7 @@ dwc_prep_dma_memcpy(struct dma_chan *chan,
> dma_addr_t dest, dma_addr_t src,
>   prev->lli.ctllo |= DWC_CTLL_INT_EN;
>  
>   prev->lli.llp = 0;
> + prev->lli.ctllo &= ~(DWC_CTLL_LLP_D_EN | DWC_CTLL_LLP_S_EN);
>   first->txd.flags = flags;
>   first->total_len = len;
>  
> @@ -912,6 +913,7 @@ slave_sg_fromdev_fill_desc:
>   prev->lli.ctllo |= DWC_CTLL_INT_EN;
>  
>   prev->lli.llp = 0;
> + prev->lli.ctllo &= ~(DWC_CTLL_LLP_D_EN | DWC_CTLL_LLP_S_EN);
>   first->total_len = total_len;
>  
>   return &first->txd;

--
Andy Shevchenko <[email protected]>
Intel Finland Oy

2015-12-22 05:38:54

by Viresh Kumar

[permalink] [raw]
Subject: Re: [PATCH] dmaengine: dw: clear LLP_[SD]_EN bits in last descriptor of a chain

On 21-12-15, 19:10, Mans Rullgard wrote:
> The datasheet requires that the LLP_[SD]_EN bits be cleared whenever
> LLP.LOC is zero, i.e. in the last descriptor of a multi-block chain.
> Make the driver do this.
>
> Signed-off-by: Mans Rullgard <[email protected]>
> ---
> drivers/dma/dw/core.c | 2 ++
> 1 file changed, 2 insertions(+)

Acked-by: Viresh Kumar <[email protected]>

--
viresh

2015-12-22 16:54:54

by Andy Shevchenko

[permalink] [raw]
Subject: Re: [PATCH] dmaengine: dw: clear LLP_[SD]_EN bits in last descriptor of a chain

On Mon, 2015-12-21 at 21:34 +0200, Andy Shevchenko wrote:
> On Mon, 2015-12-21 at 19:10 +0000, Mans Rullgard wrote:
> > The datasheet requires that the LLP_[SD]_EN bits be cleared
> > whenever
> > LLP.LOC is zero, i.e. in the last descriptor of a multi-block
> > chain.
> > Make the driver do this.
>
> Acked-by: Andy Shevchenko <[email protected]>

Vinod, I would like to postpone this patch for a while to make a bit
easier back porting of other dw_dmac changes wrt fix SATA on 460EX (*).

I will send it later in a bunch. Hope Måns has no objections on this.

(*) Now I'm pretty sure that the main issues with SATA are a) wrong
master settings for transfers and LLP, and b) endiannes issue with
values in LLP. That's why I hope to have those patches coming first
with a proper Fixes: tag.

>
> >
> > Signed-off-by: Mans Rullgard <[email protected]>
> > ---
> >  drivers/dma/dw/core.c | 2 ++
> >  1 file changed, 2 insertions(+)
> >
> > diff --git a/drivers/dma/dw/core.c b/drivers/dma/dw/core.c
> > index 7067b6ddc1db..ca7cafc82f6b 100644
> > --- a/drivers/dma/dw/core.c
> > +++ b/drivers/dma/dw/core.c
> > @@ -751,6 +751,7 @@ dwc_prep_dma_memcpy(struct dma_chan *chan,
> > dma_addr_t dest, dma_addr_t src,
> >   prev->lli.ctllo |= DWC_CTLL_INT_EN;
> >  
> >   prev->lli.llp = 0;
> > + prev->lli.ctllo &= ~(DWC_CTLL_LLP_D_EN |
> > DWC_CTLL_LLP_S_EN);
> >   first->txd.flags = flags;
> >   first->total_len = len;
> >  
> > @@ -912,6 +913,7 @@ slave_sg_fromdev_fill_desc:
> >   prev->lli.ctllo |= DWC_CTLL_INT_EN;
> >  
> >   prev->lli.llp = 0;
> > + prev->lli.ctllo &= ~(DWC_CTLL_LLP_D_EN |
> > DWC_CTLL_LLP_S_EN);
> >   first->total_len = total_len;
> >  
> >   return &first->txd;
>

--
Andy Shevchenko <[email protected]>
Intel Finland Oy
---------------------------------------------------------------------
Intel Finland Oy
Registered Address: PL 281, 00181 Helsinki
Business Identity Code: 0357606 - 4
Domiciled in Helsinki

This e-mail and any attachments may contain confidential material for
the sole use of the intended recipient(s). Any review or distribution
by others is strictly prohibited. If you are not the intended
recipient, please contact the sender and delete all copies.
????{.n?+???????+%?????ݶ??w??{.n?+????{??G?????{ay?ʇڙ?,j??f???h?????????z_??(?階?ݢj"???m??????G????????????&???~???iO???z??v?^?m???? ????????I?