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

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

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


CVE: NA

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

Call it from all Zen init functions.

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


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

arch/x86/kernel/cpu/amd.c

+7 −4
Original line number Diff line number Diff line
@@ -1021,7 +1021,7 @@ void init_spectral_chicken(struct cpuinfo_x86 *c) 
#endif

}



static void init_amd_zn(struct cpuinfo_x86 *c)

static void init_amd_zen_common(void)

{

#ifdef CONFIG_NUMA

	node_reclaim_distance = 32;
@@ -1030,6 +1030,7 @@ static void init_amd_zn(struct cpuinfo_x86 *c) 


static void init_amd_zen(struct cpuinfo_x86 *c)

{

	init_amd_zen_common();

	fix_erratum_1386(c);



	/* Fix up CPUID bits, but only if not virtualised. */
@@ -1080,16 +1081,20 @@ static void zenbleed_check(struct cpuinfo_x86 *c) 
	} else {

		msr_clear_bit(MSR_AMD64_DE_CFG, MSR_AMD64_DE_CFG_ZEN2_FP_BACKUP_FIX_BIT);

	}



}



static void init_amd_zen2(struct cpuinfo_x86 *c)

{

	init_amd_zen_common();

	init_spectral_chicken(c);

	fix_erratum_1386(c);

}



static void init_amd_zen3(struct cpuinfo_x86 *c)

{

	init_amd_zen_common();



	if (!cpu_has(c, X86_FEATURE_HYPERVISOR)) {

		/*

		 * Zen3 (Fam19 model < 0x10) parts are not susceptible to
@@ -1103,6 +1108,7 @@ static void init_amd_zen3(struct cpuinfo_x86 *c) 


static void init_amd_zen4(struct cpuinfo_x86 *c)

{

	init_amd_zen_common();

}



static void init_amd(struct cpuinfo_x86 *c)
@@ -1138,9 +1144,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))