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: 10115105cb3a ("ARM: spectre-v2: add firmware based hardening") Signed-off-by: Doug Berger <opendmb@gmail.com> Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
165 lines
3.9 KiB
C
165 lines
3.9 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
#include <linux/arm-smccc.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/psci.h>
|
|
#include <linux/smp.h>
|
|
|
|
#include <asm/cp15.h>
|
|
#include <asm/cputype.h>
|
|
#include <asm/proc-fns.h>
|
|
#include <asm/system_misc.h>
|
|
|
|
#ifdef CONFIG_HARDEN_BRANCH_PREDICTOR
|
|
DEFINE_PER_CPU(harden_branch_predictor_fn_t, harden_branch_predictor_fn);
|
|
|
|
extern void cpu_v7_iciallu_switch_mm(phys_addr_t pgd_phys, struct mm_struct *mm);
|
|
extern void cpu_v7_bpiall_switch_mm(phys_addr_t pgd_phys, struct mm_struct *mm);
|
|
extern void cpu_v7_smc_switch_mm(phys_addr_t pgd_phys, struct mm_struct *mm);
|
|
extern void cpu_v7_hvc_switch_mm(phys_addr_t pgd_phys, struct mm_struct *mm);
|
|
|
|
static void harden_branch_predictor_bpiall(void)
|
|
{
|
|
write_sysreg(0, BPIALL);
|
|
}
|
|
|
|
static void harden_branch_predictor_iciallu(void)
|
|
{
|
|
write_sysreg(0, ICIALLU);
|
|
}
|
|
|
|
static void __maybe_unused call_smc_arch_workaround_1(void)
|
|
{
|
|
arm_smccc_1_1_smc(ARM_SMCCC_ARCH_WORKAROUND_1, NULL);
|
|
}
|
|
|
|
static void __maybe_unused call_hvc_arch_workaround_1(void)
|
|
{
|
|
arm_smccc_1_1_hvc(ARM_SMCCC_ARCH_WORKAROUND_1, NULL);
|
|
}
|
|
|
|
static void cpu_v7_spectre_init(void)
|
|
{
|
|
const char *spectre_v2_method = NULL;
|
|
int cpu = smp_processor_id();
|
|
|
|
if (per_cpu(harden_branch_predictor_fn, cpu))
|
|
return;
|
|
|
|
switch (read_cpuid_part()) {
|
|
case ARM_CPU_PART_CORTEX_A8:
|
|
case ARM_CPU_PART_CORTEX_A9:
|
|
case ARM_CPU_PART_CORTEX_A12:
|
|
case ARM_CPU_PART_CORTEX_A17:
|
|
case ARM_CPU_PART_CORTEX_A73:
|
|
case ARM_CPU_PART_CORTEX_A75:
|
|
per_cpu(harden_branch_predictor_fn, cpu) =
|
|
harden_branch_predictor_bpiall;
|
|
spectre_v2_method = "BPIALL";
|
|
break;
|
|
|
|
case ARM_CPU_PART_CORTEX_A15:
|
|
case ARM_CPU_PART_BRAHMA_B15:
|
|
per_cpu(harden_branch_predictor_fn, cpu) =
|
|
harden_branch_predictor_iciallu;
|
|
spectre_v2_method = "ICIALLU";
|
|
break;
|
|
|
|
#ifdef CONFIG_ARM_PSCI
|
|
case ARM_CPU_PART_BRAHMA_B53:
|
|
/* Requires no workaround */
|
|
break;
|
|
default:
|
|
/* Other ARM CPUs require no workaround */
|
|
if (read_cpuid_implementor() == ARM_CPU_IMP_ARM)
|
|
break;
|
|
/* fallthrough */
|
|
/* Cortex A57/A72 require firmware workaround */
|
|
case ARM_CPU_PART_CORTEX_A57:
|
|
case ARM_CPU_PART_CORTEX_A72: {
|
|
struct arm_smccc_res res;
|
|
|
|
if (psci_ops.smccc_version == SMCCC_VERSION_1_0)
|
|
break;
|
|
|
|
switch (psci_ops.conduit) {
|
|
case PSCI_CONDUIT_HVC:
|
|
arm_smccc_1_1_hvc(ARM_SMCCC_ARCH_FEATURES_FUNC_ID,
|
|
ARM_SMCCC_ARCH_WORKAROUND_1, &res);
|
|
if ((int)res.a0 != 0)
|
|
break;
|
|
per_cpu(harden_branch_predictor_fn, cpu) =
|
|
call_hvc_arch_workaround_1;
|
|
cpu_do_switch_mm = cpu_v7_hvc_switch_mm;
|
|
spectre_v2_method = "hypervisor";
|
|
break;
|
|
|
|
case PSCI_CONDUIT_SMC:
|
|
arm_smccc_1_1_smc(ARM_SMCCC_ARCH_FEATURES_FUNC_ID,
|
|
ARM_SMCCC_ARCH_WORKAROUND_1, &res);
|
|
if ((int)res.a0 != 0)
|
|
break;
|
|
per_cpu(harden_branch_predictor_fn, cpu) =
|
|
call_smc_arch_workaround_1;
|
|
cpu_do_switch_mm = cpu_v7_smc_switch_mm;
|
|
spectre_v2_method = "firmware";
|
|
break;
|
|
|
|
default:
|
|
break;
|
|
}
|
|
}
|
|
#endif
|
|
}
|
|
|
|
if (spectre_v2_method)
|
|
pr_info("CPU%u: Spectre v2: using %s workaround\n",
|
|
smp_processor_id(), spectre_v2_method);
|
|
}
|
|
#else
|
|
static void cpu_v7_spectre_init(void)
|
|
{
|
|
}
|
|
#endif
|
|
|
|
static __maybe_unused bool 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;
|
|
return false;
|
|
}
|
|
return true;
|
|
}
|
|
|
|
static DEFINE_PER_CPU(bool, spectre_warned);
|
|
|
|
static bool check_spectre_auxcr(bool *warned, u32 bit)
|
|
{
|
|
return 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)
|
|
{
|
|
if (check_spectre_auxcr(this_cpu_ptr(&spectre_warned), BIT(6)))
|
|
cpu_v7_spectre_init();
|
|
}
|
|
|
|
void cpu_v7_ca15_ibe(void)
|
|
{
|
|
if (check_spectre_auxcr(this_cpu_ptr(&spectre_warned), BIT(0)))
|
|
cpu_v7_spectre_init();
|
|
}
|
|
|
|
void cpu_v7_bugs_init(void)
|
|
{
|
|
cpu_v7_spectre_init();
|
|
}
|