From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Date: Wed, 18 Dec 2013 21:54:46 +0530
From: Vinod Koul <vinod.koul@intel.com>
To: Linus Walleij <linus.walleij@linaro.org>,
	Dan Williams <dan.j.williams@intel.com>
Cc: linux-kernel@vger.kernel.org, stable@vger.kernel.org,
	Alban Bedel <alban.bedel@avionic-design.de>,
	Tomasz Figa <tomasz.figa@gmail.com>
Subject: Re: [PATCH 1/2] dma: pl08x: fix descriptor unmapping
Message-ID: <20131218162446.GL16227@intel.com>
References: <1386976567-31343-1-git-send-email-linus.walleij@linaro.org>
 <20131218162036.GK16227@intel.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
In-Reply-To: <20131218162036.GK16227@intel.com>
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <stable.vger.kernel.org>

On Wed, Dec 18, 2013 at 09:50:36PM +0530, Vinod Koul wrote:
> On Sat, Dec 14, 2013 at 12:16:07AM +0100, Linus Walleij wrote:
> > The descriptor unmapping code introduced in commit
> > d38a8c622a1b3 "dmaengine: prepare for generic 'unmap' data"
> > accidentally affects a local struct rather than the
> > async TX descriptor, resulting in this compile error:
> > 
> >   CC      drivers/dma/amba-pl08x.o
> > drivers/dma/amba-pl08x.c: In function ‘pl08x_desc_free’:
> > drivers/dma/amba-pl08x.c:1172:2: warning: passing argument 1 of
> > ‘dma_descriptor_unmap’ from incompatible pointer type [enabled by default]
> > In file included from linux/include/linux/amba/pl08x.h:21:0,
> >                  from linux/drivers/dma/amba-pl08x.c:79:
> > linux/include/linux/dmaengine.h:476:20: note: expected
> > ‘struct dma_async_tx_descriptor *’ but argument is of type ‘struct pl08x_txd *’
> > 
> > Cc: stable@vger.kernel.org
> I am going to apply this and send thru fixes. But I dont think stable tag is apt
> here. IIRC d38a8c622a1b3 was merged in last merge window, so as long this gets
> sent in current -rc's we should be fine
And this was fixes by 89116bf9 - Fix pl08x warnings, and this is in Linus's
tree. So no action here!

--
~Vinod
> 
> Dropping stable, pls do yell if you feel otherwise.
> 
> --
> ~Vinod
> > Cc: Dan Williams <dan.j.williams@intel.com>
> > Cc: Alban Bedel <alban.bedel@avionic-design.de>
> > Cc: Tomasz Figa <tomasz.figa@gmail.com>
> > Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
> > ---
> >  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.3.1
> > 
> 
> -- 

--