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

x86/CPU/AMD: Move the Zen3 BTC_NO detection to the Zen3 init function 

mainline inclusion
from mainline-v6.8-rc1
commit affc66cb96f865b3763a8e18add52e133d864f04
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-4-bp@alien8.de


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

arch/x86/kernel/cpu/amd.c

+9 −8
Original line number Original line Diff line number Diff line
@@ -1035,14 +1035,6 @@ static void init_amd_zn(struct cpuinfo_x86 *c) 
		/* Erratum 1076: CPB feature bit not being set in CPUID. */

		/* Erratum 1076: CPB feature bit not being set in CPUID. */

		if (!cpu_has(c, X86_FEATURE_CPB))

		if (!cpu_has(c, X86_FEATURE_CPB))

			set_cpu_cap(c, X86_FEATURE_CPB);

			set_cpu_cap(c, X86_FEATURE_CPB);



		/*

		 * Zen3 (Fam19 model < 0x10) parts are not susceptible to

		 * Branch Type Confusion, but predate the allocation of the

		 * BTC_NO bit.

		 */

		if (c->x86 == 0x19 && !cpu_has(c, X86_FEATURE_BTC_NO))

			set_cpu_cap(c, X86_FEATURE_BTC_NO);

	}

	}

}

}
@@ -1099,6 +1091,15 @@ static void init_amd_zen2(struct cpuinfo_x86 *c) 




static void init_amd_zen3(struct cpuinfo_x86 *c)

static void init_amd_zen3(struct cpuinfo_x86 *c)

{

{

	if (!cpu_has(c, X86_FEATURE_HYPERVISOR)) {

		/*

		 * Zen3 (Fam19 model < 0x10) parts are not susceptible to

		 * Branch Type Confusion, but predate the allocation of the

		 * BTC_NO bit.

		 */

		if (!cpu_has(c, X86_FEATURE_BTC_NO))

			set_cpu_cap(c, X86_FEATURE_BTC_NO);

	}

}

}





static void init_amd_zen4(struct cpuinfo_x86 *c)

static void init_amd_zen4(struct cpuinfo_x86 *c)