Commit 2eaca8a0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents a22ea738 a2ab2552

arch/x86/kernel/cpu/vmware.c

+4 −0
Original line number Diff line number Diff line
@@ -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