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

Commit 92a3c944 authored by Konrad Rzeszutek Wilk's avatar Konrad Rzeszutek Wilk Committed by Greg Kroah-Hartman
Browse files

x86/bugs: Rename SSBD_NO to SSB_NO 



commit 240da953fcc6a9008c92fae5b1f727ee5ed167ab upstream

The "336996 Speculative Execution Side Channel Mitigations" from
May defines this as SSB_NO, hence lets sync-up.

Signed-off-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e8837f0a

arch/x86/include/asm/msr-index.h

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ 
#define MSR_IA32_ARCH_CAPABILITIES	0x0000010a

#define ARCH_CAP_RDCL_NO		(1 << 0)   /* Not susceptible to Meltdown */

#define ARCH_CAP_IBRS_ALL		(1 << 1)   /* Enhanced IBRS support */

#define ARCH_CAP_SSBD_NO		(1 << 4)   /*

#define ARCH_CAP_SSB_NO			(1 << 4)   /*

						    * Not susceptible to Speculative Store Bypass

						    * attack, so no Speculative Store Bypass

						    * control required.

arch/x86/kernel/cpu/common.c

+1 −1
Original line number Diff line number Diff line
@@ -941,7 +941,7 @@ static void __init cpu_set_bug_bits(struct cpuinfo_x86 *c) 
		rdmsrl(MSR_IA32_ARCH_CAPABILITIES, ia32_cap);



	if (!x86_match_cpu(cpu_no_spec_store_bypass) &&

	   !(ia32_cap & ARCH_CAP_SSBD_NO))

	   !(ia32_cap & ARCH_CAP_SSB_NO))

		setup_force_cpu_bug(X86_BUG_SPEC_STORE_BYPASS);



	if (x86_match_cpu(cpu_no_speculation))