Changeset 108794 in vbox for trunk/src/VBox/Devices/EFI/FirmwareNew/StandaloneMmPkg/Library/StandaloneMmMemLib/StandaloneMmMemLib.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)
• StandaloneMmPkg/Library/StandaloneMmMemLib/StandaloneMmMemLib.c (modified) (7 diffs)

trunk/src/VBox/Devices/EFI/FirmwareNew/StandaloneMmPkg/Library/StandaloneMmMemLib/StandaloneMmMemLib.c

@@ -7 +7 @@
   and MM driver) and/or specific dedicated hardware.
 
-  Copyright (c) 2015, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2015 - 2024, Intel Corporation. All rights reserved.<BR>
   Copyright (c) 2016 - 2021, Arm Limited. All rights reserved.<BR>
 
@@ -14 +14 @@
 **/
 
-#include <PiMm.h>
-
-#include <Library/BaseLib.h>
-#include <Library/BaseMemoryLib.h>
-#include <Library/DebugLib.h>
-
-EFI_MMRAM_DESCRIPTOR  *mMmMemLibInternalMmramRanges;
-UINTN                 mMmMemLibInternalMmramCount;
+#include "StandaloneMmMemLibInternal.h"
 
 //
@@ -29 +22 @@
 
 /**
-  Calculate and save the maximum support address.
-
-**/
-VOID
-MmMemLibInternalCalculateMaximumSupportAddress (
-  VOID
-  );
-
-/**
-  Initialize cached Mmram Ranges from HOB.
-
-  @retval EFI_UNSUPPORTED   The routine is unable to extract MMRAM information.
-  @retval EFI_SUCCESS       MmRanges are populated successfully.
-
-**/
-EFI_STATUS
-MmMemLibInternalPopulateMmramRanges (
-  VOID
-  );
-
-/**
-  Deinitialize cached Mmram Ranges.
-
-**/
-VOID
-MmMemLibInternalFreeMmramRanges (
-  VOID
-  );
-
-/**
   This function check if the buffer is valid per processor architecture and not overlap with MMRAM.
 
@@ -74 +37 @@
   )
 {
-  UINTN  Index;
-
   //
   // Check override.
@@ -97 +58 @@
   }
 
-  for (Index = 0; Index < mMmMemLibInternalMmramCount; Index++) {
-    if (((Buffer >= mMmMemLibInternalMmramRanges[Index].CpuStart) &&
-         (Buffer < mMmMemLibInternalMmramRanges[Index].CpuStart + mMmMemLibInternalMmramRanges[Index].PhysicalSize)) ||
-        ((mMmMemLibInternalMmramRanges[Index].CpuStart >= Buffer) &&
-         (mMmMemLibInternalMmramRanges[Index].CpuStart < Buffer + Length)))
-    {
-      DEBUG ((
-        DEBUG_ERROR,
-        "MmIsBufferOutsideMmValid: Overlap: Buffer (0x%lx) - Length (0x%lx), ",
-        Buffer,
-        Length
-        ));
-      DEBUG ((
-        DEBUG_ERROR,
-        "CpuStart (0x%lx) - PhysicalSize (0x%lx)\n",
-        mMmMemLibInternalMmramRanges[Index].CpuStart,
-        mMmMemLibInternalMmramRanges[Index].PhysicalSize
-        ));
-      return FALSE;
-    }
-  }
-
-  return TRUE;
+  return MmMemLibIsValidNonMmramRange (Buffer, Length);
 }
 
@@ -289 +228 @@
   )
 {
-  EFI_STATUS  Status;
-
   //
   // Calculate and save maximum support address
   //
-  MmMemLibInternalCalculateMaximumSupportAddress ();
-
-  //
-  // Initialize cached Mmram Ranges from HOB.
-  //
-  Status = MmMemLibInternalPopulateMmramRanges ();
-
-  return Status;
+  MmMemLibCalculateMaximumSupportAddress ();
+
+  //
+  // Initialize valid non-Mmram Ranges from Resource HOB.
+  //
+  MmMemLibInitializeValidNonMmramRanges ();
+
+  return EFI_SUCCESS;
 }
 
@@ -321 +258 @@
 {
   //
-  // Deinitialize cached Mmram Ranges.
-  //
-  MmMemLibInternalFreeMmramRanges ();
-
-  return EFI_SUCCESS;
-}
+  // Deinitialize cached non-Mmram Ranges.
+  //
+  MmMemLibFreeValidNonMmramRanges ();
+  return EFI_SUCCESS;
+}