[PATCH] m68k: Make sure {read,write}s[bwl]() are always defined

[PATCH] m68k: Make sure {read,write}s[bwl]() are always defined

[Geert Uytterhoeven]

drivers/usb/musb/musb_io.h provides default implementations for
{read,write}s[bwl]() on most platforms, some of which will conflict soon
with platform-specific counterparts on m68k.

To avoid having to add more platform-specific checks to musb_io.h later,
make sure {read,write}s[bwl]() are always defined on m68k, and disable the
default implementations in musb_io.h on m68k, like is already done for
several other architectures.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Acked-by: Felipe Balbi <balbi@ti.com>
---
This is the proactive fix, before Atari ROM port ISA is introduced.

 arch/m68k/include/asm/io_mm.h |    7 +++++++
 drivers/usb/musb/musb_io.h    |    2 +-
 2 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/arch/m68k/include/asm/io_mm.h b/arch/m68k/include/asm/io_mm.h
index 0fb3468..fa4324b 100644
--- a/arch/m68k/include/asm/io_mm.h
+++ b/arch/m68k/include/asm/io_mm.h
@@ -278,6 +278,13 @@ static inline void isa_delay(void)
 #define readl(addr)      in_le32(addr)
 #define writel(val,addr) out_le32((addr),(val))
 
+#define readsb(port, buf, nr)     raw_insb((port), (u8 *)(buf), (nr))
+#define readsw(port, buf, nr)     raw_insw((port), (u16 *)(buf), (nr))
+#define readsl(port, buf, nr)     raw_insl((port), (u32 *)(buf), (nr))
+#define writesb(port, buf, nr)    raw_outsb((port), (u8 *)(buf), (nr))
+#define writesw(port, buf, nr)    raw_outsw((port), (u16 *)(buf), (nr))
+#define writesl(port, buf, nr)    raw_outsl((port), (u32 *)(buf), (nr))
+
 #define mmiowb()
 
 static inline void __iomem *ioremap(unsigned long physaddr, unsigned long size)
diff --git a/drivers/usb/musb/musb_io.h b/drivers/usb/musb/musb_io.h
index 1d5eda2..f7c1c8e 100644
--- a/drivers/usb/musb/musb_io.h
+++ b/drivers/usb/musb/musb_io.h
@@ -40,7 +40,7 @@
 #if !defined(CONFIG_ARM) && !defined(CONFIG_SUPERH) \
 	&& !defined(CONFIG_AVR32) && !defined(CONFIG_PPC32) \
 	&& !defined(CONFIG_PPC64) && !defined(CONFIG_BLACKFIN) \
-	&& !defined(CONFIG_MIPS)
+	&& !defined(CONFIG_MIPS) && !defined(CONFIG_M68K)
 static inline void readsl(const void __iomem *addr, void *buf, int len)
 	{ insl((unsigned long)addr, buf, len); }
 static inline void readsw(const void __iomem *addr, void *buf, int len)
-- 
1.7.0.4

Re: [PATCH] m68k: Make sure {read,write}s[bwl]() are always defined

[Greg Ungerer]

Hi Geert,

On 04/16/2012 05:00 AM, Geert Uytterhoeven wrote:
> If CONFIG_ATARI_ROM_ISA is defined (e.g. allmodconfig), musb fails to
> compile with:
>
> In file included from drivers/usb/musb/musb_core.h:68,
>                   from drivers/usb/musb/musb_core.c:104:
> drivers/usb/musb/musb_io.h:45: error: conflicting types for æraw_inslÆ
> arch/m68k/include/asm/raw_io.h:200: error: previous definition of æraw_inslÆ was here
> drivers/usb/musb/musb_io.h:47: error: conflicting types for æraw_inswÆ
> arch/m68k/include/asm/raw_io.h:121: error: previous definition of æraw_inswÆ was here
> drivers/usb/musb/musb_io.h:52: error: conflicting types for æraw_outslÆ
> arch/m68k/include/asm/raw_io.h:240: error: previous definition of æraw_outslÆ was here
> drivers/usb/musb/musb_io.h:54: error: conflicting types for æraw_outswÆ
> arch/m68k/include/asm/raw_io.h:161: error: previous definition of æraw_outswÆ was here
> make[4]: *** [drivers/usb/musb/musb_core.o] Error 1
>
> This happens because musb_io.h provides default implementations for
> {read,write}s[bwl]() on most platforms, some of which conflict with their
> Atari ROM ISA counterparts.
>
> To avoid adding a check for CONFIG_ATARI_ROM_ISA to musb_io.h, make sure
> {read,write}s[bwl]() are always defined on m68k, and disable the default
> implementations in musb_io.h on m68k, like is already done for several
> other architectures.
>
> Signed-off-by: Geert Uytterhoeven<geert@linux-m68k.org>
> Cc: Felipe Balbi<balbi@ti.com>
> Cc: Greg Ungerer<gerg@uclinux.org>
> --
> Felipe: OK if I carry this through the m68k tree, as CONFIG_ATARI_ROM_ISA
>          (and this compile problem) is not yet in mainline, and fixing only
>          musb_io.h now would introduce a regression in mainline?
>          I could also proactively have m68k provide {read,write}s[bwl]() in
>          mainline before pushing out Atari ROM ISA support.
> Greg: Do you want a similar change for asm/io_no.h? Or move it to asm/io.h?

Ultimately I would like to see it in asm/io.h. It is on my list of files
to merge back together, ending up with a single asm/io.h.

But right now I don't mind at all if it is easier for you to push into
asm/io_mm.h.


>        Or do you want musb_io.h to check for
>        "!(defined(CONFIG_M68K)&&  defined(CONFIG_MMU))" instead?

No, I would rather see just the defined(CONFIG_M68K), and no check for
CONFIG_MMU. I am pretty sure there is some similarity between the way
the Atari does ISA bus interfacing to what some of the ColdFire boards
do.

>        Or don't you care, as allmodconfig never selects nommu anyway?

Well, I do care a little :-)

Regards
Greg


> ---
>   arch/m68k/include/asm/io_mm.h |   12 +++++++-----
>   drivers/usb/musb/musb_io.h    |    2 +-
>   2 files changed, 8 insertions(+), 6 deletions(-)
>
> diff --git a/arch/m68k/include/asm/io_mm.h b/arch/m68k/include/asm/io_mm.h
> index eff3f83..73dc331 100644
> --- a/arch/m68k/include/asm/io_mm.h
> +++ b/arch/m68k/include/asm/io_mm.h
> @@ -371,11 +371,6 @@ static inline void isa_delay(void)
>   #define writeb(val,addr) out_8((addr),(val))
>   #define readw(addr)      in_le16(addr)
>   #define writew(val,addr) out_le16((addr),(val))
> -
> -#define readsw  raw_insw
> -#define writesw raw_outsw
> -#define readsl  raw_insl
> -#define writesl raw_outsl
>   #endif /* CONFIG_ATARI_ROM_ISA */
>
>   #if !defined(CONFIG_ISA)&&  !defined(CONFIG_ATARI_ROM_ISA)
> @@ -415,6 +410,13 @@ static inline void isa_delay(void)
>   #define readl(addr)      in_le32(addr)
>   #define writel(val,addr) out_le32((addr),(val))
>
> +#define readsb(port, buf, nr)     raw_insb((port), (u8 *)(buf), (nr))
> +#define readsw(port, buf, nr)     raw_insw((port), (u16 *)(buf), (nr))
> +#define readsl(port, buf, nr)     raw_insl((port), (u32 *)(buf), (nr))
> +#define writesb(port, buf, nr)    raw_outsb((port), (u8 *)(buf), (nr))
> +#define writesw(port, buf, nr)    raw_outsw((port), (u16 *)(buf), (nr))
> +#define writesl(port, buf, nr)    raw_outsl((port), (u32 *)(buf), (nr))
> +
>   #define mmiowb()
>
>   static inline void __iomem *ioremap(unsigned long physaddr, unsigned long size)
> diff --git a/drivers/usb/musb/musb_io.h b/drivers/usb/musb/musb_io.h
> index 1d5eda2..f7c1c8e 100644
> --- a/drivers/usb/musb/musb_io.h
> +++ b/drivers/usb/musb/musb_io.h
> @@ -40,7 +40,7 @@
>   #if !defined(CONFIG_ARM)&&  !defined(CONFIG_SUPERH) \
>   	&&  !defined(CONFIG_AVR32)&&  !defined(CONFIG_PPC32) \
>   	&&  !defined(CONFIG_PPC64)&&  !defined(CONFIG_BLACKFIN) \
> -	&&  !defined(CONFIG_MIPS)
> +	&&  !defined(CONFIG_MIPS)&&  !defined(CONFIG_M68K)
>   static inline void readsl(const void __iomem *addr, void *buf, int len)
>   	{ insl((unsigned long)addr, buf, len); }
>   static inline void readsw(const void __iomem *addr, void *buf, int len)


-- 
------------------------------------------------------------------------
Greg Ungerer  --  Principal Engineer        EMAIL:     gerg@snapgear.com
SnapGear Group, McAfee                      PHONE:       +61 7 3435 2888
8 Gardner Close,                            FAX:         +61 7 3891 3630
Milton, QLD, 4064, Australia                WEB: http://www.SnapGear.com

Re: [PATCH] m68k: Make sure {read,write}s[bwl]() are always defined

[Felipe Balbi]

[-- Attachment #1: Type: text/plain, Size: 1686 bytes --]

On Sun, Apr 15, 2012 at 09:00:10PM +0200, Geert Uytterhoeven wrote:
> If CONFIG_ATARI_ROM_ISA is defined (e.g. allmodconfig), musb fails to
> compile with:
> 
> In file included from drivers/usb/musb/musb_core.h:68,
>                  from drivers/usb/musb/musb_core.c:104:
> drivers/usb/musb/musb_io.h:45: error: conflicting types for ‘raw_insl’
> arch/m68k/include/asm/raw_io.h:200: error: previous definition of ‘raw_insl’ was here
> drivers/usb/musb/musb_io.h:47: error: conflicting types for ‘raw_insw’
> arch/m68k/include/asm/raw_io.h:121: error: previous definition of ‘raw_insw’ was here
> drivers/usb/musb/musb_io.h:52: error: conflicting types for ‘raw_outsl’
> arch/m68k/include/asm/raw_io.h:240: error: previous definition of ‘raw_outsl’ was here
> drivers/usb/musb/musb_io.h:54: error: conflicting types for ‘raw_outsw’
> arch/m68k/include/asm/raw_io.h:161: error: previous definition of ‘raw_outsw’ was here
> make[4]: *** [drivers/usb/musb/musb_core.o] Error 1
> 
> This happens because musb_io.h provides default implementations for
> {read,write}s[bwl]() on most platforms, some of which conflict with their
> Atari ROM ISA counterparts.
> 
> To avoid adding a check for CONFIG_ATARI_ROM_ISA to musb_io.h, make sure
> {read,write}s[bwl]() are always defined on m68k, and disable the default
> implementations in musb_io.h on m68k, like is already done for several
> other architectures.
> 
> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
> Cc: Felipe Balbi <balbi@ti.com>
> Cc: Greg Ungerer <gerg@uclinux.org>

Go ahea Geert, here's my ack.

Acked-by: Felipe Balbi <balbi@ti.com>

-- 
balbi

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

[PATCH] m68k: Make sure {read,write}s[bwl]() are always defined

[Geert Uytterhoeven]

If CONFIG_ATARI_ROM_ISA is defined (e.g. allmodconfig), musb fails to
compile with:

In file included from drivers/usb/musb/musb_core.h:68,
                 from drivers/usb/musb/musb_core.c:104:
drivers/usb/musb/musb_io.h:45: error: conflicting types for ‘raw_insl’
arch/m68k/include/asm/raw_io.h:200: error: previous definition of ‘raw_insl’ was here
drivers/usb/musb/musb_io.h:47: error: conflicting types for ‘raw_insw’
arch/m68k/include/asm/raw_io.h:121: error: previous definition of ‘raw_insw’ was here
drivers/usb/musb/musb_io.h:52: error: conflicting types for ‘raw_outsl’
arch/m68k/include/asm/raw_io.h:240: error: previous definition of ‘raw_outsl’ was here
drivers/usb/musb/musb_io.h:54: error: conflicting types for ‘raw_outsw’
arch/m68k/include/asm/raw_io.h:161: error: previous definition of ‘raw_outsw’ was here
make[4]: *** [drivers/usb/musb/musb_core.o] Error 1

This happens because musb_io.h provides default implementations for
{read,write}s[bwl]() on most platforms, some of which conflict with their
Atari ROM ISA counterparts.

To avoid adding a check for CONFIG_ATARI_ROM_ISA to musb_io.h, make sure
{read,write}s[bwl]() are always defined on m68k, and disable the default
implementations in musb_io.h on m68k, like is already done for several
other architectures.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Felipe Balbi <balbi@ti.com>
Cc: Greg Ungerer <gerg@uclinux.org>
--
Felipe: OK if I carry this through the m68k tree, as CONFIG_ATARI_ROM_ISA
        (and this compile problem) is not yet in mainline, and fixing only
        musb_io.h now would introduce a regression in mainline?
        I could also proactively have m68k provide {read,write}s[bwl]() in
        mainline before pushing out Atari ROM ISA support.
Greg: Do you want a similar change for asm/io_no.h? Or move it to asm/io.h?
      Or do you want musb_io.h to check for
      "!(defined(CONFIG_M68K) && defined(CONFIG_MMU))" instead?
      Or don't you care, as allmodconfig never selects nommu anyway?
---
 arch/m68k/include/asm/io_mm.h |   12 +++++++-----
 drivers/usb/musb/musb_io.h    |    2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/arch/m68k/include/asm/io_mm.h b/arch/m68k/include/asm/io_mm.h
index eff3f83..73dc331 100644
--- a/arch/m68k/include/asm/io_mm.h
+++ b/arch/m68k/include/asm/io_mm.h
@@ -371,11 +371,6 @@ static inline void isa_delay(void)
 #define writeb(val,addr) out_8((addr),(val))
 #define readw(addr)      in_le16(addr)
 #define writew(val,addr) out_le16((addr),(val))
-
-#define readsw  raw_insw
-#define writesw raw_outsw
-#define readsl  raw_insl
-#define writesl raw_outsl
 #endif /* CONFIG_ATARI_ROM_ISA */
 
 #if !defined(CONFIG_ISA) && !defined(CONFIG_ATARI_ROM_ISA)
@@ -415,6 +410,13 @@ static inline void isa_delay(void)
 #define readl(addr)      in_le32(addr)
 #define writel(val,addr) out_le32((addr),(val))
 
+#define readsb(port, buf, nr)     raw_insb((port), (u8 *)(buf), (nr))
+#define readsw(port, buf, nr)     raw_insw((port), (u16 *)(buf), (nr))
+#define readsl(port, buf, nr)     raw_insl((port), (u32 *)(buf), (nr))
+#define writesb(port, buf, nr)    raw_outsb((port), (u8 *)(buf), (nr))
+#define writesw(port, buf, nr)    raw_outsw((port), (u16 *)(buf), (nr))
+#define writesl(port, buf, nr)    raw_outsl((port), (u32 *)(buf), (nr))
+
 #define mmiowb()
 
 static inline void __iomem *ioremap(unsigned long physaddr, unsigned long size)
diff --git a/drivers/usb/musb/musb_io.h b/drivers/usb/musb/musb_io.h
index 1d5eda2..f7c1c8e 100644
--- a/drivers/usb/musb/musb_io.h
+++ b/drivers/usb/musb/musb_io.h
@@ -40,7 +40,7 @@
 #if !defined(CONFIG_ARM) && !defined(CONFIG_SUPERH) \
 	&& !defined(CONFIG_AVR32) && !defined(CONFIG_PPC32) \
 	&& !defined(CONFIG_PPC64) && !defined(CONFIG_BLACKFIN) \
-	&& !defined(CONFIG_MIPS)
+	&& !defined(CONFIG_MIPS) && !defined(CONFIG_M68K)
 static inline void readsl(const void __iomem *addr, void *buf, int len)
 	{ insl((unsigned long)addr, buf, len); }
 static inline void readsw(const void __iomem *addr, void *buf, int len)
-- 
1.7.0.4