Commit affc66cb authored by Borislav Petkov (AMD)'s avatar Borislav Petkov (AMD)
Browse files

x86/CPU/AMD: Move the Zen3 BTC_NO detection to the Zen3 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-4-bp@alien8.de
parent a7c32a1a

arch/x86/kernel/cpu/amd.c

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

		if (!cpu_has(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);

	}

}
@@ -1094,6 +1086,15 @@ static void init_amd_zen2(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)