Skip to content

Commit 9b0955b

Browse files
committed
arm64: Rename ARM64_SSBD to ARM64_SPECTRE_V4
In a similar manner to the renaming of ARM64_HARDEN_BRANCH_PREDICTOR to ARM64_SPECTRE_V2, rename ARM64_SSBD to ARM64_SPECTRE_V4. This isn't _entirely_ accurate, as we also need to take into account the interaction with SSBS, but that will be taken care of in subsequent patches. Signed-off-by: Will Deacon <will@kernel.org>
1 parent 532d581 commit 9b0955b

3 files changed

Lines changed: 3 additions & 3 deletions

File tree

arch/arm64/include/asm/cpucaps.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
#define ARM64_HAS_CACHE_IDC 27
3838
#define ARM64_HAS_CACHE_DIC 28
3939
#define ARM64_HW_DBM 29
40-
#define ARM64_SSBD 30
40+
#define ARM64_SPECTRE_V4 30
4141
#define ARM64_MISMATCHED_CACHE_TYPE 31
4242
#define ARM64_HAS_STAGE2_FWB 32
4343
#define ARM64_HAS_CRC32 33

arch/arm64/kernel/cpu_errata.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -675,7 +675,7 @@ const struct arm64_cpu_capabilities arm64_errata[] = {
675675
#endif
676676
{
677677
.desc = "Speculative Store Bypass Disable",
678-
.capability = ARM64_SSBD,
678+
.capability = ARM64_SPECTRE_V4,
679679
.type = ARM64_CPUCAP_LOCAL_CPU_ERRATUM,
680680
.matches = has_ssbd_mitigation,
681681
.cpu_enable = cpu_enable_ssbd_mitigation,

arch/arm64/kvm/hyp/include/hyp/switch.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -481,7 +481,7 @@ static inline bool fixup_guest_exit(struct kvm_vcpu *vcpu, u64 *exit_code)
481481

482482
static inline bool __needs_ssbd_off(struct kvm_vcpu *vcpu)
483483
{
484-
if (!cpus_have_final_cap(ARM64_SSBD))
484+
if (!cpus_have_final_cap(ARM64_SPECTRE_V4))
485485
return false;
486486

487487
return !(vcpu->arch.workaround_flags & VCPU_WORKAROUND_2_FLAG);

0 commit comments

Comments
 (0)