As of commit 205e1b7f51e4 ("dma-mapping: warn when there is no
coherent_dma_mask") the Migo-R platform devices registered without a DMA
mask and coherent DMA mask issue the following warning
WARNING: CPU: 0 PID: 1 at ./include/linux/dma-mapping.h:516 0x40159e20
Set dma mask and coherent DMA mask for Migo-R platforms devices to 32
bits as all other SH4a platforms do.
Signed-off-by: Jacopo Mondi <[email protected]>
---
arch/sh/kernel/cpu/sh4a/setup-sh7722.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7722.c b/arch/sh/kernel/cpu/sh4a/setup-sh7722.c
index 6b3a26e..3fe1ea7 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7722.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7722.c
@@ -7,6 +7,7 @@
* License. See the file "COPYING" in the main directory of this archive
* for more details.
*/
+#include <linux/dma-mapping.h>
#include <linux/init.h>
#include <linux/mm.h>
#include <linux/platform_device.h>
@@ -347,6 +348,8 @@ static struct platform_device vpu_device = {
.name = "uio_pdrv_genirq",
.id = 0,
.dev = {
+ .dma_mask = &vpu_device.dev.coherent_dma_mask,
+ .coherent_dma_mask = DMA_BIT_MASK(32),
.platform_data = &vpu_platform_data,
},
.resource = vpu_resources,
@@ -375,6 +378,8 @@ static struct platform_device veu_device = {
.name = "uio_pdrv_genirq",
.id = 1,
.dev = {
+ .dma_mask = &veu_device.dev.coherent_dma_mask,
+ .coherent_dma_mask = DMA_BIT_MASK(32),
.platform_data = &veu_platform_data,
},
.resource = veu_resources,
@@ -403,6 +408,8 @@ static struct platform_device jpu_device = {
.name = "uio_pdrv_genirq",
.id = 2,
.dev = {
+ .dma_mask = &jpu_device.dev.coherent_dma_mask,
+ .coherent_dma_mask = DMA_BIT_MASK(32),
.platform_data = &jpu_platform_data,
},
.resource = jpu_resources,
--
2.7.4
Hi Jacopo,
CC Christoph
On Tue, Apr 17, 2018 at 4:13 PM, Jacopo Mondi <[email protected]> wrote:
> As of commit 205e1b7f51e4 ("dma-mapping: warn when there is no
> coherent_dma_mask") the Migo-R platform devices registered without a DMA
> mask and coherent DMA mask issue the following warning
>
> WARNING: CPU: 0 PID: 1 at ./include/linux/dma-mapping.h:516 0x40159e20
>
> Set dma mask and coherent DMA mask for Migo-R platforms devices to 32
> bits as all other SH4a platforms do.
>
> Signed-off-by: Jacopo Mondi <[email protected]>
Thanks for your patch!
Reviewed-by: Geert Uytterhoeven <[email protected]>
I guess usbf_device.dev.dma_mask should be fixed as well?
BTW, there are plenty of other SH platforms that need similar fixes.
> ---
> arch/sh/kernel/cpu/sh4a/setup-sh7722.c | 7 +++++++
> 1 file changed, 7 insertions(+)
>
> diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7722.c b/arch/sh/kernel/cpu/sh4a/setup-sh7722.c
> index 6b3a26e..3fe1ea7 100644
> --- a/arch/sh/kernel/cpu/sh4a/setup-sh7722.c
> +++ b/arch/sh/kernel/cpu/sh4a/setup-sh7722.c
> @@ -7,6 +7,7 @@
> * License. See the file "COPYING" in the main directory of this archive
> * for more details.
> */
> +#include <linux/dma-mapping.h>
> #include <linux/init.h>
> #include <linux/mm.h>
> #include <linux/platform_device.h>
> @@ -347,6 +348,8 @@ static struct platform_device vpu_device = {
> .name = "uio_pdrv_genirq",
> .id = 0,
> .dev = {
> + .dma_mask = &vpu_device.dev.coherent_dma_mask,
> + .coherent_dma_mask = DMA_BIT_MASK(32),
> .platform_data = &vpu_platform_data,
> },
> .resource = vpu_resources,
> @@ -375,6 +378,8 @@ static struct platform_device veu_device = {
> .name = "uio_pdrv_genirq",
> .id = 1,
> .dev = {
> + .dma_mask = &veu_device.dev.coherent_dma_mask,
> + .coherent_dma_mask = DMA_BIT_MASK(32),
> .platform_data = &veu_platform_data,
> },
> .resource = veu_resources,
> @@ -403,6 +408,8 @@ static struct platform_device jpu_device = {
> .name = "uio_pdrv_genirq",
> .id = 2,
> .dev = {
> + .dma_mask = &jpu_device.dev.coherent_dma_mask,
> + .coherent_dma_mask = DMA_BIT_MASK(32),
> .platform_data = &jpu_platform_data,
> },
> .resource = jpu_resources,
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
Hi Geert,
On Tue, Apr 17, 2018 at 04:30:03PM +0200, Geert Uytterhoeven wrote:
> Hi Jacopo,
>
> CC Christoph
>
> On Tue, Apr 17, 2018 at 4:13 PM, Jacopo Mondi <[email protected]> wrote:
> > As of commit 205e1b7f51e4 ("dma-mapping: warn when there is no
> > coherent_dma_mask") the Migo-R platform devices registered without a DMA
> > mask and coherent DMA mask issue the following warning
> >
> > WARNING: CPU: 0 PID: 1 at ./include/linux/dma-mapping.h:516 0x40159e20
> >
> > Set dma mask and coherent DMA mask for Migo-R platforms devices to 32
> > bits as all other SH4a platforms do.
> >
> > Signed-off-by: Jacopo Mondi <[email protected]>
>
> Thanks for your patch!
>
> Reviewed-by: Geert Uytterhoeven <[email protected]>
>
> I guess usbf_device.dev.dma_mask should be fixed as well?
I don't get any warning for that. The only platform devices on which
platform_resource_setup_memory() is called on before registering them
are the ones this patch modifies, if I'm not wrong.
>
> BTW, there are plenty of other SH platforms that need similar fixes.
Oh, why am I not surprised? :/
Thanks
j
>
> > ---
> > arch/sh/kernel/cpu/sh4a/setup-sh7722.c | 7 +++++++
> > 1 file changed, 7 insertions(+)
> >
> > diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7722.c b/arch/sh/kernel/cpu/sh4a/setup-sh7722.c
> > index 6b3a26e..3fe1ea7 100644
> > --- a/arch/sh/kernel/cpu/sh4a/setup-sh7722.c
> > +++ b/arch/sh/kernel/cpu/sh4a/setup-sh7722.c
> > @@ -7,6 +7,7 @@
> > * License. See the file "COPYING" in the main directory of this archive
> > * for more details.
> > */
> > +#include <linux/dma-mapping.h>
> > #include <linux/init.h>
> > #include <linux/mm.h>
> > #include <linux/platform_device.h>
> > @@ -347,6 +348,8 @@ static struct platform_device vpu_device = {
> > .name = "uio_pdrv_genirq",
> > .id = 0,
> > .dev = {
> > + .dma_mask = &vpu_device.dev.coherent_dma_mask,
> > + .coherent_dma_mask = DMA_BIT_MASK(32),
> > .platform_data = &vpu_platform_data,
> > },
> > .resource = vpu_resources,
> > @@ -375,6 +378,8 @@ static struct platform_device veu_device = {
> > .name = "uio_pdrv_genirq",
> > .id = 1,
> > .dev = {
> > + .dma_mask = &veu_device.dev.coherent_dma_mask,
> > + .coherent_dma_mask = DMA_BIT_MASK(32),
> > .platform_data = &veu_platform_data,
> > },
> > .resource = veu_resources,
> > @@ -403,6 +408,8 @@ static struct platform_device jpu_device = {
> > .name = "uio_pdrv_genirq",
> > .id = 2,
> > .dev = {
> > + .dma_mask = &jpu_device.dev.coherent_dma_mask,
> > + .coherent_dma_mask = DMA_BIT_MASK(32),
> > .platform_data = &jpu_platform_data,
> > },
> > .resource = jpu_resources,
>
> Gr{oetje,eeting}s,
>
> Geert
>
> --
> Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
>
> In personal conversations with technical people, I call myself a hacker. But
> when I'm talking to journalists I just say "programmer" or something like that.
> -- Linus Torvalds