Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 81b215a5 authored by Russell King's avatar Russell King Committed by Greg Kroah-Hartman
Browse files

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



Commit e388b80288aade31135aca23d32eee93dd106795 upstream.

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: default avatarRussell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Boot-tested-by: default avatarTony Lindgren <tony@atomide.com>
Reviewed-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarDavid A. Long <dave.long@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3e52aff7

arch/arm/mm/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ obj-$(CONFIG_CPU_MOHAWK) += proc-mohawk.o 
obj-$(CONFIG_CPU_FEROCEON)	+= proc-feroceon.o

obj-$(CONFIG_CPU_V6)		+= proc-v6.o

obj-$(CONFIG_CPU_V6K)		+= proc-v6.o

obj-$(CONFIG_CPU_V7)		+= proc-v7.o

obj-$(CONFIG_CPU_V7)		+= proc-v7.o proc-v7-bugs.o

obj-$(CONFIG_CPU_V7M)		+= proc-v7m.o



AFLAGS_proc-v6.o	:=-Wa,-march=armv6

arch/arm/mm/proc-v7-bugs.c

0 → 100644
+36 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

#include <linux/kernel.h>

#include <linux/smp.h>



static __maybe_unused void cpu_v7_check_auxcr_set(bool *warned,

						  u32 mask, const char *msg)

{

	u32 aux_cr;



	asm("mrc p15, 0, %0, c1, c0, 1" : "=r" (aux_cr));



	if ((aux_cr & mask) != mask) {

		if (!*warned)

			pr_err("CPU%u: %s", smp_processor_id(), msg);

		*warned = true;

	}

}



static DEFINE_PER_CPU(bool, spectre_warned);



static void check_spectre_auxcr(bool *warned, u32 bit)

{

	if (IS_ENABLED(CONFIG_HARDEN_BRANCH_PREDICTOR) &&

		cpu_v7_check_auxcr_set(warned, bit,

				       "Spectre v2: firmware did not set auxiliary control register IBE bit, system vulnerable\n");

}



void cpu_v7_ca8_ibe(void)

{

	check_spectre_auxcr(this_cpu_ptr(&spectre_warned), BIT(6));

}



void cpu_v7_ca15_ibe(void)

{

	check_spectre_auxcr(this_cpu_ptr(&spectre_warned), BIT(0));

}

arch/arm/mm/proc-v7.S

+2 −2
Original line number Diff line number Diff line
@@ -569,7 +569,7 @@ __v7_setup_stack: 
	globl_equ	cpu_ca8_do_suspend,	cpu_v7_do_suspend

	globl_equ	cpu_ca8_do_resume,	cpu_v7_do_resume

#endif

	define_processor_functions ca8, dabort=v7_early_abort, pabort=v7_pabort, suspend=1

	define_processor_functions ca8, dabort=v7_early_abort, pabort=v7_pabort, suspend=1, bugs=cpu_v7_ca8_ibe



	@ Cortex-A9 - needs more registers preserved across suspend/resume

	@ and bpiall switch_mm for hardening
@@ -602,7 +602,7 @@ __v7_setup_stack: 
	globl_equ	cpu_ca15_suspend_size,	cpu_v7_suspend_size

	globl_equ	cpu_ca15_do_suspend,	cpu_v7_do_suspend

	globl_equ	cpu_ca15_do_resume,	cpu_v7_do_resume

	define_processor_functions ca15, dabort=v7_early_abort, pabort=v7_pabort, suspend=1

	define_processor_functions ca15, dabort=v7_early_abort, pabort=v7_pabort, suspend=1, bugs=cpu_v7_ca15_ibe

#ifdef CONFIG_CPU_PJ4B

	define_processor_functions pj4b, dabort=v7_early_abort, pabort=v7_pabort, suspend=1

#endif