UefiCpuPkg, OvmfPkg: Disable interrupts when using the GHCB

[mirror_edk2.git] / UefiCpuPkg / Library / MpInitLib / DxeMpLib.c

diff --git a/UefiCpuPkg/Library/MpInitLib/DxeMpLib.c b/UefiCpuPkg/Library/MpInitLib/DxeMpLib.c
index 2c00d72ddefe1487b72189dd9d16d6a20cd4bd2b..7839c249760ec13c102619a3a10d698cffeae4c5 100644 (file)
--- a/UefiCpuPkg/Library/MpInitLib/DxeMpLib.c
+++ b/UefiCpuPkg/Library/MpInitLib/DxeMpLib.c
@@ -171,6 +171,7 @@ GetSevEsAPMemory (
   EFI_PHYSICAL_ADDRESS      StartAddress;\r
   MSR_SEV_ES_GHCB_REGISTER  Msr;\r
   GHCB                      *Ghcb;\r
+  BOOLEAN                   InterruptState;\r
 \r
   //\r
   // Allocate 1 page for AP jump table page\r
@@ -192,9 +193,9 @@ GetSevEsAPMemory (
   Msr.GhcbPhysicalAddress = AsmReadMsr64 (MSR_SEV_ES_GHCB);\r
   Ghcb = Msr.Ghcb;\r
 \r
-  VmgInit (Ghcb);\r
+  VmgInit (Ghcb, &InterruptState);\r
   VmgExit (Ghcb, SVM_EXIT_AP_JUMP_TABLE, 0, (UINT64) (UINTN) StartAddress);\r
-  VmgDone (Ghcb);\r
+  VmgDone (Ghcb, InterruptState);\r
 \r
   return (UINTN) StartAddress;\r
 }\r