Unverified Commit 84b74270 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!14134 x86/CPU/AMD: Clear virtualized VMLOAD/VMSAVE on Zen4 client 

Merge Pull Request from: @ci-robot 
 
PR sync from: Heyuan Wang <wangheyuan2@h-partners.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/CYXUI7XYDAAXLM53EJDPFP2YAPSYKORY/ 
 
https://gitee.com/src-openeuler/kernel/issues/IB8IUH 
 
Link:https://gitee.com/openeuler/kernel/pulls/14134

 

Reviewed-by: default avatarXiongfeng Wang <wangxiongfeng2@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents eea1cc7c b52a0f85

arch/x86/kernel/cpu/amd.c

+11 −0
Original line number Diff line number Diff line
@@ -1048,6 +1048,17 @@ static void init_amd_zen4(struct cpuinfo_x86 *c) 
{

	if (!cpu_has(c, X86_FEATURE_HYPERVISOR))

		msr_set_bit(MSR_ZEN4_BP_CFG, MSR_ZEN4_BP_CFG_SHARED_BTB_FIX_BIT);



	/*

	 * These Zen4 SoCs advertise support for virtualized VMLOAD/VMSAVE

	 * in some BIOS versions but they can lead to random host reboots.

	 */

	switch (c->x86_model) {

	case 0x18 ... 0x1f:

	case 0x60 ... 0x7f:

		clear_cpu_cap(c, X86_FEATURE_V_VMSAVE_VMLOAD);

		break;

	}

}



static void init_amd_zen5(struct cpuinfo_x86 *c)