Skip to content

Commit a5ca1dc

Browse files
superm1bp3tk0v
authored andcommitted
x86/CPU/AMD: Clear virtualized VMLOAD/VMSAVE on Zen4 client
A number of Zen4 client SoCs advertise the ability to use virtualized VMLOAD/VMSAVE, but using these instructions is reported to be a cause of a random host reboot. These instructions aren't intended to be advertised on Zen4 client so clear the capability. Signed-off-by: Mario Limonciello <[email protected]> Signed-off-by: Borislav Petkov (AMD) <[email protected]> Cc: [email protected] Link: https://bugzilla.kernel.org/show_bug.cgi?id=219009
1 parent 59b723c commit a5ca1dc

File tree

1 file changed

+11
-0
lines changed

1 file changed

+11
-0
lines changed

arch/x86/kernel/cpu/amd.c

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -924,6 +924,17 @@ static void init_amd_zen4(struct cpuinfo_x86 *c)
924924
{
925925
if (!cpu_has(c, X86_FEATURE_HYPERVISOR))
926926
msr_set_bit(MSR_ZEN4_BP_CFG, MSR_ZEN4_BP_CFG_SHARED_BTB_FIX_BIT);
927+
928+
/*
929+
* These Zen4 SoCs advertise support for virtualized VMLOAD/VMSAVE
930+
* in some BIOS versions but they can lead to random host reboots.
931+
*/
932+
switch (c->x86_model) {
933+
case 0x18 ... 0x1f:
934+
case 0x60 ... 0x7f:
935+
clear_cpu_cap(c, X86_FEATURE_V_VMSAVE_VMLOAD);
936+
break;
937+
}
927938
}
928939

929940
static void init_amd_zen5(struct cpuinfo_x86 *c)

0 commit comments

Comments
 (0)