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

x86/CPU/AMD: Move erratum 1076 fix into the Zen1 init function 

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


CVE: NA

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

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-5-bp@alien8.de


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

arch/x86/kernel/cpu/amd.c

+5 −5
Original line number Diff line number Diff line
@@ -1028,6 +1028,11 @@ static void init_amd_zn(struct cpuinfo_x86 *c) 
#ifdef CONFIG_NUMA

	node_reclaim_distance = 32;

#endif

}



static void init_amd_zen(struct cpuinfo_x86 *c)

{

	fix_erratum_1386(c);



	/* Fix up CPUID bits, but only if not virtualised. */

	if (!cpu_has(c, X86_FEATURE_HYPERVISOR)) {
@@ -1079,11 +1084,6 @@ static void zenbleed_check(struct cpuinfo_x86 *c) 
	}

}



static void init_amd_zen(struct cpuinfo_x86 *c)

{

	fix_erratum_1386(c);

}



static void init_amd_zen2(struct cpuinfo_x86 *c)

{

	fix_erratum_1386(c);