Skip to content

Commit 4ae5061

Browse files
Doug BergerRussell King
authored andcommitted
ARM: 8937/1: spectre-v2: remove Brahma-B53 from hardening
When the default processor handling was added to the function cpu_v7_spectre_init() it only excluded other ARM implemented processor cores. The Broadcom Brahma B53 core is not implemented by ARM so it ended up falling through into the set of processors that attempt to use the ARM_SMCCC_ARCH_WORKAROUND_1 service to harden the branch predictor. Since this workaround is not necessary for the Brahma-B53 this commit explicitly checks for it and prevents it from applying a branch predictor hardening workaround. Fixes: 1011510 ("ARM: spectre-v2: add firmware based hardening") Signed-off-by: Doug Berger <[email protected]> Signed-off-by: Florian Fainelli <[email protected]> Signed-off-by: Russell King <[email protected]>
1 parent 790756c commit 4ae5061

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,9 @@ static void cpu_v7_spectre_init(void)
6565
break;
6666

6767
#ifdef CONFIG_ARM_PSCI
68+
case ARM_CPU_PART_BRAHMA_B53:
69+
/* Requires no workaround */
70+
break;
6871
default:
6972
/* Other ARM CPUs require no workaround */
7073
if (read_cpuid_implementor() == ARM_CPU_IMP_ARM)

0 commit comments

Comments
 (0)