linux-sh.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 1/3] ARM: shmobile: armadillo: Fix coherent DMA mask
@ 2013-12-16 18:16 Laurent Pinchart
  2013-12-16 23:53 ` Kuninori Morimoto
                   ` (4 more replies)
  0 siblings, 5 replies; 7+ messages in thread
From: Laurent Pinchart @ 2013-12-16 18:16 UTC (permalink / raw)
  To: linux-sh

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>
---
 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),
 	},
 };
 
-- 
1.8.3.2


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* Re: [PATCH 1/3] ARM: shmobile: armadillo: Fix coherent DMA mask
  2013-12-16 18:16 [PATCH 1/3] ARM: shmobile: armadillo: Fix coherent DMA mask Laurent Pinchart
@ 2013-12-16 23:53 ` Kuninori Morimoto
  2013-12-19  6:31 ` Simon Horman
                   ` (3 subsequent siblings)
  4 siblings, 0 replies; 7+ messages in thread
From: Kuninori Morimoto @ 2013-12-16 23:53 UTC (permalink / raw)
  To: linux-sh

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>

>  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),
>  	},
>  };
>  
> -- 
> 1.8.3.2
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-sh" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH 1/3] ARM: shmobile: armadillo: Fix coherent DMA mask
  2013-12-16 18:16 [PATCH 1/3] ARM: shmobile: armadillo: Fix coherent DMA mask Laurent Pinchart
  2013-12-16 23:53 ` Kuninori Morimoto
@ 2013-12-19  6:31 ` Simon Horman
  2013-12-24 12:10 ` Laurent Pinchart
                   ` (2 subsequent siblings)
  4 siblings, 0 replies; 7+ messages in thread
From: Simon Horman @ 2013-12-19  6:31 UTC (permalink / raw)
  To: linux-sh

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.

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),
> >  	},
> >  };
> >  
> > -- 
> > 1.8.3.2
> > 
> > --
> > To unsubscribe from this list: send the line "unsubscribe linux-sh" in
> > the body of a message to majordomo@vger.kernel.org
> > More majordomo info at  http://vger.kernel.org/majordomo-info.html
> --
> To unsubscribe from this list: send the line "unsubscribe linux-sh" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH 1/3] ARM: shmobile: armadillo: Fix coherent DMA mask
  2013-12-16 18:16 [PATCH 1/3] ARM: shmobile: armadillo: Fix coherent DMA mask Laurent Pinchart
  2013-12-16 23:53 ` Kuninori Morimoto
  2013-12-19  6:31 ` Simon Horman
@ 2013-12-24 12:10 ` Laurent Pinchart
  2013-12-24 14:26 ` Simon Horman
  2013-12-26  5:36 ` Simon Horman
  4 siblings, 0 replies; 7+ messages in thread
From: Laurent Pinchart @ 2013-12-24 12:10 UTC (permalink / raw)
  To: linux-sh

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


^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH 1/3] ARM: shmobile: armadillo: Fix coherent DMA mask
  2013-12-16 18:16 [PATCH 1/3] ARM: shmobile: armadillo: Fix coherent DMA mask Laurent Pinchart
                   ` (2 preceding siblings ...)
  2013-12-24 12:10 ` Laurent Pinchart
@ 2013-12-24 14:26 ` Simon Horman
  2013-12-26  5:36 ` Simon Horman
  4 siblings, 0 replies; 7+ messages in thread
From: Simon Horman @ 2013-12-24 14:26 UTC (permalink / raw)
  To: linux-sh

On Tue, Dec 24, 2013 at 01:10:33PM +0100, Laurent Pinchart wrote:
> 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 ?

I seem to have missed them somehow.
I'll fix this up.

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

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH 1/3] ARM: shmobile: armadillo: Fix coherent DMA mask
  2013-12-16 18:16 [PATCH 1/3] ARM: shmobile: armadillo: Fix coherent DMA mask Laurent Pinchart
                   ` (3 preceding siblings ...)
  2013-12-24 14:26 ` Simon Horman
@ 2013-12-26  5:36 ` Simon Horman
  4 siblings, 0 replies; 7+ messages in thread
From: Simon Horman @ 2013-12-26  5:36 UTC (permalink / raw)
  To: linux-sh

On Tue, Dec 24, 2013 at 11:26:11PM +0900, Simon Horman wrote:
> On Tue, Dec 24, 2013 at 01:10:33PM +0100, Laurent Pinchart wrote:
> > 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 ?
> 
> I seem to have missed them somehow.
> I'll fix this up.

I have queued them up in the fixes-for-v3.13 branch and
I intend to push them later this afternoon.

^ permalink raw reply	[flat|nested] 7+ messages in thread

* [PATCH 1/3] ARM: shmobile: armadillo: Fix coherent DMA mask
  2013-12-30  0:57 [GIT PULL 0/3] Third Round of Renesas ARM based SoC Fixes for v3.13 Simon Horman
@ 2013-12-30  0:58 ` Simon Horman
  0 siblings, 0 replies; 7+ messages in thread
From: Simon Horman @ 2013-12-30  0:58 UTC (permalink / raw)
  To: linux-arm-kernel

From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>

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>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 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 c186891..8ea87bd 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),
 	},
 };
 
-- 
1.8.4


^ permalink raw reply related	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2013-12-30  0:58 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-12-16 18:16 [PATCH 1/3] ARM: shmobile: armadillo: Fix coherent DMA mask Laurent Pinchart
2013-12-16 23:53 ` Kuninori Morimoto
2013-12-19  6:31 ` Simon Horman
2013-12-24 12:10 ` Laurent Pinchart
2013-12-24 14:26 ` Simon Horman
2013-12-26  5:36 ` Simon Horman
  -- strict thread matches above, loose matches on Subject: below --
2013-12-30  0:57 [GIT PULL 0/3] Third Round of Renesas ARM based SoC Fixes for v3.13 Simon Horman
2013-12-30  0:58 ` [PATCH 1/3] ARM: shmobile: armadillo: Fix coherent DMA mask Simon Horman

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).