Skip to contentSkip to conversation

arm/arm64: Move barrier instructions into separate header

PATCH RESEND New Andre Przywara 3 participants 3 messages May 12, 2016

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH RESEND 1/1 arm/arm64: Move barrier instructions into separate header

Commit bfb33f0bc45b ("sunxi: mctl_mem_matches: Add missing memory barrier") broke compilation for the Pine64, as dram_helper.c now includes <asm/armv7.h>, which does not compile on arm64.

Fix this by moving all barrier instructions into a separate header file, which can easily be shared between arm and arm64. Also extend the inline assembly to take the "sy" argument, which is optional for ARMv7, but mandatory for v8.

This fixes compilation for 64-bit sunxi boards (Pine64).

---
Hi Hans, Ian,

can I get an ACK on this please? I don't see it moving forward, but it
breaks build for Pine64 and it's clearly a regression, since 2016.05-rc3 works.
But "buildman armv8" gives me this with the current origin/master:
===============
arch64: + pine64_plus
+In file included from arch/arm/include/asm/armv7.h:61:0,
+ from arch/arm/mach-sunxi/dram_helpers.c:10:
+ #define __arch_getl(a) (*(volatile unsigned int *)(a))
+ ^
+arch/arm/include/asm/io.h:151:31: note: in expansion of macro '__arch_getl'
+ #define readl(c) ({ u32 __v = __arch_getl(c); __iormb(); __v; })
+ ^
+arch/arm/include/asm/armv7.h:115:9: note: in expansion of macro 'readl'
+ temp = readl(address);
+ ^
+{standard input}: Assembler messages:
+{standard input}:102: Error: unknown mnemonic mcr' -- mcr p15,0,x2,c7,c10,4'
+make[2]: *** [arch/arm/mach-sunxi/dram_helpers.o] Error 1
+make[1]: *** [arch/arm/mach-sunxi] Error 2
+make: *** [sub-make] Error 2
w+arch/arm/include/asm/armv7.h: In function 'v7_enable_smp':
w+arch/arm/include/asm/io.h:72:28: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
37 0 1 /38 ls1043ardb_SECURE_BOOT
===================

So it's the only armv8 board that fails :-(
As I stated in my other mail from last week, buildman succeeded for "arm" with this patch as well - as least for those boards my hardfp toolchain could build.

Please excuse my ignorance if it landed in some tree already, but I couldn't find it and patchwork doesn't give me a hint either.

Cheers,
Andre.

 arch/arm/include/asm/armv7.h       | 21 +-----------------
 arch/arm/include/asm/barriers.h    | 44 ++++++++++++++++++++++++++++++++++++++
 arch/arm/mach-sunxi/dram_helpers.c |  2 +-
 3 files changed, 46 insertions(+), 21 deletions(-)
 create mode 100644 arch/arm/include/asm/barriers.h
arch/arm/include/asm/armv7.h +1 -20
index 30e7939..423fc70 100644
@@ -59,26 +59,7 @@
 #ifndef __ASSEMBLY__
 #include <linux/types.h>
 #include <asm/io.h>
-
-/*
- * CP15 Barrier instructions
- * Please note that we have separate barrier instructions in ARMv7
- * However, we use the CP15 based instructtions because we use
- * -march=armv5 in U-Boot
- */
-#define CP15ISB	asm volatile ("mcr     p15, 0, %0, c7, c5, 4" : : "r" (0))
-#define CP15DSB	asm volatile ("mcr     p15, 0, %0, c7, c10, 4" : : "r" (0))
-#define CP15DMB	asm volatile ("mcr     p15, 0, %0, c7, c10, 5" : : "r" (0))
-
-#ifdef __ARM_ARCH_7A__
-#define ISB	asm volatile ("isb" : : : "memory")
-#define DSB	asm volatile ("dsb" : : : "memory")
-#define DMB	asm volatile ("dmb" : : : "memory")
-#else
-#define ISB	CP15ISB
-#define DSB	CP15DSB
-#define DMB	CP15DMB
-#endif
+#include <asm/barriers.h>
 
 /*
  * Workaround for ARM errata # 798870
arch/arm/include/asm/barriers.h new file +44 -0

44 lines not on this page · raw message

arch/arm/mach-sunxi/dram_helpers.c +1 -1
index e0c823a..20b430f 100644
@@ -7,7 +7,7 @@
  */
 
 #include <common.h>
-#include <asm/armv7.h>
+#include <asm/barriers.h>
 #include <asm/io.h>
 #include <asm/arch/dram.h>
 
Signature · 1 line
2.8.2
#1 lore raw

PATCH RESEND 1/1 arm/arm64: Move barrier instructions into separate header

Quoted 4 lines · Andre Przywara

---
Hi Hans, Ian,

can I get an ACK on this please?

I'm afraid that given:
[...]

Quoted 3 lines
?arch/arm/include/asm/armv7.h???????| 21 +-----------------
?arch/arm/include/asm/barriers.h????| 44 ++++++++++++++++++++++++++++++++++++++
?arch/arm/mach-sunxi/dram_helpers.c |??2 +-

It's not really our Ack you need, but the overall arm maintainer's (Albert) ack. (AFAIK there is no separate armv8 maintainer.)

FIW for the sunxi hunk:

Although it is so trivial as to be hardly worth it.

Ian.

#2 lore raw

PATCH RESEND 1/1 arm/arm64: Move barrier instructions into separate header

In reply to Andre Przywara
Quoted 9 lines · Andre Przywara

Commit bfb33f0bc45b ("sunxi: mctl_mem_matches: Add missing memory barrier") broke compilation for the Pine64, as dram_helper.c now includes <asm/armv7.h>, which does not compile on arm64.

Fix this by moving all barrier instructions into a separate header file, which can easily be shared between arm and arm64. Also extend the inline assembly to take the "sy" argument, which is optional for ARMv7, but mandatory for v8.

Quoted 4 lines

This fixes compilation for 64-bit sunxi boards (Pine64).

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160512/720cbd10/attachment.sig>