ArmPkg/ArmPkg.dec: Redefined PcdSystemMemory(Base|Size) as UINT64

The System Memory region might be out of the 32-bit memory space.

This change has been validated on the FVP AArch64 model using 4GB
of DRAM at 0x8_0000_0000:

-  # System Memory (2GB)
-  gArmTokenSpaceGuid.PcdSystemMemoryBase|0x80000000
-  gArmTokenSpaceGuid.PcdSystemMemorySize|0x80000000
+  # System Memory (4GB)
+  gArmTokenSpaceGuid.PcdSystemMemoryBase|0x800000000
+  gArmTokenSpaceGuid.PcdSystemMemorySize|0x100000000

EFI Shell and Linux kernel boot successfully.

Note: This change has not been validated on AArch32. I expect some
early assembly code to not work.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Olivier Martin <olivier.martin@arm.com>




git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15093 6f19259b-4bc3-4df7-8a09-765794883524

11 files changed, 38 insertions, 38 deletions

diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbMem.c b/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbMem.c
index c7a413dc2e..1ed2c47803 100644
--- a/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbMem.c
+++ b/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbMem.c
@@ -65,9 +65,9 @@ ArmPlatformGetVirtualMemoryMap (
   VirtualMemoryTable[Index].Attributes   = (ARM_MEMORY_REGION_ATTRIBUTES)CacheAttributes;

 

   // DDR

-  VirtualMemoryTable[++Index].PhysicalBase = PcdGet32 (PcdSystemMemoryBase);

-  VirtualMemoryTable[Index].VirtualBase  = PcdGet32 (PcdSystemMemoryBase);

-  VirtualMemoryTable[Index].Length       = PcdGet32 (PcdSystemMemorySize);

+  VirtualMemoryTable[++Index].PhysicalBase = PcdGet64 (PcdSystemMemoryBase);

+  VirtualMemoryTable[Index].VirtualBase  = PcdGet64 (PcdSystemMemoryBase);

+  VirtualMemoryTable[Index].Length       = PcdGet64 (PcdSystemMemorySize);

   VirtualMemoryTable[Index].Attributes   = (ARM_MEMORY_REGION_ATTRIBUTES)CacheAttributes;

 

   // SMC CS7

diff --git a/ArmPlatformPkg/ArmVExpressPkg/Include/Platform/CTA9x4/ArmPlatform.h b/ArmPlatformPkg/ArmVExpressPkg/Include/Platform/CTA9x4/ArmPlatform.h
index 06537a428b..b692b168cb 100644
--- a/ArmPlatformPkg/ArmVExpressPkg/Include/Platform/CTA9x4/ArmPlatform.h
+++ b/ArmPlatformPkg/ArmVExpressPkg/Include/Platform/CTA9x4/ArmPlatform.h
@@ -52,8 +52,8 @@
 #define ARM_VE_SMB_PERIPH_SZ                    SIZE_64MB

 

 // DRAM

-#define ARM_VE_DRAM_BASE                        PcdGet32 (PcdSystemMemoryBase)

-#define ARM_VE_DRAM_SZ                          PcdGet32 (PcdSystemMemorySize)

+#define ARM_VE_DRAM_BASE                        PcdGet64 (PcdSystemMemoryBase)

+#define ARM_VE_DRAM_SZ                          PcdGet64 (PcdSystemMemorySize)

 // Inside the DRAM we allocate a section for the VRAM (Video RAM)

 #define LCD_VRAM_CORE_TILE_BASE                     0x64000000

 

diff --git a/ArmPlatformPkg/ArmVExpressPkg/Include/Platform/RTSM/ArmPlatform.h b/ArmPlatformPkg/ArmVExpressPkg/Include/Platform/RTSM/ArmPlatform.h
index b568d6fa2e..06414e6e72 100644
--- a/ArmPlatformPkg/ArmVExpressPkg/Include/Platform/RTSM/ArmPlatform.h
+++ b/ArmPlatformPkg/ArmVExpressPkg/Include/Platform/RTSM/ArmPlatform.h
@@ -45,8 +45,8 @@
 #define ARM_VE_SMB_PERIPH_SZ                    SIZE_64MB

 

 // DRAM

-#define ARM_VE_DRAM_BASE                        PcdGet32 (PcdSystemMemoryBase)

-#define ARM_VE_DRAM_SZ                          PcdGet32 (PcdSystemMemorySize)

+#define ARM_VE_DRAM_BASE                        PcdGet64 (PcdSystemMemoryBase)

+#define ARM_VE_DRAM_SZ                          PcdGet64 (PcdSystemMemorySize)

 

 // This can be any value since we only support motherboard PL111

 #define LCD_VRAM_CORE_TILE_BASE                 0x00000000

diff --git a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA15-A7/CTA15-A7Mem.c b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA15-A7/CTA15-A7Mem.c
index 473b3f323e..e633c89375 100644
--- a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA15-A7/CTA15-A7Mem.c
+++ b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA15-A7/CTA15-A7Mem.c
@@ -136,18 +136,18 @@ ArmPlatformGetVirtualMemoryMap (
 

 #ifndef ARM_BIGLITTLE_TC2

   // Workaround for SRAM bug in RTSM

-  if (PcdGet32 (PcdSystemMemoryBase) != 0x80000000) {

+  if (PcdGet64 (PcdSystemMemoryBase) != 0x80000000) {

     VirtualMemoryTable[++Index].PhysicalBase  = 0x80000000;

     VirtualMemoryTable[Index].VirtualBase     = 0x80000000;

-    VirtualMemoryTable[Index].Length          = PcdGet32 (PcdSystemMemoryBase) - 0x80000000;

+    VirtualMemoryTable[Index].Length          = PcdGet64 (PcdSystemMemoryBase) - 0x80000000;

     VirtualMemoryTable[Index].Attributes      = CacheAttributes;

   }

 #endif

 

   // DDR

-  VirtualMemoryTable[++Index].PhysicalBase  = PcdGet32 (PcdSystemMemoryBase);

-  VirtualMemoryTable[Index].VirtualBase     = PcdGet32 (PcdSystemMemoryBase);

-  VirtualMemoryTable[Index].Length          = PcdGet32 (PcdSystemMemorySize);

+  VirtualMemoryTable[++Index].PhysicalBase  = PcdGet64 (PcdSystemMemoryBase);

+  VirtualMemoryTable[Index].VirtualBase     = PcdGet64 (PcdSystemMemoryBase);

+  VirtualMemoryTable[Index].Length          = PcdGet64 (PcdSystemMemorySize);

   VirtualMemoryTable[Index].Attributes      = CacheAttributes;

 

   // Detect if it is a 1GB or 2GB Test Chip

@@ -159,13 +159,13 @@ ArmPlatformGetVirtualMemoryMap (
         EFI_RESOURCE_ATTRIBUTE_PRESENT | EFI_RESOURCE_ATTRIBUTE_INITIALIZED | EFI_RESOURCE_ATTRIBUTE_UNCACHEABLE |

           EFI_RESOURCE_ATTRIBUTE_WRITE_COMBINEABLE | EFI_RESOURCE_ATTRIBUTE_WRITE_THROUGH_CACHEABLE | EFI_RESOURCE_ATTRIBUTE_WRITE_BACK_CACHEABLE |

           EFI_RESOURCE_ATTRIBUTE_TESTED,

-        PcdGet32 (PcdSystemMemoryBase) + PcdGet32 (PcdSystemMemorySize),

+        PcdGet64 (PcdSystemMemoryBase) + PcdGet64 (PcdSystemMemorySize),

         SIZE_1GB

     );

 

     // Map the additional 1GB into the MMU

-    VirtualMemoryTable[++Index].PhysicalBase  = PcdGet32 (PcdSystemMemoryBase) + PcdGet32 (PcdSystemMemorySize);

-    VirtualMemoryTable[Index].VirtualBase     = PcdGet32 (PcdSystemMemoryBase) + PcdGet32 (PcdSystemMemorySize);

+    VirtualMemoryTable[++Index].PhysicalBase  = PcdGet64 (PcdSystemMemoryBase) + PcdGet64 (PcdSystemMemorySize);

+    VirtualMemoryTable[Index].VirtualBase     = PcdGet64 (PcdSystemMemoryBase) + PcdGet64 (PcdSystemMemorySize);

     VirtualMemoryTable[Index].Length          = SIZE_1GB;

     VirtualMemoryTable[Index].Attributes      = CacheAttributes;

   }

diff --git a/ArmPlatformPkg/Library/ArmPlatformGlobalVariableLib/PrePi/PrePiArmPlatformGlobalVariableLib.c b/ArmPlatformPkg/Library/ArmPlatformGlobalVariableLib/PrePi/PrePiArmPlatformGlobalVariableLib.c
index 47430e302b..02cbb00daf 100644
--- a/ArmPlatformPkg/Library/ArmPlatformGlobalVariableLib/PrePi/PrePiArmPlatformGlobalVariableLib.c
+++ b/ArmPlatformPkg/Library/ArmPlatformGlobalVariableLib/PrePi/PrePiArmPlatformGlobalVariableLib.c
@@ -19,8 +19,8 @@
 #include <Library/PcdLib.h>

 #include <Library/DebugLib.h>

 

-#define IS_XIP() (((UINT32)PcdGet32 (PcdFdBaseAddress) > (UINT32)(PcdGet32 (PcdSystemMemoryBase) + PcdGet32 (PcdSystemMemorySize))) || \

-                  ((PcdGet32 (PcdFdBaseAddress) + PcdGet32 (PcdFdSize)) < PcdGet32 (PcdSystemMemoryBase)))

+#define IS_XIP() (((UINT32)PcdGet32 (PcdFdBaseAddress) > (UINT32)(PcdGet64 (PcdSystemMemoryBase) + PcdGet64 (PcdSystemMemorySize))) || \

+                  ((PcdGet32 (PcdFdBaseAddress) + PcdGet32 (PcdFdSize)) < PcdGet64 (PcdSystemMemoryBase)))

 

 // Declared by ArmPlatformPkg/PrePi Module

 extern UINTN mGlobalVariableBase;

@@ -40,7 +40,7 @@ ArmPlatformGetGlobalVariable (
   if (IS_XIP()) {

     // In Case of XIP, we expect the Primary Stack at the top of the System Memory

     // The size must be 64bit aligned to allow 64bit variable to be aligned

-    GlobalVariableBase = PcdGet32 (PcdSystemMemoryBase) + PcdGet32 (PcdSystemMemorySize) - ALIGN_VALUE(PcdGet32 (PcdPeiGlobalVariableSize),0x8);

+    GlobalVariableBase = PcdGet64 (PcdSystemMemoryBase) + PcdGet64 (PcdSystemMemorySize) - ALIGN_VALUE(PcdGet32 (PcdPeiGlobalVariableSize),0x8);

   } else {

     GlobalVariableBase = mGlobalVariableBase;

   }

@@ -69,7 +69,7 @@ ArmPlatformSetGlobalVariable (
   if (IS_XIP()) {

     // In Case of XIP, we expect the Primary Stack at the top of the System Memory

     // The size must be 64bit aligned to allow 64bit variable to be aligned

-    GlobalVariableBase = PcdGet32 (PcdSystemMemoryBase) + PcdGet32 (PcdSystemMemorySize) - ALIGN_VALUE(PcdGet32 (PcdPeiGlobalVariableSize),0x8);

+    GlobalVariableBase = PcdGet64 (PcdSystemMemoryBase) + PcdGet64 (PcdSystemMemorySize) - ALIGN_VALUE(PcdGet32 (PcdPeiGlobalVariableSize),0x8);

   } else {

     GlobalVariableBase = mGlobalVariableBase;

   }

@@ -96,7 +96,7 @@ ArmPlatformGetGlobalVariableAddress (
   if (IS_XIP()) {

     // In Case of XIP, we expect the Primary Stack at the top of the System Memory

     // The size must be 64bit aligned to allow 64bit variable to be aligned

-    GlobalVariableBase = PcdGet32 (PcdSystemMemoryBase) + PcdGet32 (PcdSystemMemorySize) - ALIGN_VALUE(PcdGet32 (PcdPeiGlobalVariableSize),0x8);

+    GlobalVariableBase = PcdGet64 (PcdSystemMemoryBase) + PcdGet64 (PcdSystemMemorySize) - ALIGN_VALUE(PcdGet32 (PcdPeiGlobalVariableSize),0x8);

   } else {

     GlobalVariableBase = mGlobalVariableBase;

   }

diff --git a/ArmPlatformPkg/MemoryInitPei/MemoryInitPeiLib.c b/ArmPlatformPkg/MemoryInitPei/MemoryInitPeiLib.c
index d1bf394c45..0214897d8b 100755
--- a/ArmPlatformPkg/MemoryInitPei/MemoryInitPeiLib.c
+++ b/ArmPlatformPkg/MemoryInitPei/MemoryInitPeiLib.c
@@ -78,7 +78,7 @@ MemoryPeim (
   BOOLEAN                     Found;

 

   // Ensure PcdSystemMemorySize has been set

-  ASSERT (PcdGet32 (PcdSystemMemorySize) != 0);

+  ASSERT (PcdGet64 (PcdSystemMemorySize) != 0);

 

   //

   // Now, the permanent memory has been installed, we can call AllocatePages()

@@ -97,16 +97,16 @@ MemoryPeim (
   BuildResourceDescriptorHob (

       EFI_RESOURCE_SYSTEM_MEMORY,

       ResourceAttributes,

-      PcdGet32 (PcdSystemMemoryBase),

-      PcdGet32 (PcdSystemMemorySize)

+      PcdGet64 (PcdSystemMemoryBase),

+      PcdGet64 (PcdSystemMemorySize)

   );

 

-  SystemMemoryTop = (EFI_PHYSICAL_ADDRESS)PcdGet32 (PcdSystemMemoryBase) + (EFI_PHYSICAL_ADDRESS)PcdGet32 (PcdSystemMemorySize);

+  SystemMemoryTop = (EFI_PHYSICAL_ADDRESS)PcdGet64 (PcdSystemMemoryBase) + (EFI_PHYSICAL_ADDRESS)PcdGet64 (PcdSystemMemorySize);

   FdTop = (EFI_PHYSICAL_ADDRESS)PcdGet32(PcdFdBaseAddress) + (EFI_PHYSICAL_ADDRESS)PcdGet32(PcdFdSize);

 

   // EDK2 does not have the concept of boot firmware copied into DRAM. To avoid the DXE

   // core to overwrite this area we must mark the region with the attribute non-present

-  if ((PcdGet32 (PcdFdBaseAddress) >= PcdGet32 (PcdSystemMemoryBase)) && (FdTop <= SystemMemoryTop)) {

+  if ((PcdGet32 (PcdFdBaseAddress) >= PcdGet64 (PcdSystemMemoryBase)) && (FdTop <= SystemMemoryTop)) {

     Found = FALSE;

 

     // Search for System Memory Hob that contains the firmware

diff --git a/ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.c b/ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.c
index 1de7d38078..c6a6fe64ba 100755
--- a/ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.c
+++ b/ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.c
@@ -104,10 +104,10 @@ InitializeMemory (
   DEBUG ((EFI_D_ERROR, "Memory Init PEIM Loaded\n"));

 

   // Ensure PcdSystemMemorySize has been set

-  ASSERT (FixedPcdGet32 (PcdSystemMemorySize) != 0);

+  ASSERT (FixedPcdGet64 (PcdSystemMemorySize) != 0);

 

-  SystemMemoryBase = (UINTN)FixedPcdGet32 (PcdSystemMemoryBase);

-  SystemMemoryTop = SystemMemoryBase + (UINTN)FixedPcdGet32 (PcdSystemMemorySize);

+  SystemMemoryBase = (UINTN)FixedPcdGet64 (PcdSystemMemoryBase);

+  SystemMemoryTop = SystemMemoryBase + (UINTN)FixedPcdGet64 (PcdSystemMemorySize);

   FdBase = (UINTN)PcdGet32 (PcdFdBaseAddress);

   FdTop = FdBase + (UINTN)PcdGet32 (PcdFdSize);

 

diff --git a/ArmPlatformPkg/PrePi/AArch64/ModuleEntryPoint.S b/ArmPlatformPkg/PrePi/AArch64/ModuleEntryPoint.S
index 6358e3a27e..86b2f24591 100644
--- a/ArmPlatformPkg/PrePi/AArch64/ModuleEntryPoint.S
+++ b/ArmPlatformPkg/PrePi/AArch64/ModuleEntryPoint.S
@@ -42,8 +42,8 @@ _SetSVCMode:
 // at the top of the DRAM)

 _SetupStackPosition:

   // Compute Top of System Memory

-  LoadConstantToReg (FixedPcdGet32(PcdSystemMemoryBase), x1)

-  LoadConstantToReg (FixedPcdGet32(PcdSystemMemorySize), x2)

+  LoadConstantToReg (FixedPcdGet64 (PcdSystemMemoryBase), x1)

+  LoadConstantToReg (FixedPcdGet64 (PcdSystemMemorySize), x2)

   sub   x2, x2, #1

   add   x1, x1, x2      // x1 = SystemMemoryTop = PcdSystemMemoryBase + PcdSystemMemorySize

 

diff --git a/ArmPlatformPkg/PrePi/Arm/ModuleEntryPoint.S b/ArmPlatformPkg/PrePi/Arm/ModuleEntryPoint.S
index 3d4e1e9279..50671aecd7 100644
--- a/ArmPlatformPkg/PrePi/Arm/ModuleEntryPoint.S
+++ b/ArmPlatformPkg/PrePi/Arm/ModuleEntryPoint.S
@@ -50,8 +50,8 @@ _SetSVCMode:
 // at the top of the DRAM)

 _SetupStackPosition:

   // Compute Top of System Memory

-  LoadConstantToReg (FixedPcdGet32(PcdSystemMemoryBase), r1)

-  LoadConstantToReg (FixedPcdGet32(PcdSystemMemorySize), r2)

+  LoadConstantToReg (FixedPcdGet64 (PcdSystemMemoryBase), r1)

+  LoadConstantToReg (FixedPcdGet64 (PcdSystemMemorySize), r2)

   sub   r2, r2, #1

   add   r1, r1, r2      // r1 = SystemMemoryTop = PcdSystemMemoryBase + PcdSystemMemorySize

 

diff --git a/ArmPlatformPkg/PrePi/Arm/ModuleEntryPoint.asm b/ArmPlatformPkg/PrePi/Arm/ModuleEntryPoint.asm
index 993fccfa47..f76b62e5d0 100644
--- a/ArmPlatformPkg/PrePi/Arm/ModuleEntryPoint.asm
+++ b/ArmPlatformPkg/PrePi/Arm/ModuleEntryPoint.asm
@@ -52,8 +52,8 @@ _SetSVCMode
 // at the top of the DRAM)

 _SetupStackPosition

   // Compute Top of System Memory

-  LoadConstantToReg (FixedPcdGet32(PcdSystemMemoryBase), r1)

-  LoadConstantToReg (FixedPcdGet32(PcdSystemMemorySize), r2)

+  LoadConstantToReg (FixedPcdGet64 (PcdSystemMemoryBase), r1)

+  LoadConstantToReg (FixedPcdGet64 (PcdSystemMemorySize), r2)

   sub   r2, r2, #1

   add   r1, r1, r2      // r1 = SystemMemoryTop = PcdSystemMemoryBase + PcdSystemMemorySize

 

diff --git a/ArmPlatformPkg/PrePi/PrePi.c b/ArmPlatformPkg/PrePi/PrePi.c
index 7ef88c0e36..d54ebf9337 100755
--- a/ArmPlatformPkg/PrePi/PrePi.c
+++ b/ArmPlatformPkg/PrePi/PrePi.c
@@ -30,8 +30,8 @@
 #include "PrePi.h"

 #include "LzmaDecompress.h"

 

-#define IS_XIP() (((UINT32)FixedPcdGet32 (PcdFdBaseAddress) > (UINT32)(FixedPcdGet32 (PcdSystemMemoryBase) + FixedPcdGet32 (PcdSystemMemorySize))) || \

-                  ((FixedPcdGet32 (PcdFdBaseAddress) + FixedPcdGet32 (PcdFdSize)) < FixedPcdGet32 (PcdSystemMemoryBase)))

+#define IS_XIP() (((UINT32)FixedPcdGet32 (PcdFdBaseAddress) > (UINT32)(FixedPcdGet64 (PcdSystemMemoryBase) + FixedPcdGet32 (PcdSystemMemorySize))) || \

+                  ((FixedPcdGet32 (PcdFdBaseAddress) + FixedPcdGet32 (PcdFdSize)) < FixedPcdGet64 (PcdSystemMemoryBase)))

 

 // Not used when PrePi in run in XIP mode

 UINTN mGlobalVariableBase = 0;

@@ -108,8 +108,8 @@ PrePiMain (
 

   // If ensure the FD is either part of the System Memory or totally outside of the System Memory (XIP)

   ASSERT (IS_XIP() || 

-          ((FixedPcdGet32 (PcdFdBaseAddress) >= FixedPcdGet32 (PcdSystemMemoryBase)) &&

-           ((UINT32)(FixedPcdGet32 (PcdFdBaseAddress) + FixedPcdGet32 (PcdFdSize)) <= (UINT32)(FixedPcdGet32 (PcdSystemMemoryBase) + FixedPcdGet32 (PcdSystemMemorySize)))));

+          ((FixedPcdGet32 (PcdFdBaseAddress) >= FixedPcdGet64 (PcdSystemMemoryBase)) &&

+           ((UINT32)(FixedPcdGet32 (PcdFdBaseAddress) + FixedPcdGet32 (PcdFdSize)) <= (UINT32)(FixedPcdGet64 (PcdSystemMemoryBase) + FixedPcdGet64 (PcdSystemMemorySize)))));

 

   // Initialize the architecture specific bits

   ArchInitialize ();