Changeset 108794 in vbox for trunk/src/VBox/Devices/EFI/FirmwareNew/MdeModulePkg/Universal/SmmCommunicationBufferDxe/SmmCommunicationBufferDxe.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)
• MdeModulePkg/Universal/SmmCommunicationBufferDxe/SmmCommunicationBufferDxe.c (modified) (3 diffs)

trunk/src/VBox/Devices/EFI/FirmwareNew/MdeModulePkg/Universal/SmmCommunicationBufferDxe/SmmCommunicationBufferDxe.c

@@ -20 +20 @@
 #include <Library/MemoryAllocationLib.h>
 #include <Library/DebugLib.h>
+#include <Library/HobLib.h>
 #include <Library/UefiLib.h>
+#include <Guid/MmCommBuffer.h>
 #include <Guid/PiSmmCommunicationRegionTable.h>
 
@@ -45 +47 @@
   EDKII_PI_SMM_COMMUNICATION_REGION_TABLE  *PiSmmCommunicationRegionTable;
   EFI_MEMORY_DESCRIPTOR                    *Entry;
+  EFI_HOB_GUID_TYPE                        *GuidHob;
+  MM_COMM_BUFFER                           *MmCommBuffer;
 
   DescriptorSize = sizeof (EFI_MEMORY_DESCRIPTOR);
+
   //
   // Make sure Size != sizeof(EFI_MEMORY_DESCRIPTOR). This will
@@ -66 +71 @@
   Entry                                          = (EFI_MEMORY_DESCRIPTOR *)(PiSmmCommunicationRegionTable + 1);
   Entry->Type                                    = EfiConventionalMemory;
-  Entry->PhysicalStart                           = (EFI_PHYSICAL_ADDRESS)(UINTN)AllocateReservedPages (DEFAULT_COMMON_PI_SMM_COMMUNIATION_REGION_PAGES);
+
+  GuidHob = GetFirstGuidHob (&gMmCommBufferHobGuid);
+
+  if (GuidHob == NULL) {
+    Entry->PhysicalStart = (EFI_PHYSICAL_ADDRESS)(UINTN)AllocateReservedPages (DEFAULT_COMMON_PI_SMM_COMMUNIATION_REGION_PAGES);
+    Entry->NumberOfPages = DEFAULT_COMMON_PI_SMM_COMMUNIATION_REGION_PAGES;
+  } else {
+    MmCommBuffer         = GET_GUID_HOB_DATA (GuidHob);
+    Entry->PhysicalStart = MmCommBuffer->PhysicalStart;
+    Entry->NumberOfPages = MmCommBuffer->NumberOfPages;
+  }
+
   ASSERT (Entry->PhysicalStart != 0);
-  Entry->VirtualStart  = 0;
-  Entry->NumberOfPages = DEFAULT_COMMON_PI_SMM_COMMUNIATION_REGION_PAGES;
-  Entry->Attribute     = 0;
+  Entry->VirtualStart = 0;
+  Entry->Attribute    = 0;
 
   DEBUG ((DEBUG_INFO, "PiSmmCommunicationRegionTable:(0x%x)\n", PiSmmCommunicationRegionTable));