* [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
2013-12-30 0:58 ` [PATCH 2/3] ARM: shmobile: kzm9g: " Simon Horman
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ 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] 5+ messages in thread* [PATCH 2/3] ARM: shmobile: kzm9g: 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 ` [PATCH 1/3] ARM: shmobile: armadillo: Fix coherent DMA mask Simon Horman
@ 2013-12-30 0:58 ` Simon Horman
2013-12-30 0:58 ` [PATCH 3/3] ARM: shmobile: mackerel: " Simon Horman
2014-01-02 19:01 ` [GIT PULL 0/3] Third Round of Renesas ARM based SoC Fixes for v3.13 Olof Johansson
3 siblings, 0 replies; 5+ 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-kzm9g.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/mach-shmobile/board-kzm9g.c b/arch/arm/mach-shmobile/board-kzm9g.c
index fe689b7..bc40b85 100644
--- a/arch/arm/mach-shmobile/board-kzm9g.c
+++ b/arch/arm/mach-shmobile/board-kzm9g.c
@@ -334,7 +334,7 @@ static struct platform_device lcdc_device = {
.resource = lcdc_resources,
.dev = {
.platform_data = &lcdc_info,
- .coherent_dma_mask = ~0,
+ .coherent_dma_mask = DMA_BIT_MASK(32),
},
};
--
1.8.4
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH 3/3] ARM: shmobile: mackerel: 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 ` [PATCH 1/3] ARM: shmobile: armadillo: Fix coherent DMA mask Simon Horman
2013-12-30 0:58 ` [PATCH 2/3] ARM: shmobile: kzm9g: " Simon Horman
@ 2013-12-30 0:58 ` Simon Horman
2014-01-02 19:01 ` [GIT PULL 0/3] Third Round of Renesas ARM based SoC Fixes for v3.13 Olof Johansson
3 siblings, 0 replies; 5+ 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-mackerel.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-shmobile/board-mackerel.c b/arch/arm/mach-shmobile/board-mackerel.c
index af06753..e721d2c 100644
--- a/arch/arm/mach-shmobile/board-mackerel.c
+++ b/arch/arm/mach-shmobile/board-mackerel.c
@@ -409,7 +409,7 @@ static struct platform_device lcdc_device = {
.resource = lcdc_resources,
.dev = {
.platform_data = &lcdc_info,
- .coherent_dma_mask = ~0,
+ .coherent_dma_mask = DMA_BIT_MASK(32),
},
};
@@ -499,7 +499,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] 5+ messages in thread* [GIT PULL 0/3] Third Round of Renesas ARM based SoC Fixes for v3.13
2013-12-30 0:57 [GIT PULL 0/3] Third Round of Renesas ARM based SoC Fixes for v3.13 Simon Horman
` (2 preceding siblings ...)
2013-12-30 0:58 ` [PATCH 3/3] ARM: shmobile: mackerel: " Simon Horman
@ 2014-01-02 19:01 ` Olof Johansson
3 siblings, 0 replies; 5+ messages in thread
From: Olof Johansson @ 2014-01-02 19:01 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Dec 30, 2013 at 09:57:05AM +0900, Simon Horman wrote:
> Hi Olof, Hi Kevin, Hi Arnd,
>
> Please consider this third round of Renesas ARM based SoC fixes for v3.13.
> Or alternatively, if it is too late in the v3.13 cycle, please consider
> them for v3.14.
>
> This pull request is based on the second round such fixes,
> tagged as renesas-fixes2-for-v3.13, which you have already pulled.
>
>
> The following changes since commit d721a15c300c5f638a11573a6dd492158e737d6a:
>
> ARM: shmobile: r8a7790: fix shdi resource sizes (2013-12-19 18:14:48 +0900)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-fixes3-for-v3.13
Pulled into fixes for 3.13. Thanks!
-Olof
^ permalink raw reply [flat|nested] 5+ messages in thread