From: Arnd Bergmann <[email protected]>
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.
Fixes: e41f1f7ff6c2b ("sh: add <asm-generic/io.h> including")
Link: https://lore.kernel.org/lkml/[email protected]/
Reported-by: Geert Uytterhoeven <[email protected]>
Signed-off-by: Arnd Bergmann <[email protected]>
---
Andrew, can you pick this up into the mm tree on top of the
"sh: add <asm-generic/io.h> including" patch?
---
arch/sh/include/asm/io.h | 24 ++++++++++++++++++++++++
arch/sh/include/asm/io_noioport.h | 14 --------------
2 files changed, 24 insertions(+), 14 deletions(-)
diff --git a/arch/sh/include/asm/io.h b/arch/sh/include/asm/io.h
index 24c560c065ec7..f2f38e9d489ac 100644
--- a/arch/sh/include/asm/io.h
+++ b/arch/sh/include/asm/io.h
@@ -119,6 +119,10 @@ void __raw_readsl(const void __iomem *addr, void *data, int longlen);
__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
diff --git a/arch/sh/include/asm/io_noioport.h b/arch/sh/include/asm/io_noioport.h
index 5ba4116b4265c..12dad91f41c1e 100644
--- a/arch/sh/include/asm/io_noioport.h
+++ b/arch/sh/include/asm/io_noioport.h
@@ -46,20 +46,6 @@ static inline void ioport_unmap(void __iomem *addr)
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();
--
2.39.2
On 8/2/23 07:16, Arnd Bergmann wrote:
> From: Arnd Bergmann <[email protected]>
>
> 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.
>
> Fixes: e41f1f7ff6c2b ("sh: add <asm-generic/io.h> including")
> Link: https://lore.kernel.org/lkml/[email protected]/
> Reported-by: Geert Uytterhoeven <[email protected]>
> Signed-off-by: Arnd Bergmann <[email protected]>
Tested-by: Guenter Roeck <[email protected]>
> ---
> Andrew, can you pick this up into the mm tree on top of the
> "sh: add <asm-generic/io.h> including" patch?
> ---
> arch/sh/include/asm/io.h | 24 ++++++++++++++++++++++++
> arch/sh/include/asm/io_noioport.h | 14 --------------
> 2 files changed, 24 insertions(+), 14 deletions(-)
>
> diff --git a/arch/sh/include/asm/io.h b/arch/sh/include/asm/io.h
> index 24c560c065ec7..f2f38e9d489ac 100644
> --- a/arch/sh/include/asm/io.h
> +++ b/arch/sh/include/asm/io.h
> @@ -119,6 +119,10 @@ void __raw_readsl(const void __iomem *addr, void *data, int longlen);
>
> __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
>
> diff --git a/arch/sh/include/asm/io_noioport.h b/arch/sh/include/asm/io_noioport.h
> index 5ba4116b4265c..12dad91f41c1e 100644
> --- a/arch/sh/include/asm/io_noioport.h
> +++ b/arch/sh/include/asm/io_noioport.h
> @@ -46,20 +46,6 @@ static inline void ioport_unmap(void __iomem *addr)
> 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();
Hi Arnd!
On Wed, 2023-08-02 at 16:16 +0200, Arnd Bergmann wrote:
> From: Arnd Bergmann <[email protected]>
>
> 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.
Clean-up will happen with the device tree conversion.
> Fixes: e41f1f7ff6c2b ("sh: add <asm-generic/io.h> including")
> Link: https://lore.kernel.org/lkml/[email protected]/
> Reported-by: Geert Uytterhoeven <[email protected]>
> Signed-off-by: Arnd Bergmann <[email protected]>
> ---
> Andrew, can you pick this up into the mm tree on top of the
> "sh: add <asm-generic/io.h> including" patch?
> ---
> arch/sh/include/asm/io.h | 24 ++++++++++++++++++++++++
> arch/sh/include/asm/io_noioport.h | 14 --------------
> 2 files changed, 24 insertions(+), 14 deletions(-)
>
> diff --git a/arch/sh/include/asm/io.h b/arch/sh/include/asm/io.h
> index 24c560c065ec7..f2f38e9d489ac 100644
> --- a/arch/sh/include/asm/io.h
> +++ b/arch/sh/include/asm/io.h
> @@ -119,6 +119,10 @@ void __raw_readsl(const void __iomem *addr, void *data, int longlen);
>
> __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
>
> diff --git a/arch/sh/include/asm/io_noioport.h b/arch/sh/include/asm/io_noioport.h
> index 5ba4116b4265c..12dad91f41c1e 100644
> --- a/arch/sh/include/asm/io_noioport.h
> +++ b/arch/sh/include/asm/io_noioport.h
> @@ -46,20 +46,6 @@ static inline void ioport_unmap(void __iomem *addr)
> 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();
Acked-by: John Paul Adrian Glaubitz <[email protected]>
--
.''`. John Paul Adrian Glaubitz
: :' : Debian Developer
`. `' Physicist
`- GPG: 62FF 8A75 84E0 2956 9546 0006 7426 3B37 F5B5 F913
On 08/02/23 at 04:16pm, Arnd Bergmann wrote:
> From: Arnd Bergmann <[email protected]>
>
> 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.
>
> Fixes: e41f1f7ff6c2b ("sh: add <asm-generic/io.h> including")
> Link: https://lore.kernel.org/lkml/[email protected]/
> Reported-by: Geert Uytterhoeven <[email protected]>
> Signed-off-by: Arnd Bergmann <[email protected]>
> ---
> Andrew, can you pick this up into the mm tree on top of the
> "sh: add <asm-generic/io.h> including" patch?
> ---
> arch/sh/include/asm/io.h | 24 ++++++++++++++++++++++++
> arch/sh/include/asm/io_noioport.h | 14 --------------
> 2 files changed, 24 insertions(+), 14 deletions(-)
>
> diff --git a/arch/sh/include/asm/io.h b/arch/sh/include/asm/io.h
> index 24c560c065ec7..f2f38e9d489ac 100644
> --- a/arch/sh/include/asm/io.h
> +++ b/arch/sh/include/asm/io.h
> @@ -119,6 +119,10 @@ void __raw_readsl(const void __iomem *addr, void *data, int longlen);
>
> __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
>
> diff --git a/arch/sh/include/asm/io_noioport.h b/arch/sh/include/asm/io_noioport.h
> index 5ba4116b4265c..12dad91f41c1e 100644
> --- a/arch/sh/include/asm/io_noioport.h
> +++ b/arch/sh/include/asm/io_noioport.h
> @@ -46,20 +46,6 @@ static inline void ioport_unmap(void __iomem *addr)
> 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
Thanks for this fixing.
Reviewed-by: Baoquan He <[email protected]>