Skip to content

Commit 2eaca8a

Browse files
committed
Merge tag 'x86-urgent-2025-03-14' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fix from Ingo Molnar: "Fix the bootup of SEV-SNP enabled guests under VMware hypervisors" * tag 'x86-urgent-2025-03-14' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/vmware: Parse MP tables for SEV-SNP enabled guests under VMware hypervisors
2 parents a22ea73 + a2ab255 commit 2eaca8a

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

arch/x86/kernel/cpu/vmware.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
#include <linux/export.h>
2727
#include <linux/clocksource.h>
2828
#include <linux/cpu.h>
29+
#include <linux/efi.h>
2930
#include <linux/reboot.h>
3031
#include <linux/static_call.h>
3132
#include <asm/div64.h>
@@ -429,6 +430,9 @@ static void __init vmware_platform_setup(void)
429430
pr_warn("Failed to get TSC freq from the hypervisor\n");
430431
}
431432

433+
if (cc_platform_has(CC_ATTR_GUEST_SEV_SNP) && !efi_enabled(EFI_BOOT))
434+
x86_init.mpparse.find_mptable = mpparse_find_mptable;
435+
432436
vmware_paravirt_ops_setup();
433437

434438
#ifdef CONFIG_X86_IO_APIC

0 commit comments

Comments
 (0)