Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ARM: spectre-v2: add Cortex A8 and A15 validation of the IBE bit

When the branch predictor hardening is enabled, firmware must have set
the IBE bit in the auxiliary control register. If this bit has not
been set, the Spectre workarounds will not be functional.

Add validation that this bit is set, and print a warning at alert level
if this is not the case.

Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Boot-tested-by: Tony Lindgren <tony@atomide.com>
Reviewed-by: Tony Lindgren <tony@atomide.com>

+39 -3
+1 -1
arch/arm/mm/Makefile
··· 97 97 obj-$(CONFIG_CPU_FEROCEON) += proc-feroceon.o 98 98 obj-$(CONFIG_CPU_V6) += proc-v6.o 99 99 obj-$(CONFIG_CPU_V6K) += proc-v6.o 100 - obj-$(CONFIG_CPU_V7) += proc-v7.o 100 + obj-$(CONFIG_CPU_V7) += proc-v7.o proc-v7-bugs.o 101 101 obj-$(CONFIG_CPU_V7M) += proc-v7m.o 102 102 103 103 AFLAGS_proc-v6.o :=-Wa,-march=armv6
+36
arch/arm/mm/proc-v7-bugs.c
··· 1 + // SPDX-License-Identifier: GPL-2.0 2 + #include <linux/kernel.h> 3 + #include <linux/smp.h> 4 + 5 + static __maybe_unused void cpu_v7_check_auxcr_set(bool *warned, 6 + u32 mask, const char *msg) 7 + { 8 + u32 aux_cr; 9 + 10 + asm("mrc p15, 0, %0, c1, c0, 1" : "=r" (aux_cr)); 11 + 12 + if ((aux_cr & mask) != mask) { 13 + if (!*warned) 14 + pr_err("CPU%u: %s", smp_processor_id(), msg); 15 + *warned = true; 16 + } 17 + } 18 + 19 + static DEFINE_PER_CPU(bool, spectre_warned); 20 + 21 + static void check_spectre_auxcr(bool *warned, u32 bit) 22 + { 23 + if (IS_ENABLED(CONFIG_HARDEN_BRANCH_PREDICTOR) && 24 + cpu_v7_check_auxcr_set(warned, bit, 25 + "Spectre v2: firmware did not set auxiliary control register IBE bit, system vulnerable\n"); 26 + } 27 + 28 + void cpu_v7_ca8_ibe(void) 29 + { 30 + check_spectre_auxcr(this_cpu_ptr(&spectre_warned), BIT(6)); 31 + } 32 + 33 + void cpu_v7_ca15_ibe(void) 34 + { 35 + check_spectre_auxcr(this_cpu_ptr(&spectre_warned), BIT(0)); 36 + }
+2 -2
arch/arm/mm/proc-v7.S
··· 569 569 globl_equ cpu_ca8_do_suspend, cpu_v7_do_suspend 570 570 globl_equ cpu_ca8_do_resume, cpu_v7_do_resume 571 571 #endif 572 - define_processor_functions ca8, dabort=v7_early_abort, pabort=v7_pabort, suspend=1 572 + define_processor_functions ca8, dabort=v7_early_abort, pabort=v7_pabort, suspend=1, bugs=cpu_v7_ca8_ibe 573 573 574 574 @ Cortex-A9 - needs more registers preserved across suspend/resume 575 575 @ and bpiall switch_mm for hardening ··· 602 602 globl_equ cpu_ca15_suspend_size, cpu_v7_suspend_size 603 603 globl_equ cpu_ca15_do_suspend, cpu_v7_do_suspend 604 604 globl_equ cpu_ca15_do_resume, cpu_v7_do_resume 605 - define_processor_functions ca15, dabort=v7_early_abort, pabort=v7_pabort, suspend=1 605 + define_processor_functions ca15, dabort=v7_early_abort, pabort=v7_pabort, suspend=1, bugs=cpu_v7_ca15_ibe 606 606 #ifdef CONFIG_CPU_PJ4B 607 607 define_processor_functions pj4b, dabort=v7_early_abort, pabort=v7_pabort, suspend=1 608 608 #endif