ARM: fix isb regression on CPU < v7
PATCH 1/1 ARM: fix isb regression on CPU < v7
The kernel does not compile for my ARM926EJ-S system U300 due to the isb instruction inserted in generic assember statement from commit 8925ec4c530094b878e7e28a1fd78e7122afd973, "ARM: 6385/1:
setup: detect aliasing I-cache when D-cache is non-aliasing" hey the isb is only available when assembling for v7 so let's use the generic isb() macro from setup.h instead.
--- arch/arm/kernel/setup.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-)
arch/arm/kernel/setup.c +5 -4
@@ -247,11 +247,12 @@ static int cpu_has_aliasing_icache(unsigned int arch)/* arch specifies the register format */ switch (arch) {case CPU_ARCH_ARMv7: - asm("mcr p15, 2, %1, c0, c0, 0 @ set CSSELR\n" -"isb\n" -"mrc p15, 1, %0, c0, c0, 0 @ read CCSIDR" - :"=r" (id_reg) + asm("mcr p15, 2, %0, c0, c0, 0 @ set CSSELR" + :/* No output operands */ :"r" (1 )); +isb (); + asm("mrc p15, 1, %0, c0, c0, 0 @ read CCSIDR" + :"=r" (id_reg)); line_size =4 << ((id_reg &0x7 ) +2 ); num_sets = ((id_reg >>13 ) &0x7fff ) +1 ; aliasing_icache = (line_size * num_sets) >PAGE_SIZE ;
Signature · 1 line
1.7.2.3
PATCH 1/1 ARM: fix isb regression on CPU < v7
Hi Linus,
Quoted 10 lines
The kernel does not compile for my ARM926EJ-S system U300 due to the isb instruction inserted in generic assember statement from commit
8925ec4c530094b878e7e28a1fd78e7122afd973, "ARM: 6385/1:
setup: detect aliasing I-cache when D-cache is non-aliasing" hey the isb is only available when assembling for v7 so let's use the genericisb()macro fromsetup.hinstead.Cc Will Deacon <[email protected]>Signed-off-by Linus Walleij <[email protected]>---
Oops, well spotted! I suppose it's asking a bit much of the compiler for it to optimise that case statement away when you're not building for a v7 target :)
Cheers,
Will