The following commit has been merged into the x86/urgent branch of tip: Commit-ID: a2ab25529bbcea51b5e01dded79f45aeb94f644a Gitweb: https://git.kernel.org/tip/a2ab25529bbcea51b5e01dded79f45aeb94f644a Author: Ajay Kaher <ajay.kaher@xxxxxxxxxxxx> AuthorDate: Thu, 13 Mar 2025 17:31:11 Committer: Ingo Molnar <mingo@xxxxxxxxxx> CommitterDate: Thu, 13 Mar 2025 19:01:09 +01:00 x86/vmware: Parse MP tables for SEV-SNP enabled guests under VMware hypervisors Under VMware hypervisors, SEV-SNP enabled VMs are fundamentally able to boot without UEFI, but this regressed a year ago due to: 0f4a1e80989a ("x86/sev: Skip ROM range scans and validation for SEV-SNP guests") In this case, mpparse_find_mptable() has to be called to parse MP tables which contains the necessary boot information. [ mingo: Updated the changelog. ] Fixes: 0f4a1e80989a ("x86/sev: Skip ROM range scans and validation for SEV-SNP guests") Co-developed-by: Ye Li <ye.li@xxxxxxxxxxxx> Signed-off-by: Ye Li <ye.li@xxxxxxxxxxxx> Signed-off-by: Ajay Kaher <ajay.kaher@xxxxxxxxxxxx> Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx> Tested-by: Ye Li <ye.li@xxxxxxxxxxxx> Reviewed-by: Kevin Loughlin <kevinloughlin@xxxxxxxxxx> Acked-by: Borislav Petkov (AMD) <bp@xxxxxxxxx> Link: https://lore.kernel.org/r/20250313173111.10918-1-ajay.kaher@xxxxxxxxxxxx --- arch/x86/kernel/cpu/vmware.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/x86/kernel/cpu/vmware.c b/arch/x86/kernel/cpu/vmware.c index 00189cd..cb3f900 100644 --- a/arch/x86/kernel/cpu/vmware.c +++ b/arch/x86/kernel/cpu/vmware.c @@ -26,6 +26,7 @@ #include <linux/export.h> #include <linux/clocksource.h> #include <linux/cpu.h> +#include <linux/efi.h> #include <linux/reboot.h> #include <linux/static_call.h> #include <asm/div64.h> @@ -429,6 +430,9 @@ static void __init vmware_platform_setup(void) pr_warn("Failed to get TSC freq from the hypervisor\n"); } + if (cc_platform_has(CC_ATTR_GUEST_SEV_SNP) && !efi_enabled(EFI_BOOT)) + x86_init.mpparse.find_mptable = mpparse_find_mptable; + vmware_paravirt_ops_setup(); #ifdef CONFIG_X86_IO_APIC
![]() |