Changeset 105670 in vbox for trunk/src/VBox/Devices/EFI/FirmwareNew/SourceLevelDebugPkg

Timestamp:

Aug 14, 2024 1:16:30 PM (6 months ago)

Author:

vboxsync

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

164367

Message:

Devices/EFI/FirmwareNew: Merge edk2-stable-202405 and make it build on aarch64, bugref:4643

Location:

trunk/src/VBox/Devices/EFI/FirmwareNew

Files:

• . (modified) (1 prop)
• SourceLevelDebugPkg/Library/DebugAgent/SmmDebugAgent/SmmDebugAgentLib.c (modified) (5 diffs)

trunk/src/VBox/Devices/EFI/FirmwareNew/SourceLevelDebugPkg/Library/DebugAgent/SmmDebugAgent/SmmDebugAgentLib.c

@@ -160 +160 @@
   and initialize debug port. It will get debug agent Mailbox from GUIDed HOB,
   it it exists, debug agent wiil copied it into the local Mailbox in SMM space.
-  it will override IDT table entries and initialize debug port. Context will be
-  NULL.
+  it will override IDT table entries and initialize debug port. Context must
+  point to a BOOLEAN if it's not NULL, which indicates SMM Debug Agent supported
+  or not.
   If InitFlag is DEBUG_AGENT_INIT_ENTER_SMI, debug agent will save Debug
   Registers and get local Mailbox in SMM space. Context will be NULL.
@@ -206 +207 @@
       if (EFI_ERROR (Status)) {
         DEBUG ((DEBUG_ERROR, "DebugAgent: Cannot install configuration table for persisted vector handoff info!\n"));
+        if (Context != NULL) {
+          *(BOOLEAN *)Context = FALSE;
+        }
+
         CpuDeadLoop ();
       }
@@ -216 +221 @@
         VerifyMailboxChecksum (Mailbox);
         mMailboxPointer = Mailbox;
+        if (Context != NULL) {
+          *(BOOLEAN *)Context = TRUE;
+        }
+
         break;
       }
@@ -225 +234 @@
       if (Mailbox != NULL) {
         mMailboxPointer = Mailbox;
+        if (Context != NULL) {
+          *(BOOLEAN *)Context = TRUE;
+        }
+
         break;
       }
@@ -275 +288 @@
       //
       CopyMem ((VOID *)IdtDescriptor.Base, &IdtEntry, 33 * sizeof (IA32_IDT_GATE_DESCRIPTOR));
+
+      if (Context != NULL) {
+        *(BOOLEAN *)Context = TRUE;
+      }
 
       break;