Changeset 108794 in vbox for trunk/src/VBox/Devices/EFI/FirmwareNew/UefiCpuPkg/Library/SmmRelocationLib/SmramSaveStateConfig.c

Timestamp:

Mar 31, 2025 11:31:09 AM (2 weeks ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

168237

Message:

Devices/EFI/FirmwareNew: Merge edk2-stable202502 from the vendor branch and make it build for the important platforms, bugref:4643

Location:

trunk/src/VBox/Devices/EFI/FirmwareNew

Files:

• . (modified) (1 prop)
• UefiCpuPkg/Library/SmmRelocationLib/SmramSaveStateConfig.c (modified) (2 diffs)

trunk/src/VBox/Devices/EFI/FirmwareNew/UefiCpuPkg/Library/SmmRelocationLib/SmramSaveStateConfig.c

@@ -103 +103 @@
   )
 {
-  UINT64  OriginalInstructionPointer;
+  UINT64                  OriginalInstructionPointer;
+  MSR_IA32_EFER_REGISTER  Msr;
 
   if (GetMmSaveStateRegisterLma () == EFI_MM_SAVE_STATE_REGISTER_LMA_32BIT) {
@@ -118 +119 @@
   } else {
     OriginalInstructionPointer = CpuState->x64._RIP;
-    if ((CpuState->x64.IA32_EFER & LMA) == 0) {
+    Msr.Uint64                 = CpuState->x64.IA32_EFER;
+    if (!Msr.Bits.LMA) {
       CpuState->x64._RIP = (UINT32)NewInstructionPointer32;
     } else {