Re: [PATCH 1/3] ARM: shmobile: armadillo: Fix coherent DMA mask

[Laurent Pinchart <laurent.pinchart@ideasonboard.com>]

Hi Simon,

On Thursday 19 December 2013 15:31:20 Simon Horman wrote:
> On Mon, Dec 16, 2013 at 03:53:57PM -0800, Kuninori Morimoto wrote:
> > Hi
> > 
> > > Commit 4dcfa60071b3d23f0181f27d8519f12e37cefbb9 ("ARM: DMA-API: better
> > > handing of DMA masks for coherent allocations") added an additional
> > > check to the coherent DMA mask that results in an error when the mask is
> > > larger than what dma_addr_t can address.
> > > 
> > > Set the LCDC coherent DMA mask to DMA_BIT_MASK(32) instead of ~0 to fix
> > > the problem.
> > > 
> > > Signed-off-by: Laurent Pinchart
> > > <laurent.pinchart+renesas@ideasonboard.com>
> > > ---
> > 
> > For all patches
> > 
> > Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> 
> Thanks, I have queued these up as fixes for v3.13.

Thank you. Could you please tell me in which branch I can find them ?

> For my own reference: The commit referenced above appeared in v3.12-rc2.
> 
> > >  arch/arm/mach-shmobile/board-armadillo800eva.c | 4 ++--
> > >  1 file changed, 2 insertions(+), 2 deletions(-)
> > > 
> > > diff --git a/arch/arm/mach-shmobile/board-armadillo800eva.c
> > > b/arch/arm/mach-shmobile/board-armadillo800eva.c index
> > > d9e28c7a..82d027c 100644
> > > --- a/arch/arm/mach-shmobile/board-armadillo800eva.c
> > > +++ b/arch/arm/mach-shmobile/board-armadillo800eva.c
> > > @@ -483,7 +483,7 @@ static struct platform_device lcdc0_device = {
> > >  	.id		= 0,
> > >  	.dev	= {
> > >  		.platform_data	= &lcdc0_info,
> > > -		.coherent_dma_mask = ~0,
> > > +		.coherent_dma_mask = DMA_BIT_MASK(32),
> > >  	},
> > >  };
> > > 
> > > @@ -580,7 +580,7 @@ static struct platform_device hdmi_lcdc_device = {
> > >  	.id		= 1,
> > >  	.dev	= {
> > >  		.platform_data	= &hdmi_lcdc_info,
> > > -		.coherent_dma_mask = ~0,
> > > +		.coherent_dma_mask = DMA_BIT_MASK(32),
> > >  	},
> > >  };
> > > 

-- 
Regards,

Laurent Pinchart