[PATCH] dmaengine: pl08x: fix conversioin for generic unmap data

[PATCH] dmaengine: pl08x: fix conversioin for generic unmap data

[Olof Johansson]

commit d38a8c622a1b ('dmaengine: prepare for generic 'unmap' data')
added a generic unmap call but used the wrong argument for it. Fix it.

Fixes: d38a8c622a1b ('dmaengine: prepare for generic 'unmap' data')
Signed-off-by: Olof Johansson <olof@lixom.net>
---

I can't actually tell what the intent of d38a8cc622a1b and how mappings
are expected to be managed, but it's obviously passing the wrong thing
in here so it seems like the appropriate fix.

 drivers/dma/amba-pl08x.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/dma/amba-pl08x.c b/drivers/dma/amba-pl08x.c
index 16a2aa28f856..ec4ee5c1fe9d 100644
--- a/drivers/dma/amba-pl08x.c
+++ b/drivers/dma/amba-pl08x.c
@@ -1169,7 +1169,7 @@ static void pl08x_desc_free(struct virt_dma_desc *vd)
 	struct pl08x_txd *txd = to_pl08x_txd(&vd->tx);
 	struct pl08x_dma_chan *plchan = to_pl08x_chan(vd->tx.chan);
 
-	dma_descriptor_unmap(txd);
+	dma_descriptor_unmap(&vd->tx);
 	if (!txd->done)
 		pl08x_release_mux(plchan);
 
-- 
1.8.4.1.601.g02b3b1d

Re: [PATCH] dmaengine: pl08x: fix conversioin for generic unmap data

[Dan Williams]

Thanks, Olof I'll push this shortly.  I'll add your acked-by to this
one from Russell.

https://patchwork.kernel.org/patch/3241941/

--
Dan

On Tue, Nov 26, 2013 at 8:53 PM, Olof Johansson <olof@lixom.net> wrote:
> commit d38a8c622a1b ('dmaengine: prepare for generic 'unmap' data')
> added a generic unmap call but used the wrong argument for it. Fix it.
>
> Fixes: d38a8c622a1b ('dmaengine: prepare for generic 'unmap' data')
> Signed-off-by: Olof Johansson <olof@lixom.net>
> ---
>
> I can't actually tell what the intent of d38a8cc622a1b and how mappings
> are expected to be managed, but it's obviously passing the wrong thing
> in here so it seems like the appropriate fix.
>
>  drivers/dma/amba-pl08x.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/dma/amba-pl08x.c b/drivers/dma/amba-pl08x.c
> index 16a2aa28f856..ec4ee5c1fe9d 100644
> --- a/drivers/dma/amba-pl08x.c
> +++ b/drivers/dma/amba-pl08x.c
> @@ -1169,7 +1169,7 @@ static void pl08x_desc_free(struct virt_dma_desc *vd)
>         struct pl08x_txd *txd = to_pl08x_txd(&vd->tx);
>         struct pl08x_dma_chan *plchan = to_pl08x_chan(vd->tx.chan);
>
> -       dma_descriptor_unmap(txd);
> +       dma_descriptor_unmap(&vd->tx);
>         if (!txd->done)
>                 pl08x_release_mux(plchan);
>
> --
> 1.8.4.1.601.g02b3b1d
>

Re: [PATCH] dmaengine: pl08x: fix conversioin for generic unmap data

[Olof Johansson]

On Wed, Nov 27, 2013 at 11:38 AM, Dan Williams <dan.j.williams@intel.com> wrote:
> Thanks, Olof I'll push this shortly.  I'll add your acked-by to this
> one from Russell.
>
> https://patchwork.kernel.org/patch/3241941/

Sure, sounds good. I've posted a couple more as well (the at_hdmac one
I posted yesterday) and "[PATCH] dma: mv_xor: remove
mv_desc_get_dest_addr()" from Jason Cooper.


-Olof

Re: [PATCH] dmaengine: pl08x: fix conversioin for generic unmap data

[Dan Williams]

On Wed, Nov 27, 2013 at 11:44 AM, Olof Johansson <olof@lixom.net> wrote:
> On Wed, Nov 27, 2013 at 11:38 AM, Dan Williams <dan.j.williams@intel.com> wrote:
>> Thanks, Olof I'll push this shortly.  I'll add your acked-by to this
>> one from Russell.
>>
>> https://patchwork.kernel.org/patch/3241941/
>
> Sure, sounds good. I've posted a couple more as well (the at_hdmac one
> I posted yesterday) and "[PATCH] dma: mv_xor: remove
> mv_desc_get_dest_addr()" from Jason Cooper.
>

Yup, those are in the patchwork queue, just waiting on my test build
to tell me there aren't any others.

Re: [PATCH] dmaengine: pl08x: fix conversioin for generic unmap data

[Dan Williams]

On Tue, Nov 26, 2013 at 8:53 PM, Olof Johansson <olof@lixom.net> wrote:
> commit d38a8c622a1b ('dmaengine: prepare for generic 'unmap' data')
> added a generic unmap call but used the wrong argument for it. Fix it.
>
> Fixes: d38a8c622a1b ('dmaengine: prepare for generic 'unmap' data')
> Signed-off-by: Olof Johansson <olof@lixom.net>
> ---
>
> I can't actually tell what the intent of d38a8cc622a1b and how mappings
> are expected to be managed, but it's obviously passing the wrong thing
> in here so it seems like the appropriate fix.
>

For most dma-slave usage cases the client is explicitly handling the
lifetime of the dma mappings.  It's primarily the mem-to-mem usage
cases that rely on the dma driver to do the unmapping when the
transaction is complete.  dma_descriptor_unmap() is a common
implementation rather than requiring each driver to implement it
uniquely.  Longer term we can require all clients to handle their
mapping lifetimes and remove the responsibility from the individual
drivers completely.

Re: [PATCH] dmaengine: pl08x: fix conversioin for generic unmap data

[Vinod Koul]

On Wed, Nov 27, 2013 at 11:55:01AM -0800, Dan Williams wrote:
> On Tue, Nov 26, 2013 at 8:53 PM, Olof Johansson <olof@lixom.net> wrote:
> > commit d38a8c622a1b ('dmaengine: prepare for generic 'unmap' data')
> > added a generic unmap call but used the wrong argument for it. Fix it.
> >
> > Fixes: d38a8c622a1b ('dmaengine: prepare for generic 'unmap' data')
> > Signed-off-by: Olof Johansson <olof@lixom.net>
> > ---
> >
> > I can't actually tell what the intent of d38a8cc622a1b and how mappings
> > are expected to be managed, but it's obviously passing the wrong thing
> > in here so it seems like the appropriate fix.
> >
> 
> For most dma-slave usage cases the client is explicitly handling the
> lifetime of the dma mappings.  It's primarily the mem-to-mem usage
> cases that rely on the dma driver to do the unmapping when the
> transaction is complete.  dma_descriptor_unmap() is a common
> implementation rather than requiring each driver to implement it
> uniquely.  Longer term we can require all clients to handle their
> mapping lifetimes and remove the responsibility from the individual
> drivers completely.
I think that would make sense and also remove any abuiguity on who does the
mapping in different usages..

~Vinod

Re: [PATCH] dmaengine: pl08x: fix conversioin for generic unmap data

[Vinod Koul]

On Tue, Nov 26, 2013 at 08:53:24PM -0800, Olof Johansson wrote:
> commit d38a8c622a1b ('dmaengine: prepare for generic 'unmap' data')
> added a generic unmap call but used the wrong argument for it. Fix it.
> 
> Fixes: d38a8c622a1b ('dmaengine: prepare for generic 'unmap' data')
> Signed-off-by: Olof Johansson <olof@lixom.net>
Acked-by: Vinod Koul <vinod.koul@Intel.com>

> ---
> 
> I can't actually tell what the intent of d38a8cc622a1b and how mappings
> are expected to be managed, but it's obviously passing the wrong thing
> in here so it seems like the appropriate fix.
> 
>  drivers/dma/amba-pl08x.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/dma/amba-pl08x.c b/drivers/dma/amba-pl08x.c
> index 16a2aa28f856..ec4ee5c1fe9d 100644
> --- a/drivers/dma/amba-pl08x.c
> +++ b/drivers/dma/amba-pl08x.c
> @@ -1169,7 +1169,7 @@ static void pl08x_desc_free(struct virt_dma_desc *vd)
>  	struct pl08x_txd *txd = to_pl08x_txd(&vd->tx);
>  	struct pl08x_dma_chan *plchan = to_pl08x_chan(vd->tx.chan);
>  
> -	dma_descriptor_unmap(txd);
> +	dma_descriptor_unmap(&vd->tx);
>  	if (!txd->done)
>  		pl08x_release_mux(plchan);
>  
> -- 
> 1.8.4.1.601.g02b3b1d
> 

--