x86/CPU/AMD: Rename init_amd_zn() to init_amd_zen_common()

Commit 7c81ad8e8bc28a1847e87c5afe1bae6bffb2f73e upstream.

Call it from all Zen init functions.

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-7-bp@alien8.de
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
index d244329e33b08e162e1e800dd6e185d49ae4ff20..ce4a9a9c7c7497f9e8ad633c36d5ffe807cbd958 100644 (file)
--- a/arch/x86/kernel/cpu/amd.c
+++ b/arch/x86/kernel/cpu/amd.c
@@ -1069,11 +1069,16 @@ void init_spectral_chicken(struct cpuinfo_x86 *c)
        clear_cpu_cap(c, X86_FEATURE_XSAVES);
 }
 
-static void init_amd_zn(struct cpuinfo_x86 *c)
+static void init_amd_zen_common(void)
 {
 #ifdef CONFIG_NUMA
        node_reclaim_distance = 32;
 #endif
+}
+
+static void init_amd_zen(struct cpuinfo_x86 *c)
+{
+       init_amd_zen_common();
 
        /* Fix up CPUID bits, but only if not virtualised. */
        if (!cpu_has(c, X86_FEATURE_HYPERVISOR)) {
@@ -1136,21 +1141,20 @@ static void zenbleed_check(struct cpuinfo_x86 *c)
        }
 }
 
-static void init_amd_zen(struct cpuinfo_x86 *c)
-{
-}
-
 static void init_amd_zen2(struct cpuinfo_x86 *c)
 {
+       init_amd_zen_common();
        init_spectral_chicken(c);
 }
 
 static void init_amd_zen3(struct cpuinfo_x86 *c)
 {
+       init_amd_zen_common();
 }
 
 static void init_amd_zen4(struct cpuinfo_x86 *c)
 {
+       init_amd_zen_common();
 }
 
 static void init_amd(struct cpuinfo_x86 *c)
@@ -1182,9 +1186,6 @@ static void init_amd(struct cpuinfo_x86 *c)
        case 0x12: init_amd_ln(c); break;
        case 0x15: init_amd_bd(c); break;
        case 0x16: init_amd_jg(c); break;
-       case 0x17:
-                  fallthrough;
-       case 0x19: init_amd_zn(c); break;
        }
 
        if (boot_cpu_has(X86_FEATURE_ZEN))