diff options
| author | Tom Lendacky | 2018-07-02 23:35:53 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2018-07-03 09:45:48 +0200 |
| commit | 845d382bb15c6e7dc5026c0ff919c5b13fc7e11b (patch) | |
| tree | 2e9b20a8a7d5fbde5db185452765df3d7e0ef2fb /arch/x86/kernel/cpu/amd.c | |
| parent | x86/spectre_v1: Disable compiler optimizations over array_index_mask_nospec() (diff) | |
| download | kernel-qcow2-linux-845d382bb15c6e7dc5026c0ff919c5b13fc7e11b.tar.gz kernel-qcow2-linux-845d382bb15c6e7dc5026c0ff919c5b13fc7e11b.tar.xz kernel-qcow2-linux-845d382bb15c6e7dc5026c0ff919c5b13fc7e11b.zip | |
x86/bugs: Update when to check for the LS_CFG SSBD mitigation
If either the X86_FEATURE_AMD_SSBD or X86_FEATURE_VIRT_SSBD features are
present, then there is no need to perform the check for the LS_CFG SSBD
mitigation support.
Signed-off-by: Tom Lendacky <thomas.lendacky@amd.com>
Cc: Borislav Petkov <bpetkov@suse.de>
Cc: David Woodhouse <dwmw@amazon.co.uk>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/20180702213553.29202.21089.stgit@tlendack-t1.amdoffice.net
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel/cpu/amd.c')
| -rw-r--r-- | arch/x86/kernel/cpu/amd.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c index 082d7875cef8..38915fbfae73 100644 --- a/arch/x86/kernel/cpu/amd.c +++ b/arch/x86/kernel/cpu/amd.c @@ -543,7 +543,9 @@ static void bsp_init_amd(struct cpuinfo_x86 *c) nodes_per_socket = ((value >> 3) & 7) + 1; } - if (c->x86 >= 0x15 && c->x86 <= 0x17) { + if (!boot_cpu_has(X86_FEATURE_AMD_SSBD) && + !boot_cpu_has(X86_FEATURE_VIRT_SSBD) && + c->x86 >= 0x15 && c->x86 <= 0x17) { unsigned int bit; switch (c->x86) { |