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) {