x86/CPU/AMD: Move the Zen3 BTC_NO detection to the Zen3 init function

No functional changes.

Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
Reviewed-by: Nikolay Borisov <nik.borisov@suse.com>
Link: http://lore.kernel.org/r/20231120104152.13740-4-bp@alien8.de

diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
index 0a499cbbf644050d5815ebb78d3f709c094d00f7..3d74347963604976037876307ef4f21c7e6c0c45 100644 (file)
--- a/arch/x86/kernel/cpu/amd.c
+++ b/arch/x86/kernel/cpu/amd.c
@@ -1031,14 +1031,6 @@ static void init_amd_zn(struct cpuinfo_x86 *c)
                /* Erratum 1076: CPB feature bit not being set in CPUID. */
                if (!cpu_has(c, X86_FEATURE_CPB))
                        set_cpu_cap(c, X86_FEATURE_CPB);
-
-               /*
-                * Zen3 (Fam19 model < 0x10) parts are not susceptible to
-                * Branch Type Confusion, but predate the allocation of the
-                * BTC_NO bit.
-                */
-               if (c->x86 == 0x19 && !cpu_has(c, X86_FEATURE_BTC_NO))
-                       set_cpu_cap(c, X86_FEATURE_BTC_NO);
        }
 }
 
@@ -1094,6 +1086,15 @@ static void init_amd_zen2(struct cpuinfo_x86 *c)
 
 static void init_amd_zen3(struct cpuinfo_x86 *c)
 {
+       if (!cpu_has(c, X86_FEATURE_HYPERVISOR)) {
+               /*
+                * Zen3 (Fam19 model < 0x10) parts are not susceptible to
+                * Branch Type Confusion, but predate the allocation of the
+                * BTC_NO bit.
+                */
+               if (!cpu_has(c, X86_FEATURE_BTC_NO))
+                       set_cpu_cap(c, X86_FEATURE_BTC_NO);
+       }
 }
 
 static void init_amd_zen4(struct cpuinfo_x86 *c)