ArmPlatformPkg: ASSERT that PcdSystemMemoryBase does not exceed MAX_ADDRESS

[mirror_edk2.git] / ArmPlatformPkg / MemoryInitPei / MemoryInitPeim.c

diff --git a/ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.c b/ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.c
index bc1ab2fef1509346fc5275f630a244f8386ab8b0..e7880d30b1c85b6381bbb2cb9018cd0653ff7d0a 100755 (executable)
--- a/ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.c
+++ b/ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.c
@@ -96,12 +96,12 @@ InitializeMemory (
 {\r
   EFI_STATUS                            Status;\r
   UINTN                                 SystemMemoryBase;\r
-  UINTN                                 SystemMemoryTop;\r
+  UINT64                                SystemMemoryTop;\r
   UINTN                                 FdBase;\r
   UINTN                                 FdTop;\r
   UINTN                                 UefiMemoryBase;\r
 \r
-  DEBUG ((EFI_D_ERROR, "Memory Init PEIM Loaded\n"));\r
+  DEBUG ((EFI_D_LOAD | EFI_D_INFO, "Memory Init PEIM Loaded\n"));\r
 \r
   //\r
   // Initialize the System Memory (DRAM)\r
@@ -113,9 +113,13 @@ InitializeMemory (
 \r
   // Ensure PcdSystemMemorySize has been set\r
   ASSERT (PcdGet64 (PcdSystemMemorySize) != 0);\r
+  ASSERT (PcdGet64 (PcdSystemMemoryBase) < (UINT64)MAX_ADDRESS);\r
 \r
   SystemMemoryBase = (UINTN)PcdGet64 (PcdSystemMemoryBase);\r
-  SystemMemoryTop = SystemMemoryBase + (UINTN)PcdGet64 (PcdSystemMemorySize);\r
+  SystemMemoryTop = SystemMemoryBase + PcdGet64 (PcdSystemMemorySize);\r
+  if (SystemMemoryTop - 1 > MAX_ADDRESS) {\r
+    SystemMemoryTop = (UINT64)MAX_ADDRESS + 1;\r
+  }\r
   FdBase = (UINTN)PcdGet64 (PcdFdBaseAddress);\r
   FdTop = FdBase + (UINTN)PcdGet32 (PcdFdSize);\r
 \r