x86/CPU/AMD: Move Zenbleed check to the Zen2 init function

Prefix it properly so that it is clear which generation it is dealing
with.

No functional changes.

Signed-off-by: Borislav Petkov (AMD) <[email protected]>
Link: http://lore.kernel.org/r/[email protected]

diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
index f53e0a227ac59acc1a3c3335b6bc4bd3e64521b4..3c3b4c1ad3ca3f0f745c299cbc2ac474493a015c 100644 (file)
--- a/arch/x86/kernel/cpu/amd.c
+++ b/arch/x86/kernel/cpu/amd.c
@@ -70,12 +70,6 @@ static const int amd_erratum_383[] =
 static const int amd_erratum_1054[] =
        AMD_LEGACY_ERRATUM(AMD_MODEL_RANGE(0x17, 0, 0, 0x2f, 0xf));
 
 static const int amd_erratum_1054[] =
        AMD_LEGACY_ERRATUM(AMD_MODEL_RANGE(0x17, 0, 0, 0x2f, 0xf));
 

-static const int amd_zenbleed[] =
-       AMD_LEGACY_ERRATUM(AMD_MODEL_RANGE(0x17, 0x30, 0x0, 0x4f, 0xf),
-                          AMD_MODEL_RANGE(0x17, 0x60, 0x0, 0x7f, 0xf),
-                          AMD_MODEL_RANGE(0x17, 0x90, 0x0, 0x91, 0xf),
-                          AMD_MODEL_RANGE(0x17, 0xa0, 0x0, 0xaf, 0xf));
-

 static const int amd_div0[] =
        AMD_LEGACY_ERRATUM(AMD_MODEL_RANGE(0x17, 0x00, 0x0, 0x2f, 0xf),
                           AMD_MODEL_RANGE(0x17, 0x50, 0x0, 0x5f, 0xf));
 static const int amd_div0[] =
        AMD_LEGACY_ERRATUM(AMD_MODEL_RANGE(0x17, 0x00, 0x0, 0x2f, 0xf),
                           AMD_MODEL_RANGE(0x17, 0x50, 0x0, 0x5f, 0xf));


@@ -1059,11 +1053,8 @@ static bool cpu_has_zenbleed_microcode(void)
        return true;
 }
 
        return true;
 }
 

-static void zenbleed_check(struct cpuinfo_x86 *c)
+static void zen2_zenbleed_check(struct cpuinfo_x86 *c)

 {
 {

-       if (!cpu_has_amd_erratum(c, amd_zenbleed))
-               return;
-

        if (cpu_has(c, X86_FEATURE_HYPERVISOR))
                return;
 
        if (cpu_has(c, X86_FEATURE_HYPERVISOR))
                return;
 


@@ -1084,6 +1075,7 @@ static void init_amd_zen2(struct cpuinfo_x86 *c)
        init_amd_zen_common();
        init_spectral_chicken(c);
        fix_erratum_1386(c);
        init_amd_zen_common();
        init_spectral_chicken(c);
        fix_erratum_1386(c);

+       zen2_zenbleed_check(c);

 }
 
 static void init_amd_zen3(struct cpuinfo_x86 *c)
 }
 
 static void init_amd_zen3(struct cpuinfo_x86 *c)


@@ -1227,8 +1219,6 @@ static void init_amd(struct cpuinfo_x86 *c)
            cpu_has(c, X86_FEATURE_AUTOIBRS))
                WARN_ON_ONCE(msr_set_bit(MSR_EFER, _EFER_AUTOIBRS));
 
            cpu_has(c, X86_FEATURE_AUTOIBRS))
                WARN_ON_ONCE(msr_set_bit(MSR_EFER, _EFER_AUTOIBRS));
 

-       zenbleed_check(c);
-

        if (cpu_has_amd_erratum(c, amd_div0)) {
                pr_notice_once("AMD Zen1 DIV0 bug detected. Disable SMT for full protection.\n");
                setup_force_cpu_bug(X86_BUG_DIV0);
        if (cpu_has_amd_erratum(c, amd_div0)) {
                pr_notice_once("AMD Zen1 DIV0 bug detected. Disable SMT for full protection.\n");
                setup_force_cpu_bug(X86_BUG_DIV0);


@@ -1393,7 +1383,7 @@ static void zenbleed_check_cpu(void *unused)
 {
        struct cpuinfo_x86 *c = &cpu_data(smp_processor_id());
 
 {
        struct cpuinfo_x86 *c = &cpu_data(smp_processor_id());
 

-       zenbleed_check(c);
+       zen2_zenbleed_check(c);

 }
 
 void amd_check_microcode(void)
 }
 
 void amd_check_microcode(void)