Commit b95f063e authored by Borislav Petkov (AMD)'s avatar Borislav Petkov (AMD) Committed by Wenkuan Wang
Browse files

x86/CPU/AMD: Get rid of amd_erratum_383[] 

mainline inclusion
from mainline-v6.8-rc1
commit 1709528f73d475d3c9ec514bc0dee0b41cadd871
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I96RWV


CVE: NA

--------------------------------

Set it in init_amd_gh() unconditionally as that is the F10h init
function.

No functional changes.

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


Signed-off-by: default avatarWenkuan Wang <Wenkuan.Wang@amd.com>
parent 9d109b56

arch/x86/kernel/cpu/amd.c

+1 −5
Original line number Diff line number Diff line
@@ -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));
@@ -880,7 +877,6 @@ 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);

}