| From: Arnd Bergmann <arnd@arndb.de> |
| Subject: sh: fix asm-generic/io.h inclusion |
| Date: Wed, 2 Aug 2023 16:16:41 +0200 |
| |
| A recent cleanup patch started using the generic asm/io.h header from |
| the sh version, but unfortunately this caused build regressions in many |
| configurations, such as: |
| |
| include/asm-generic/io.h:636:15: error: redefinition of `inb_p' |
| |
| I added some of the missing defines that are needed to keep using the |
| sh specific implementations rather than the generic ones where they |
| clash. I build all sh defconfig files to catch the various combinations |
| of CONFIG_MMU, CONFIG_GENERIC_IOMAP and CONFIG_NO_IOPORT_MAP, this should |
| cover them all. |
| |
| A lot of the sh specific functions are equivalent to the generic ones |
| and could in fact be removed, but it would be best to only do that with |
| actual runtime testing. |
| |
| In particular, the indirect ioport_map() implementation is only used |
| for the "microdev" platform that appears to be broken beyond repair |
| for as long as the git history goes, so removing both microdev and the |
| custom ioport handling in favor of the asm-generic/io.h version would |
| be a great cleanup, but this can be done another time if anyone feels |
| motivated to clean up arch/sh. |
| |
| Link: https://lkml.kernel.org/r/20230802141658.2064864-1-arnd@kernel.org |
| Fixes: e41f1f7ff6c2b ("sh: add <asm-generic/io.h> including") |
| Link: https://lore.kernel.org/lkml/09094baf-dadf-4bce-9f63-f2a1f255f9a8@app.fastmail.com/ |
| Signed-off-by: Arnd Bergmann <arnd@arndb.de> |
| Reported-by: Geert Uytterhoeven <geert@linux-m68k.org> |
| Tested-by: Guenter Roeck <linux@roeck-us.net> |
| Acked-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de> |
| Cc: Baoquan He <bhe@redhat.com> |
| Cc: Rich Felker <dalias@libc.org> |
| Cc: Yoshinori Sato <ysato@users.sourceforge.jp> |
| Signed-off-by: Andrew Morton <akpm@linux-foundation.org> |
| --- |
| |
| arch/sh/include/asm/io.h | 24 ++++++++++++++++++++++++ |
| arch/sh/include/asm/io_noioport.h | 14 -------------- |
| 2 files changed, 24 insertions(+), 14 deletions(-) |
| |
| --- a/arch/sh/include/asm/io.h~sh-add-asm-generic-ioh-including-fix |
| +++ a/arch/sh/include/asm/io.h |
| @@ -119,6 +119,10 @@ void __raw_readsl(const void __iomem *ad |
| |
| __BUILD_MEMORY_STRING(__raw_, q, u64) |
| |
| +#define ioport_map ioport_map |
| +#define ioport_unmap ioport_unmap |
| +#define pci_iounmap pci_iounmap |
| + |
| #define ioread8 ioread8 |
| #define ioread16 ioread16 |
| #define ioread16be ioread16be |
| @@ -241,6 +245,26 @@ __BUILD_IOPORT_STRING(q, u64) |
| |
| #endif |
| |
| +#define inb(addr) inb(addr) |
| +#define inw(addr) inw(addr) |
| +#define inl(addr) inl(addr) |
| +#define outb(x, addr) outb((x), (addr)) |
| +#define outw(x, addr) outw((x), (addr)) |
| +#define outl(x, addr) outl((x), (addr)) |
| + |
| +#define inb_p(addr) inb(addr) |
| +#define inw_p(addr) inw(addr) |
| +#define inl_p(addr) inl(addr) |
| +#define outb_p(x, addr) outb((x), (addr)) |
| +#define outw_p(x, addr) outw((x), (addr)) |
| +#define outl_p(x, addr) outl((x), (addr)) |
| + |
| +#define insb insb |
| +#define insw insw |
| +#define insl insl |
| +#define outsb outsb |
| +#define outsw outsw |
| +#define outsl outsl |
| |
| #define IO_SPACE_LIMIT 0xffffffff |
| |
| --- a/arch/sh/include/asm/io_noioport.h~sh-add-asm-generic-ioh-including-fix |
| +++ a/arch/sh/include/asm/io_noioport.h |
| @@ -46,20 +46,6 @@ static inline void ioport_unmap(void __i |
| BUG(); |
| } |
| |
| -#define inb_p(addr) inb(addr) |
| -#define inw_p(addr) inw(addr) |
| -#define inl_p(addr) inl(addr) |
| -#define outb_p(x, addr) outb((x), (addr)) |
| -#define outw_p(x, addr) outw((x), (addr)) |
| -#define outl_p(x, addr) outl((x), (addr)) |
| - |
| -#define insb insb |
| -#define insw insw |
| -#define insl insl |
| -#define outsb outsb |
| -#define outsw outsw |
| -#define outsl outsl |
| - |
| static inline void insb(unsigned long port, void *dst, unsigned long count) |
| { |
| BUG(); |
| _ |
