ArmPkg,ArmPlatformPkg: Allow dynamic PCDs for memory base and size

This changes the definition and a bunch of references to
gArmTokenSpaceGuid.PcdSystemMemoryBase and
gArmTokenSpaceGuid.PcdSystemMemorySize so they can be declared as dynamic PCDs
by the platform. Also, move the non-SEC call to
ArmPlatformInitializeSystemMemory() earlier, so a platform has a chance to set
these PCDs before they are first referenced.

The purpose is allowing dynamically instantiated virtual machines to declare
the system memory by passing a device tree.

Contributed-under: TianoCore Contribution Agreement 1.0
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: Olivier Martin <olivier.martin@arm.com>



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

7 files changed, 35 insertions, 29 deletions

diff --git a/ArmPkg/ArmPkg.dec b/ArmPkg/ArmPkg.dec
index ae22457b5f..05bc1dcd6d 100644
--- a/ArmPkg/ArmPkg.dec
+++ b/ArmPkg/ArmPkg.dec
@@ -105,12 +105,6 @@
   gArmTokenSpaceGuid.PcdHypFvBaseAddress|0|UINT32|0x0000003C

   gArmTokenSpaceGuid.PcdHypFvSize|0|UINT32|0x0000003D

 

-  # System Memory (DRAM): These PCDs define the region of in-built system memory

-  # Some platforms can get DRAM extensions, these additional regions will be declared

-  # to UEFI by ArmPlatformLib

-  gArmTokenSpaceGuid.PcdSystemMemoryBase|0|UINT64|0x00000029

-  gArmTokenSpaceGuid.PcdSystemMemorySize|0|UINT64|0x0000002A

-

   # Use ClusterId + CoreId to identify the PrimaryCore

   gArmTokenSpaceGuid.PcdArmPrimaryCoreMask|0xF03|UINT32|0x00000031

   # The Primary Core is ClusterId[0] & CoreId[0]

@@ -214,6 +208,12 @@
 # context of virtual machine.

 #

 [PcdsFixedAtBuild.common, PcdsDynamic.common]

+  # System Memory (DRAM): These PCDs define the region of in-built system memory

+  # Some platforms can get DRAM extensions, these additional regions will be declared

+  # to UEFI by ArmPlatformLib

+  gArmTokenSpaceGuid.PcdSystemMemoryBase|0|UINT64|0x00000029

+  gArmTokenSpaceGuid.PcdSystemMemorySize|0|UINT64|0x0000002A

+

   #

   # ARM Architectural Timer

   #

diff --git a/ArmPkg/Library/BdsLib/BdsLib.inf b/ArmPkg/Library/BdsLib/BdsLib.inf
index ddd65aae8e..02409e1392 100644
--- a/ArmPkg/Library/BdsLib/BdsLib.inf
+++ b/ArmPkg/Library/BdsLib/BdsLib.inf
@@ -78,10 +78,11 @@
 [FeaturePcd]

   gArmTokenSpaceGuid.PcdArmLinuxSpinTable

 

-[FixedPcd]

+[Pcd]

   gArmTokenSpaceGuid.PcdSystemMemoryBase

   gArmTokenSpaceGuid.PcdSystemMemorySize

 

+[FixedPcd]

   gArmTokenSpaceGuid.PcdArmMachineType

   gArmTokenSpaceGuid.PcdArmLinuxFdtMaxOffset

   gArmTokenSpaceGuid.PcdArmLinuxFdtAlignment

diff --git a/ArmPlatformPkg/Library/ArmPlatformGlobalVariableLib/PrePi/PrePiArmPlatformGlobalVariableLib.inf b/ArmPlatformPkg/Library/ArmPlatformGlobalVariableLib/PrePi/PrePiArmPlatformGlobalVariableLib.inf
index 5d3a93fb72..596f559541 100644
--- a/ArmPlatformPkg/Library/ArmPlatformGlobalVariableLib/PrePi/PrePiArmPlatformGlobalVariableLib.inf
+++ b/ArmPlatformPkg/Library/ArmPlatformGlobalVariableLib/PrePi/PrePiArmPlatformGlobalVariableLib.inf
@@ -37,9 +37,10 @@
   gArmTokenSpaceGuid.PcdFdBaseAddress

   gArmTokenSpaceGuid.PcdFdSize

 

-  gArmTokenSpaceGuid.PcdSystemMemoryBase

-  gArmTokenSpaceGuid.PcdSystemMemorySize

-

   gArmPlatformTokenSpaceGuid.PcdCPUCorePrimaryStackSize

   gArmPlatformTokenSpaceGuid.PcdPeiGlobalVariableSize

 

+[Pcd]

+  gArmTokenSpaceGuid.PcdSystemMemoryBase

+  gArmTokenSpaceGuid.PcdSystemMemorySize

+

diff --git a/ArmPlatformPkg/MemoryInitPei/MemoryInitPeiLib.inf b/ArmPlatformPkg/MemoryInitPei/MemoryInitPeiLib.inf
index 4b21caa027..1e5b93e8a5 100755
--- a/ArmPlatformPkg/MemoryInitPei/MemoryInitPeiLib.inf
+++ b/ArmPlatformPkg/MemoryInitPei/MemoryInitPeiLib.inf
@@ -1,6 +1,6 @@
 #/** @file

 #

-#  Copyright (c) 2011, ARM Ltd. All rights reserved.<BR>

+#  Copyright (c) 2011-2014, ARM Ltd. All rights reserved.<BR>

 #  This program and the accompanying materials

 #  are licensed and made available under the terms and conditions of the BSD License

 #  which accompanies this distribution.  The full text of the license may be found at

@@ -39,8 +39,6 @@
 [Guids]

   gEfiMemoryTypeInformationGuid

 

-[Ppis]

-

 [FeaturePcd]

   gEmbeddedTokenSpaceGuid.PcdPrePiProduceMemoryTypeInformationHob

 

@@ -48,8 +46,6 @@
   gArmTokenSpaceGuid.PcdFdBaseAddress

   gArmTokenSpaceGuid.PcdFdSize

 

-  gArmTokenSpaceGuid.PcdSystemMemoryBase

-  gArmTokenSpaceGuid.PcdSystemMemorySize

   gArmPlatformTokenSpaceGuid.PcdSystemMemoryUefiRegionSize

 

   gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiACPIReclaimMemory

@@ -62,5 +58,9 @@
   gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiLoaderCode

   gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiLoaderData

 

-[depex]

+[Pcd]

+  gArmTokenSpaceGuid.PcdSystemMemoryBase

+  gArmTokenSpaceGuid.PcdSystemMemorySize

+

+[Depex]

   TRUE

diff --git a/ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.c b/ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.c
index 4821fdc2fa..587c4b5ce3 100755
--- a/ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.c
+++ b/ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.c
@@ -103,14 +103,6 @@ InitializeMemory (
 

   DEBUG ((EFI_D_ERROR, "Memory Init PEIM Loaded\n"));

 

-  // Ensure PcdSystemMemorySize has been set

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

-

-  SystemMemoryBase = (UINTN)FixedPcdGet64 (PcdSystemMemoryBase);

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

-  FdBase = (UINTN)PcdGet32 (PcdFdBaseAddress);

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

-

   //

   // Initialize the System Memory (DRAM)

   //

@@ -119,6 +111,14 @@ InitializeMemory (
     ArmPlatformInitializeSystemMemory ();

   }

 

+  // Ensure PcdSystemMemorySize has been set

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

+

+  SystemMemoryBase = (UINTN)PcdGet64 (PcdSystemMemoryBase);

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

+  FdBase = (UINTN)PcdGet32 (PcdFdBaseAddress);

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

+

   //

   // Declare the UEFI memory to PEI

   //

diff --git a/ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.inf b/ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.inf
index 504026e90f..6374b63f85 100755
--- a/ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.inf
+++ b/ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.inf
@@ -1,6 +1,6 @@
 #/** @file

 #

-#  Copyright (c) 2011, ARM Ltd. All rights reserved.<BR>

+#  Copyright (c) 2011-2014, ARM Ltd. All rights reserved.<BR>

 #  This program and the accompanying materials

 #  are licensed and made available under the terms and conditions of the BSD License

 #  which accompanies this distribution.  The full text of the license may be found at

@@ -55,8 +55,6 @@
   gArmTokenSpaceGuid.PcdFdBaseAddress

   gArmTokenSpaceGuid.PcdFdSize

 

-  gArmTokenSpaceGuid.PcdSystemMemoryBase

-  gArmTokenSpaceGuid.PcdSystemMemorySize

   gArmPlatformTokenSpaceGuid.PcdSystemMemoryUefiRegionSize

 

   gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiACPIReclaimMemory

@@ -69,5 +67,9 @@
   gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiLoaderCode

   gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiLoaderData

 

+[Pcd]

+  gArmTokenSpaceGuid.PcdSystemMemoryBase

+  gArmTokenSpaceGuid.PcdSystemMemorySize

+

 [Depex]

   TRUE

diff --git a/ArmPlatformPkg/PrePi/PeiUniCore.inf b/ArmPlatformPkg/PrePi/PeiUniCore.inf
index 1c0737bded..f8925737ff 100755
--- a/ArmPlatformPkg/PrePi/PeiUniCore.inf
+++ b/ArmPlatformPkg/PrePi/PeiUniCore.inf
@@ -88,8 +88,6 @@
 

   gArmPlatformTokenSpaceGuid.PcdPeiGlobalVariableSize

 

-  gArmTokenSpaceGuid.PcdSystemMemoryBase

-  gArmTokenSpaceGuid.PcdSystemMemorySize

   gArmPlatformTokenSpaceGuid.PcdSystemMemoryUefiRegionSize

 

   gArmPlatformTokenSpaceGuid.PcdCoreCount

@@ -106,3 +104,7 @@
   gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiBootServicesData

   gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiLoaderCode

   gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiLoaderData

+

+[Pcd]

+  gArmTokenSpaceGuid.PcdSystemMemoryBase

+  gArmTokenSpaceGuid.PcdSystemMemorySize