diff options
| author |   James Morse <james.morse@arm.com> | 2021-12-10 14:32:56 +0000 |
|---|---|---|
| committer | James Morse <james.morse@arm.com> | 2022-02-24 14:02:44 +0000 |
| commit | 228a26b912287934789023b4132ba76065d9491c (patch) | |
| tree | 67a41ff4b1f85a9f72239a7f213d1ff2279af0ac /arch/arm64/kernel/cpufeature.c | |
| parent | KVM: arm64: Allow SMCCC_ARCH_WORKAROUND_3 to be discovered and migrated (diff) | |
| download | linux-dev-228a26b912287934789023b4132ba76065d9491c.tar.xz linux-dev-228a26b912287934789023b4132ba76065d9491c.zip | |
arm64: Use the clearbhb instruction in mitigations
Future CPUs may implement a clearbhb instruction that is sufficient
to mitigate SpectreBHB. CPUs that implement this instruction, but
not CSV2.3 must be affected by Spectre-BHB.
Add support to use this instruction as the BHB mitigation on CPUs
that support it. The instruction is in the hint space, so it will
be treated by a NOP as older CPUs.
Reviewed-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Reviewed-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: James Morse <james.morse@arm.com>
Diffstat (limited to 'arch/arm64/kernel/cpufeature.c')
| -rw-r--r-- | arch/arm64/kernel/cpufeature.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c index 45fed4974c44..d33687673f6b 100644 --- a/arch/arm64/kernel/cpufeature.c +++ b/arch/arm64/kernel/cpufeature.c @@ -231,6 +231,7 @@ static const struct arm64_ftr_bits ftr_id_aa64isar1[] = { }; static const struct arm64_ftr_bits ftr_id_aa64isar2[] = { + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_HIGHER_SAFE, ID_AA64ISAR2_CLEARBHB_SHIFT, 4, 0), ARM64_FTR_BITS(FTR_VISIBLE, FTR_NONSTRICT, FTR_LOWER_SAFE, ID_AA64ISAR2_RPRES_SHIFT, 4, 0), ARM64_FTR_END, }; |