[PATCH] ARM: riscpc: Unbreak the build

[PATCH] ARM: riscpc: Unbreak the build

[Bart Van Assche]

This patch fixes the following build error:

In file included from ./include/linux/io.h:13,
                 from ./arch/arm/mach-rpc/include/mach/uncompress.h:9,
                 from arch/arm/boot/compressed/misc.c:31:
./arch/arm/include/asm/io.h:85:22: error: conflicting types for ‘__raw_writeb’
   85 | #define __raw_writeb __raw_writeb
      |                      ^~~~~~~~~~~~
./arch/arm/include/asm/io.h:86:20: note: in expansion of macro ‘__raw_writeb’
   86 | static inline void __raw_writeb(u8 val, volatile void __iomem *addr)
      |                    ^~~~~~~~~~~~
In file included from arch/arm/boot/compressed/misc.c:26:
arch/arm/boot/compressed/misc-ep93xx.h:13:20: note: previous definition of ‘__raw_writeb’ was here
   13 | static inline void __raw_writeb(unsigned char value, unsigned int ptr)
      |                    ^~~~~~~~~~~~

To: Russell King <linux@armlinux.org.uk>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: linux-arm-kernel@lists.infradead.org
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
---
 arch/arm/mach-rpc/include/mach/uncompress.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/arch/arm/mach-rpc/include/mach/uncompress.h b/arch/arm/mach-rpc/include/mach/uncompress.h
index 1fbe7eb956fd..97edaf6a1f07 100644
--- a/arch/arm/mach-rpc/include/mach/uncompress.h
+++ b/arch/arm/mach-rpc/include/mach/uncompress.h
@@ -6,7 +6,6 @@
  */
 #define VIDMEM ((char *)SCREEN_START)
  
-#include <linux/io.h>
 #include <mach/hardware.h>
 #include <asm/setup.h>
 #include <asm/page.h>

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Re: [PATCH] ARM: riscpc: Unbreak the build

[Russell King (Oracle)]

On Tue, Aug 30, 2022 at 12:55:17PM -0700, Bart Van Assche wrote:
> This patch fixes the following build error:
> 
> In file included from ./include/linux/io.h:13,
>                  from ./arch/arm/mach-rpc/include/mach/uncompress.h:9,
>                  from arch/arm/boot/compressed/misc.c:31:
> ./arch/arm/include/asm/io.h:85:22: error: conflicting types for ‘__raw_writeb’
>    85 | #define __raw_writeb __raw_writeb
>       |                      ^~~~~~~~~~~~
> ./arch/arm/include/asm/io.h:86:20: note: in expansion of macro ‘__raw_writeb’
>    86 | static inline void __raw_writeb(u8 val, volatile void __iomem *addr)
>       |                    ^~~~~~~~~~~~
> In file included from arch/arm/boot/compressed/misc.c:26:
> arch/arm/boot/compressed/misc-ep93xx.h:13:20: note: previous definition of ‘__raw_writeb’ was here
>    13 | static inline void __raw_writeb(unsigned char value, unsigned int ptr)
>       |                    ^~~~~~~~~~~~
> 
> To: Russell King <linux@armlinux.org.uk>
> Cc: Arnd Bergmann <arnd@arndb.de>
> Cc: linux-arm-kernel@lists.infradead.org
> Signed-off-by: Bart Van Assche <bvanassche@acm.org>

Please work out which commit caused this breakage, thanks.

-- 
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/
FTTP is here! 40Mbps down 10Mbps up. Decent connectivity at last!

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Re: [PATCH] ARM: riscpc: Unbreak the build

[Bart Van Assche]

On 8/30/22 12:58, Russell King (Oracle) wrote:
> On Tue, Aug 30, 2022 at 12:55:17PM -0700, Bart Van Assche wrote:
>> This patch fixes the following build error:
>>
>> In file included from ./include/linux/io.h:13,
>>                   from ./arch/arm/mach-rpc/include/mach/uncompress.h:9,
>>                   from arch/arm/boot/compressed/misc.c:31:
>> ./arch/arm/include/asm/io.h:85:22: error: conflicting types for ‘__raw_writeb’
>>     85 | #define __raw_writeb __raw_writeb
>>        |                      ^~~~~~~~~~~~
>> ./arch/arm/include/asm/io.h:86:20: note: in expansion of macro ‘__raw_writeb’
>>     86 | static inline void __raw_writeb(u8 val, volatile void __iomem *addr)
>>        |                    ^~~~~~~~~~~~
>> In file included from arch/arm/boot/compressed/misc.c:26:
>> arch/arm/boot/compressed/misc-ep93xx.h:13:20: note: previous definition of ‘__raw_writeb’ was here
>>     13 | static inline void __raw_writeb(unsigned char value, unsigned int ptr)
>>        |                    ^~~~~~~~~~~~
>>
>> To: Russell King <linux@armlinux.org.uk>
>> Cc: Arnd Bergmann <arnd@arndb.de>
>> Cc: linux-arm-kernel@lists.infradead.org
>> Signed-off-by: Bart Van Assche <bvanassche@acm.org>
> 
> Please work out which commit caused this breakage, thanks.

Hi Russell,

A bisect led to the following:

Fixes: 0361c7e504b1 ("ARM: ep93xx: multiplatform support")

Please let me know if you want me to repost this patch with the Fixes 
tag included.

Thanks,

Bart.

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Re: [PATCH] ARM: riscpc: Unbreak the build

[Russell King (Oracle)]

On Tue, Aug 30, 2022 at 01:55:50PM -0700, Bart Van Assche wrote:
> On 8/30/22 12:58, Russell King (Oracle) wrote:
> > On Tue, Aug 30, 2022 at 12:55:17PM -0700, Bart Van Assche wrote:
> > > This patch fixes the following build error:
> > > 
> > > In file included from ./include/linux/io.h:13,
> > >                   from ./arch/arm/mach-rpc/include/mach/uncompress.h:9,
> > >                   from arch/arm/boot/compressed/misc.c:31:
> > > ./arch/arm/include/asm/io.h:85:22: error: conflicting types for ‘__raw_writeb’
> > >     85 | #define __raw_writeb __raw_writeb
> > >        |                      ^~~~~~~~~~~~
> > > ./arch/arm/include/asm/io.h:86:20: note: in expansion of macro ‘__raw_writeb’
> > >     86 | static inline void __raw_writeb(u8 val, volatile void __iomem *addr)
> > >        |                    ^~~~~~~~~~~~
> > > In file included from arch/arm/boot/compressed/misc.c:26:
> > > arch/arm/boot/compressed/misc-ep93xx.h:13:20: note: previous definition of ‘__raw_writeb’ was here
> > >     13 | static inline void __raw_writeb(unsigned char value, unsigned int ptr)
> > >        |                    ^~~~~~~~~~~~
> > > 
> > > To: Russell King <linux@armlinux.org.uk>
> > > Cc: Arnd Bergmann <arnd@arndb.de>
> > > Cc: linux-arm-kernel@lists.infradead.org
> > > Signed-off-by: Bart Van Assche <bvanassche@acm.org>
> > 
> > Please work out which commit caused this breakage, thanks.
> 
> Hi Russell,
> 
> A bisect led to the following:
> 
> Fixes: 0361c7e504b1 ("ARM: ep93xx: multiplatform support")
> 
> Please let me know if you want me to repost this patch with the Fixes tag
> included.

That is indeed the cause, and I'd say that the patch to fix it is
incorrect.

misc-ep93xx.h brings in EP93xx specific raw IO accessors into the
decompressor, but we've already had (and correctly had) linux/io.h
included.

The problem is misc-ep93xx.h. Why is it defining these accessors?
That's a question for Arnd.

-- 
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/
FTTP is here! 40Mbps down 10Mbps up. Decent connectivity at last!

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Re: [PATCH] ARM: riscpc: Unbreak the build

[Arnd Bergmann]

On Tue, Aug 30, 2022, at 11:27 PM, Russell King (Oracle) wrote:
> On Tue, Aug 30, 2022 at 01:55:50PM -0700, Bart Van Assche wrote:
>> > > 
>> > > In file included from ./include/linux/io.h:13,
>> > >                   from ./arch/arm/mach-rpc/include/mach/uncompress.h:9,
>>
>> A bisect led to the following:
>> 
>> Fixes: 0361c7e504b1 ("ARM: ep93xx: multiplatform support")
>> 
>> Please let me know if you want me to repost this patch with the Fixes tag
>> included.
>
> That is indeed the cause, and I'd say that the patch to fix it is
> incorrect.
>
> misc-ep93xx.h brings in EP93xx specific raw IO accessors into the
> decompressor, but we've already had (and correctly had) linux/io.h
> included.
>
> The problem is misc-ep93xx.h. Why is it defining these accessors?
> That's a question for Arnd.

The mach-ep93xx uncompress.h had these since the ep93xx
got added in 2006, the idea was probably to avoid including
linux/*.h headers in the decompressor and it was copied from
arch-l7200, which was the first to do the same thing.

Having the custom definition was probably never needed on
ep93xx even if it was perhaps needed on one of the others
that did the same thing.

I agree that removing the #include from the rpc version
is the wrong fix, but I can see a couple of others that
all seem fine to me:

- put the '#include "misc-ep93xx.h"' in an #ifdef as we do
  for the users

- rename the custom __raw_writel etc to something with
  ep93xx prefix, or just open-code them

- remove the custom functions and include linux/io.h
  unconditionally

The last one is probably the cleanest, but also the
most likely the cause regressions for another corner
case. The other two remaining uncompress.h versions
each just open-code the pointer dereference.

     Arnd

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Re: [PATCH] ARM: riscpc: Unbreak the build

[Arnd Bergmann]

On Tue, Aug 30, 2022, at 11:27 PM, Russell King (Oracle) wrote:
> On Tue, Aug 30, 2022 at 01:55:50PM -0700, Bart Van Assche wrote:
>> > > 
>> > > In file included from ./include/linux/io.h:13,
>> > >                   from ./arch/arm/mach-rpc/include/mach/uncompress.h:9,
>>
>> A bisect led to the following:
>> 
>> Fixes: 0361c7e504b1 ("ARM: ep93xx: multiplatform support")
>> 
>> Please let me know if you want me to repost this patch with the Fixes tag
>> included.
>
> That is indeed the cause, and I'd say that the patch to fix it is
> incorrect.
>
> misc-ep93xx.h brings in EP93xx specific raw IO accessors into the
> decompressor, but we've already had (and correctly had) linux/io.h
> included.
>
> The problem is misc-ep93xx.h. Why is it defining these accessors?
> That's a question for Arnd.

The mach-ep93xx uncompress.h had these since the ep93xx
got added in 2006, the idea was probably to avoid including
linux/*.h headers in the decompressor and it was copied from
arch-l7200, which was the first to do the same thing.

Having the custom definition was probably never needed on
ep93xx even if it was perhaps needed on one of the others
that did the same thing.

I agree that removing the #include from the rpc version
is the wrong fix, but I can see a couple of others that
all seem fine to me:

- put the '#include "misc-ep93xx.h"' in an #ifdef as we do
  for the users

- rename the custom __raw_writel etc to something with
  ep93xx prefix, or just open-code them

- remove the custom functions and include linux/io.h
  unconditionally

The last one is probably the cleanest, but also the
most likely the cause regressions for another corner
case. The other two remaining uncompress.h versions
each just open-code the pointer dereference.

     Arnd

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

[PATCH] ARM: riscpc: Unbreak the build

[Bart Van Assche]

This patch fixes the following build error:

In file included from ./include/linux/io.h:13,
                 from ./arch/arm/mach-rpc/include/mach/uncompress.h:9,
                 from arch/arm/boot/compressed/misc.c:31:
./arch/arm/include/asm/io.h:85:22: error: conflicting types for ‘__raw_writeb’
   85 | #define __raw_writeb __raw_writeb
      |                      ^~~~~~~~~~~~
./arch/arm/include/asm/io.h:86:20: note: in expansion of macro ‘__raw_writeb’
   86 | static inline void __raw_writeb(u8 val, volatile void __iomem *addr)
      |                    ^~~~~~~~~~~~
In file included from arch/arm/boot/compressed/misc.c:26:
arch/arm/boot/compressed/misc-ep93xx.h:13:20: note: previous definition of ‘__raw_writeb’ was here
   13 | static inline void __raw_writeb(unsigned char value, unsigned int ptr)
      |                    ^~~~~~~~~~~~

To: Russell King <linux@armlinux.org.uk>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: linux-arm-kernel@lists.infradead.org
Fixes: 0361c7e504b1 ("ARM: ep93xx: multiplatform support")
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
---
 arch/arm/boot/compressed/misc.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/arm/boot/compressed/misc.c b/arch/arm/boot/compressed/misc.c
index cb2e069dc73f..abfed1aa2baa 100644
--- a/arch/arm/boot/compressed/misc.c
+++ b/arch/arm/boot/compressed/misc.c
@@ -23,7 +23,9 @@ unsigned int __machine_arch_type;
 #include <linux/types.h>
 #include <linux/linkage.h>
 #include "misc.h"
+#ifdef CONFIG_ARCH_EP93XX
 #include "misc-ep93xx.h"
+#endif
 
 static void putstr(const char *ptr);
 

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

[PATCH] ARM: riscpc: Unbreak the build

[Bart Van Assche]

This patch fixes the following build error:

In file included from ./include/linux/io.h:13,
                 from ./arch/arm/mach-rpc/include/mach/uncompress.h:9,
                 from arch/arm/boot/compressed/misc.c:31:
./arch/arm/include/asm/io.h:85:22: error: conflicting types for ‘__raw_writeb’
   85 | #define __raw_writeb __raw_writeb
      |                      ^~~~~~~~~~~~
./arch/arm/include/asm/io.h:86:20: note: in expansion of macro ‘__raw_writeb’
   86 | static inline void __raw_writeb(u8 val, volatile void __iomem *addr)
      |                    ^~~~~~~~~~~~
In file included from arch/arm/boot/compressed/misc.c:26:
arch/arm/boot/compressed/misc-ep93xx.h:13:20: note: previous definition of ‘__raw_writeb’ was here
   13 | static inline void __raw_writeb(unsigned char value, unsigned int ptr)
      |                    ^~~~~~~~~~~~

To: Russell King <linux@armlinux.org.uk>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: linux-arm-kernel@lists.infradead.org
Fixes: 0361c7e504b1 ("ARM: ep93xx: multiplatform support")
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
---
 arch/arm/boot/compressed/misc.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/arm/boot/compressed/misc.c b/arch/arm/boot/compressed/misc.c
index cb2e069dc73f..abfed1aa2baa 100644
--- a/arch/arm/boot/compressed/misc.c
+++ b/arch/arm/boot/compressed/misc.c
@@ -23,7 +23,9 @@ unsigned int __machine_arch_type;
 #include <linux/types.h>
 #include <linux/linkage.h>
 #include "misc.h"
+#ifdef CONFIG_ARCH_EP93XX
 #include "misc-ep93xx.h"
+#endif
 
 static void putstr(const char *ptr);
 

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Re: [PATCH] ARM: riscpc: Unbreak the build

[Arnd Bergmann]

On Thu, Sep 8, 2022, at 10:45 PM, Bart Van Assche wrote:
> On 9/8/22 13:38, Russell King (Oracle) wrote:
>> That'll do. Please put it in the patch system, and I'll get to it maybe
>> next week sometime. Thanks.
>
> Hi Russell,
>
> Can you please clarify what "put it in the patch system" means? I'm familiar
> with the email based workflow but not with any other workflow for submitting
> kernel patches.

See https://www.arm.linux.org.uk/developer/patches/info.php
for the process. You can use something like

git send-email --add-header=\"KernelVersion: $(git describe --abbrev=0)\" --to="patches@arm.linux.org.uk"

to add a patch there, and check the status in
https://www.arm.linux.org.uk/developer/patches/section.php?section=0

     Arnd

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Re: [PATCH] ARM: riscpc: Unbreak the build

[Bart Van Assche]

On 9/8/22 13:38, Russell King (Oracle) wrote:
> That'll do. Please put it in the patch system, and I'll get to it maybe
> next week sometime. Thanks.

Hi Russell,

Can you please clarify what "put it in the patch system" means? I'm familiar
with the email based workflow but not with any other workflow for submitting
kernel patches.

Thanks,

Bart.



_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Re: [PATCH] ARM: riscpc: Unbreak the build

[Russell King (Oracle)]

On Thu, Sep 08, 2022 at 01:34:08PM -0700, Bart Van Assche wrote:
> This patch fixes the following build error:
> 
> In file included from ./include/linux/io.h:13,
>                  from ./arch/arm/mach-rpc/include/mach/uncompress.h:9,
>                  from arch/arm/boot/compressed/misc.c:31:
> ./arch/arm/include/asm/io.h:85:22: error: conflicting types for ‘__raw_writeb’
>    85 | #define __raw_writeb __raw_writeb
>       |                      ^~~~~~~~~~~~
> ./arch/arm/include/asm/io.h:86:20: note: in expansion of macro ‘__raw_writeb’
>    86 | static inline void __raw_writeb(u8 val, volatile void __iomem *addr)
>       |                    ^~~~~~~~~~~~
> In file included from arch/arm/boot/compressed/misc.c:26:
> arch/arm/boot/compressed/misc-ep93xx.h:13:20: note: previous definition of ‘__raw_writeb’ was here
>    13 | static inline void __raw_writeb(unsigned char value, unsigned int ptr)
>       |                    ^~~~~~~~~~~~
> 
> To: Russell King <linux@armlinux.org.uk>
> Cc: Arnd Bergmann <arnd@arndb.de>
> Cc: linux-arm-kernel@lists.infradead.org
> Fixes: 0361c7e504b1 ("ARM: ep93xx: multiplatform support")
> Signed-off-by: Bart Van Assche <bvanassche@acm.org>
> ---
>  arch/arm/boot/compressed/misc.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/arch/arm/boot/compressed/misc.c b/arch/arm/boot/compressed/misc.c
> index cb2e069dc73f..abfed1aa2baa 100644
> --- a/arch/arm/boot/compressed/misc.c
> +++ b/arch/arm/boot/compressed/misc.c
> @@ -23,7 +23,9 @@ unsigned int __machine_arch_type;
>  #include <linux/types.h>
>  #include <linux/linkage.h>
>  #include "misc.h"
> +#ifdef CONFIG_ARCH_EP93XX
>  #include "misc-ep93xx.h"
> +#endif
>  
>  static void putstr(const char *ptr);
>  

That'll do. Please put it in the patch system, and I'll get to it maybe
next week sometime. Thanks.

-- 
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/
FTTP is here! 40Mbps down 10Mbps up. Decent connectivity at last!

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

[PATCH] ARM: riscpc: Unbreak the build

[Bart Van Assche]

This patch fixes the following build error:

In file included from ./include/linux/io.h:13,
                 from ./arch/arm/mach-rpc/include/mach/uncompress.h:9,
                 from arch/arm/boot/compressed/misc.c:31:
./arch/arm/include/asm/io.h:85:22: error: conflicting types for ‘__raw_writeb’
   85 | #define __raw_writeb __raw_writeb
      |                      ^~~~~~~~~~~~
./arch/arm/include/asm/io.h:86:20: note: in expansion of macro ‘__raw_writeb’
   86 | static inline void __raw_writeb(u8 val, volatile void __iomem *addr)
      |                    ^~~~~~~~~~~~
In file included from arch/arm/boot/compressed/misc.c:26:
arch/arm/boot/compressed/misc-ep93xx.h:13:20: note: previous definition of ‘__raw_writeb’ was here
   13 | static inline void __raw_writeb(unsigned char value, unsigned int ptr)
      |                    ^~~~~~~~~~~~

To: Russell King <linux@armlinux.org.uk>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: linux-arm-kernel@lists.infradead.org
Fixes: 0361c7e504b1 ("ARM: ep93xx: multiplatform support")
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
---
 arch/arm/boot/compressed/misc.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/arm/boot/compressed/misc.c b/arch/arm/boot/compressed/misc.c
index cb2e069dc73f..abfed1aa2baa 100644
--- a/arch/arm/boot/compressed/misc.c
+++ b/arch/arm/boot/compressed/misc.c
@@ -23,7 +23,9 @@ unsigned int __machine_arch_type;
 #include <linux/types.h>
 #include <linux/linkage.h>
 #include "misc.h"
+#ifdef CONFIG_ARCH_EP93XX
 #include "misc-ep93xx.h"
+#endif
 
 static void putstr(const char *ptr);
 

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel