x86/CPU/AMD: Get rid of amd_erratum_383[]
authorBorislav Petkov (AMD) <bp@alien8.de>
Fri, 3 Nov 2023 18:58:53 +0000 (19:58 +0100)
committerBorislav Petkov (AMD) <bp@alien8.de>
Wed, 29 Nov 2023 11:13:08 +0000 (12:13 +0100)
Set it in init_amd_gh() unconditionally as that is the F10h 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-11-bp@alien8.de
arch/x86/kernel/cpu/amd.c

index 219ae7e0fb5a445186b407fda524491a2727086c..7ab7f980c2d1b697462d5859bc2871963fb87eaa 100644 (file)
@@ -63,9 +63,6 @@ static const int amd_erratum_400[] =
        AMD_OSVW_ERRATUM(1, AMD_MODEL_RANGE(0xf, 0x41, 0x2, 0xff, 0xf),
                            AMD_MODEL_RANGE(0x10, 0x2, 0x1, 0xff, 0xf));
 
-static const int amd_erratum_383[] =
-       AMD_OSVW_ERRATUM(3, AMD_MODEL_RANGE(0x10, 0, 0, 0xff, 0xf));
-
 static const int amd_erratum_1485[] =
        AMD_LEGACY_ERRATUM(AMD_MODEL_RANGE(0x19, 0x10, 0x0, 0x1f, 0xf),
                           AMD_MODEL_RANGE(0x19, 0x60, 0x0, 0xaf, 0xf));
@@ -876,8 +873,7 @@ static void init_amd_gh(struct cpuinfo_x86 *c)
         */
        msr_clear_bit(MSR_AMD64_BU_CFG2, 24);
 
-       if (cpu_has_amd_erratum(c, amd_erratum_383))
-               set_cpu_bug(c, X86_BUG_AMD_TLB_MMATCH);
+       set_cpu_bug(c, X86_BUG_AMD_TLB_MMATCH);
 }
 
 static void init_amd_ln(struct cpuinfo_x86 *c)