ArmPlatformPkg: Change the memory model for the ARM Platform components

In the former memory model, the UEFI firmware was expected to be located
at the top of the system memory. Stacks & Pi memory regions were set below
the firmware.
On some platform, the UEFI firmware could be shadowed by the ROM firmware
(case of the BeagleBoard) and in some cases the firmware is copied at the
beginning of the system memory.

With this new memory model, stack and Pi/DXE memory regions are set at the
top of the system memory wherever the UEFI firmware is located in the memory
map.
Because DXE core does not support shadowed firmwares, the system memory covered
by the UEFI firmware is marked as 'Non Present' to avoid to be overlapped by
DXE allocations.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11992 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/ArmPlatformPkg/ArmPlatformPkg.dec b/ArmPlatformPkg/ArmPlatformPkg.dec
index 898dcc105d657a08534052604bf56915e0bb16e0..a8c412a32bf7fea5d127df5b1e60ed417b4ddc53 100644 (file)
--- a/ArmPlatformPkg/ArmPlatformPkg.dec
+++ b/ArmPlatformPkg/ArmPlatformPkg.dec
@@ -51,6 +51,7 @@
   # These PCDs should be FeaturePcds. But we used these PCDs as an '#if' in an ASM file.
   # Using a FeaturePcd make a '(BOOLEAN) casting for its value which is not understood by the preprocessor.
   gArmPlatformTokenSpaceGuid.PcdMPCoreSupport|0|UINT32|0x00000003
   # These PCDs should be FeaturePcds. But we used these PCDs as an '#if' in an ASM file.
   # Using a FeaturePcd make a '(BOOLEAN) casting for its value which is not understood by the preprocessor.
   gArmPlatformTokenSpaceGuid.PcdMPCoreSupport|0|UINT32|0x00000003

+  gArmPlatformTokenSpaceGuid.PcdMPCoreMaxCores|1|UINT32|0x0000002D

   
   # Stack for CPU Cores in Secure Mode
   gArmPlatformTokenSpaceGuid.PcdCPUCoresSecStackBase|0|UINT32|0x00000005
   
   # Stack for CPU Cores in Secure Mode
   gArmPlatformTokenSpaceGuid.PcdCPUCoresSecStackBase|0|UINT32|0x00000005


@@ -67,9 +68,6 @@
   # Size of the region used by UEFI in permanent memory (Reserved 128MB by default)
   gArmPlatformTokenSpaceGuid.PcdSystemMemoryUefiRegionSize|0x08000000|UINT32|0x00000015
 
   # Size of the region used by UEFI in permanent memory (Reserved 128MB by default)
   gArmPlatformTokenSpaceGuid.PcdSystemMemoryUefiRegionSize|0x08000000|UINT32|0x00000015
 

-  # Size of the region reserved for fixed address allocations (Reserved 128MB by default)
-  gArmPlatformTokenSpaceGuid.PcdSystemMemoryFixRegionSize|0x08000000|UINT32|0x00000014
-

   # Size to reserve in the primary core stack for PEI Global Variables
   #  = sizeof(UINTN) /* PcdPeiServicePtr or HobListPtr */
   gArmPlatformTokenSpaceGuid.PcdPeiGlobalVariableSize|0x4|UINT32|0x00000016
   # Size to reserve in the primary core stack for PEI Global Variables
   #  = sizeof(UINTN) /* PcdPeiServicePtr or HobListPtr */
   gArmPlatformTokenSpaceGuid.PcdPeiGlobalVariableSize|0x4|UINT32|0x00000016

diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A9x2.dsc b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A9x2.dsc
index 69e724bcbbcc6581d6e471597c6823587567c698..2aaaa91064893ff41c69420e18e98c9ae8058207 100644 (file)
--- a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A9x2.dsc
+++ b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A9x2.dsc
@@ -348,6 +348,7 @@
   gArmTokenSpaceGuid.PcdCpuVectorBaseAddress|0x00000000
   
   gArmPlatformTokenSpaceGuid.PcdMPCoreSupport|1
   gArmTokenSpaceGuid.PcdCpuVectorBaseAddress|0x00000000
   
   gArmPlatformTokenSpaceGuid.PcdMPCoreSupport|1

+  gArmPlatformTokenSpaceGuid.PcdMPCoreMaxCores|2

   
   # Stacks for MPCores in Secure World
   gArmPlatformTokenSpaceGuid.PcdCPUCoresSecStackBase|0x4B000000     # Top of SEC Stack for Secure World
   
   # Stacks for MPCores in Secure World
   gArmPlatformTokenSpaceGuid.PcdCPUCoresSecStackBase|0x4B000000     # Top of SEC Stack for Secure World

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc
index 34e3d9929de2fc1c122f275b14b77aee84677a89..3afba5258147c43e4d12679251a13a8202b6d328 100644 (file)
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc
@@ -384,6 +384,7 @@
   gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiLoaderData|0
   
   gArmPlatformTokenSpaceGuid.PcdMPCoreSupport|1
   gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiLoaderData|0
   
   gArmPlatformTokenSpaceGuid.PcdMPCoreSupport|1

+  gArmPlatformTokenSpaceGuid.PcdMPCoreMaxCores|4

   gArmTokenSpaceGuid.PcdVFPEnabled|1
   
   # Stacks for MPCores in Secure World
   gArmTokenSpaceGuid.PcdVFPEnabled|1
   
   # Stacks for MPCores in Secure World

diff --git a/ArmPlatformPkg/MemoryInitPei/MemoryInitPeiLib.c b/ArmPlatformPkg/MemoryInitPei/MemoryInitPeiLib.c
index 95d40b2c4481bce18bfa0732a23759e7a09d0b5d..8469c235eb84542ba51b87cd4f7c80082bf7f2d8 100755 (executable)
--- a/ArmPlatformPkg/MemoryInitPei/MemoryInitPeiLib.c
+++ b/ArmPlatformPkg/MemoryInitPei/MemoryInitPeiLib.c
@@ -67,21 +67,21 @@ MemoryPeim (
   IN UINT64                             UefiMemorySize\r
   )\r
 {\r
   IN UINT64                             UefiMemorySize\r
   )\r
 {\r

-  EFI_STATUS                            Status;\r
-  EFI_RESOURCE_ATTRIBUTE_TYPE           Attributes;\r
-  ARM_SYSTEM_MEMORY_REGION_DESCRIPTOR*  EfiMemoryMap;\r
-  UINTN                                 Index;\r
-  EFI_PHYSICAL_ADDRESS                  SystemMemoryTop;\r
+  EFI_RESOURCE_ATTRIBUTE_TYPE ResourceAttributes;\r
+  UINT64                      ResourceLength;\r
+  EFI_PEI_HOB_POINTERS        NextHob;\r
+  EFI_PHYSICAL_ADDRESS        FdTop;\r
+  EFI_PHYSICAL_ADDRESS        SystemMemoryTop;\r
+  EFI_PHYSICAL_ADDRESS        ResourceTop;\r
+  BOOLEAN                     Found;\r

 \r
   // Ensure PcdSystemMemorySize has been set\r
   ASSERT (PcdGet32 (PcdSystemMemorySize) != 0);\r
 \r
 \r
   // Ensure PcdSystemMemorySize has been set\r
   ASSERT (PcdGet32 (PcdSystemMemorySize) != 0);\r
 \r

-  SystemMemoryTop = (EFI_PHYSICAL_ADDRESS)((UINT32)PcdGet32 (PcdSystemMemoryBase) + (UINT32)PcdGet32 (PcdSystemMemorySize));\r
-\r

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

-  Attributes = (\r
+  ResourceAttributes = (\r

       EFI_RESOURCE_ATTRIBUTE_PRESENT |\r
       EFI_RESOURCE_ATTRIBUTE_INITIALIZED |\r
       EFI_RESOURCE_ATTRIBUTE_UNCACHEABLE |\r
       EFI_RESOURCE_ATTRIBUTE_PRESENT |\r
       EFI_RESOURCE_ATTRIBUTE_INITIALIZED |\r
       EFI_RESOURCE_ATTRIBUTE_UNCACHEABLE |\r


@@ -91,70 +91,73 @@ MemoryPeim (
       EFI_RESOURCE_ATTRIBUTE_TESTED\r
   );\r
 \r
       EFI_RESOURCE_ATTRIBUTE_TESTED\r
   );\r
 \r

-  // If it is not a standalone build we must reserved the space above the base address of the firmware volume\r
-  if (!PcdGet32(PcdStandalone)) {\r
-    // Check if firmware volume has not be copied at the top of DRAM then we must reserve the extra space\r
-    // between the firmware and the top\r
-    if (SystemMemoryTop != PcdGet32 (PcdNormalFdBaseAddress) + PcdGet32 (PcdNormalFdSize)) {\r
-      BuildResourceDescriptorHob (\r
-          EFI_RESOURCE_SYSTEM_MEMORY,\r
-          Attributes & (~EFI_RESOURCE_ATTRIBUTE_TESTED),\r
-          PcdGet32 (PcdNormalFdBaseAddress) + PcdGet32 (PcdNormalFdSize),\r
-          SystemMemoryTop - (PcdGet32 (PcdNormalFdBaseAddress) + PcdGet32 (PcdNormalFdSize))\r
-      );\r
-    }\r
-\r
-    // Reserved the memory space occupied by the firmware volume\r
-    BuildResourceDescriptorHob (\r
-        EFI_RESOURCE_SYSTEM_MEMORY,\r
-        Attributes & (~EFI_RESOURCE_ATTRIBUTE_PRESENT),\r
-        (UINT32)PcdGet32 (PcdNormalFdBaseAddress),\r
-        (UINT32)PcdGet32 (PcdNormalFdSize)\r
-    );\r
-  }\r
-\r
-  // Check there is no overlap between UEFI and Fix Address Regions\r
-  ASSERT (PcdGet32 (PcdSystemMemoryBase) + PcdGet32 (PcdSystemMemoryFixRegionSize) <= UefiMemoryBase);\r
-\r
-  // Reserved the UEFI Memory Region\r
+  // Reserved the memory space occupied by the firmware volume\r

   BuildResourceDescriptorHob (\r
       EFI_RESOURCE_SYSTEM_MEMORY,\r
   BuildResourceDescriptorHob (\r
       EFI_RESOURCE_SYSTEM_MEMORY,\r

-      Attributes,\r
-      UefiMemoryBase,\r
-      UefiMemorySize\r
-  );\r
-\r
-  // Reserved the Fix Address Region\r
-  BuildResourceDescriptorHob (\r
-      EFI_RESOURCE_SYSTEM_MEMORY,\r
-      Attributes,\r
+      ResourceAttributes,\r

       PcdGet32 (PcdSystemMemoryBase),\r
       PcdGet32 (PcdSystemMemoryBase),\r

-      PcdGet32 (PcdSystemMemoryFixRegionSize)\r
+      PcdGet32 (PcdSystemMemorySize)\r

   );\r
 \r
   );\r
 \r

-  // Reserved the memory between UEFI and Fix Address regions\r
-  if (PcdGet32 (PcdSystemMemoryBase) + PcdGet32 (PcdSystemMemoryFixRegionSize) != UefiMemoryBase) {\r
-    BuildResourceDescriptorHob (\r
-        EFI_RESOURCE_SYSTEM_MEMORY,\r
-        Attributes & (~EFI_RESOURCE_ATTRIBUTE_TESTED),\r
-        PcdGet32 (PcdSystemMemoryBase) + PcdGet32 (PcdSystemMemoryFixRegionSize),\r
-        UefiMemoryBase - (PcdGet32 (PcdSystemMemoryBase) + PcdGet32 (PcdSystemMemoryFixRegionSize))\r
-    );\r
-  }\r
-\r
-  // If a platform has system memory extensions, it can declare those in this function\r
-  Status = ArmPlatformGetAdditionalSystemMemory (&EfiMemoryMap);\r
-  if (!EFI_ERROR(Status)) {\r
-    // Install the EFI Memory Map\r
-    for (Index = 0; EfiMemoryMap[Index].ResourceAttribute != 0; Index++) {\r
-      BuildResourceDescriptorHob (\r
-          EFI_RESOURCE_SYSTEM_MEMORY,\r
-          EfiMemoryMap[Index].ResourceAttribute,\r
-          EfiMemoryMap[Index].PhysicalStart,\r
-          EfiMemoryMap[Index].NumberOfBytes\r
-      );\r
+  SystemMemoryTop = PcdGet32 (PcdSystemMemoryBase) + PcdGet32 (PcdSystemMemorySize);\r
+  FdTop = PcdGet32(PcdNormalFdBaseAddress) + PcdGet32(PcdNormalFdSize);\r
+\r
+  // EDK2 does not have the concept of boot firmware copied into DRAM. To avoid the DXE\r
+  // core to overwrite this area we must mark the region with the attribute non-present\r
+  if ((PcdGet32 (PcdNormalFdBaseAddress) >= PcdGet32 (PcdSystemMemoryBase)) && (FdTop <= SystemMemoryTop)) {\r
+    Found = FALSE;\r
+\r
+    // Search for System Memory Hob that contains the firmware\r
+    NextHob.Raw = GetHobList ();\r
+    while ((NextHob.Raw = GetNextHob (EFI_HOB_TYPE_RESOURCE_DESCRIPTOR, NextHob.Raw)) != NULL) {\r
+      if ((NextHob.ResourceDescriptor->ResourceType == EFI_RESOURCE_SYSTEM_MEMORY) &&\r
+          (PcdGet32(PcdNormalFdBaseAddress) >= NextHob.ResourceDescriptor->PhysicalStart) &&\r
+          (FdTop <= NextHob.ResourceDescriptor->PhysicalStart + NextHob.ResourceDescriptor->ResourceLength))\r
+      {\r
+        ResourceAttributes = NextHob.ResourceDescriptor->ResourceAttribute;\r
+        ResourceLength = NextHob.ResourceDescriptor->ResourceLength;\r
+        ResourceTop = NextHob.ResourceDescriptor->PhysicalStart + ResourceLength;\r
+\r
+        if (PcdGet32(PcdNormalFdBaseAddress) == NextHob.ResourceDescriptor->PhysicalStart) {\r
+          if (SystemMemoryTop == FdTop) {\r
+            NextHob.ResourceDescriptor->ResourceAttribute = ResourceAttributes & ~EFI_RESOURCE_ATTRIBUTE_PRESENT;\r
+          } else {\r
+            // Create the System Memory HOB for the firmware with the non-present attribute\r
+            BuildResourceDescriptorHob (EFI_RESOURCE_SYSTEM_MEMORY,\r
+                                        ResourceAttributes & ~EFI_RESOURCE_ATTRIBUTE_PRESENT,\r
+                                        PcdGet32(PcdNormalFdBaseAddress),\r
+                                        PcdGet32(PcdNormalFdSize));\r
+\r
+            // Top of the FD is system memory available for UEFI\r
+            NextHob.ResourceDescriptor->PhysicalStart += PcdGet32(PcdNormalFdSize);\r
+            NextHob.ResourceDescriptor->ResourceLength -= PcdGet32(PcdNormalFdSize);\r
+          }\r
+        } else {\r
+          // Create the System Memory HOB for the firmware with the non-present attribute\r
+          BuildResourceDescriptorHob (EFI_RESOURCE_SYSTEM_MEMORY,\r
+                                      ResourceAttributes & ~EFI_RESOURCE_ATTRIBUTE_PRESENT,\r
+                                      PcdGet32(PcdNormalFdBaseAddress),\r
+                                      PcdGet32(PcdNormalFdSize));\r
+\r
+          // Update the HOB\r
+          NextHob.ResourceDescriptor->ResourceLength = PcdGet32(PcdNormalFdBaseAddress) - NextHob.ResourceDescriptor->PhysicalStart;\r
+\r
+          // If there is some memory available on the top of the FD then create a HOB\r
+          if (FdTop < NextHob.ResourceDescriptor->PhysicalStart + ResourceLength) {\r
+            // Create the System Memory HOB for the remaining region (top of the FD)\r
+            BuildResourceDescriptorHob (EFI_RESOURCE_SYSTEM_MEMORY,\r
+                                        ResourceAttributes,\r
+                                        FdTop,\r
+                                        ResourceTop - FdTop);\r
+          }\r
+        }\r
+        Found = TRUE;\r
+        break;\r
+      }\r
+      NextHob.Raw = GET_NEXT_HOB (NextHob);\r

     }\r
     }\r

-    FreePool (EfiMemoryMap);\r
+\r
+    ASSERT(Found);\r

   }\r
 \r
   // Build Memory Allocation Hob\r
   }\r
 \r
   // Build Memory Allocation Hob\r

diff --git a/ArmPlatformPkg/MemoryInitPei/MemoryInitPeiLib.inf b/ArmPlatformPkg/MemoryInitPei/MemoryInitPeiLib.inf
index 57fd91fe81ef1381395943c08bf6947cdd8008f8..14623438fe6870f4116b4c06da5d6276b6d6c5e6 100755 (executable)
--- a/ArmPlatformPkg/MemoryInitPei/MemoryInitPeiLib.inf
+++ b/ArmPlatformPkg/MemoryInitPei/MemoryInitPeiLib.inf
@@ -45,14 +45,11 @@
   gEmbeddedTokenSpaceGuid.PcdPrePiProduceMemoryTypeInformationHob
 
 [FixedPcd]
   gEmbeddedTokenSpaceGuid.PcdPrePiProduceMemoryTypeInformationHob
 
 [FixedPcd]

-  gArmPlatformTokenSpaceGuid.PcdStandalone
-

   gArmTokenSpaceGuid.PcdNormalFdBaseAddress
   gArmTokenSpaceGuid.PcdNormalFdSize
 
   gArmTokenSpaceGuid.PcdSystemMemoryBase
   gArmTokenSpaceGuid.PcdSystemMemorySize
   gArmTokenSpaceGuid.PcdNormalFdBaseAddress
   gArmTokenSpaceGuid.PcdNormalFdSize
 
   gArmTokenSpaceGuid.PcdSystemMemoryBase
   gArmTokenSpaceGuid.PcdSystemMemorySize

-  gArmPlatformTokenSpaceGuid.PcdSystemMemoryFixRegionSize

   gArmPlatformTokenSpaceGuid.PcdSystemMemoryUefiRegionSize
   
   gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiACPIReclaimMemory
   gArmPlatformTokenSpaceGuid.PcdSystemMemoryUefiRegionSize
   
   gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiACPIReclaimMemory

diff --git a/ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.c b/ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.c
index f4c27c57505a9b62c51ffc7044034ae5681f15dc..3559e08862b3ee7ec64c5ee1a706d69d5687c3a3 100755 (executable)
--- a/ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.c
+++ b/ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.c
@@ -95,7 +95,10 @@ InitializeMemory (
   )\r
 {\r
   EFI_STATUS                            Status;\r
   )\r
 {\r
   EFI_STATUS                            Status;\r

+  UINTN                                 SystemMemoryBase;\r

   UINTN                                 SystemMemoryTop;\r
   UINTN                                 SystemMemoryTop;\r

+  UINTN                                 FdBase;\r
+  UINTN                                 FdTop;\r

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


@@ -103,27 +106,44 @@ InitializeMemory (
   // Ensure PcdSystemMemorySize has been set\r
   ASSERT (FixedPcdGet32 (PcdSystemMemorySize) != 0);\r
 \r
   // Ensure PcdSystemMemorySize has been set\r
   ASSERT (FixedPcdGet32 (PcdSystemMemorySize) != 0);\r
 \r

-  SystemMemoryTop = (UINTN)FixedPcdGet32 (PcdSystemMemoryBase) + (UINTN)FixedPcdGet32 (PcdSystemMemorySize);\r
+  SystemMemoryBase = (UINTN)FixedPcdGet32 (PcdSystemMemoryBase);\r
+  SystemMemoryTop = SystemMemoryBase + (UINTN)FixedPcdGet32 (PcdSystemMemorySize);\r
+  FdBase = (UINTN)PcdGet32 (PcdNormalFdBaseAddress);\r
+  FdTop = FdBase + (UINTN)PcdGet32 (PcdNormalFdSize);\r

 \r
   //\r
   // Initialize the System Memory (DRAM)\r
   //\r
 \r
   //\r
   // Initialize the System Memory (DRAM)\r
   //\r

-  if (PcdGet32 (PcdStandalone)) {\r
-    // In case of a standalone version, the DRAM is already initialized\r
-    ArmPlatformInitializeSystemMemory();\r
+  if (!FeaturePcdGet (PcdSystemMemoryInitializeInSec)) {\r
+    // In case the DRAM has not been initialized by the secure firmware\r
+    ArmPlatformInitializeSystemMemory ();\r

   }\r
 \r
   //\r
   // Declare the UEFI memory to PEI\r
   //\r
   }\r
 \r
   //\r
   // Declare the UEFI memory to PEI\r
   //\r

-  if (PcdGet32 (PcdStandalone)) {\r
-    // In case of standalone UEFI, we set the UEFI memory region at the top of the DRAM\r
-    UefiMemoryBase = SystemMemoryTop - FixedPcdGet32 (PcdSystemMemoryUefiRegionSize);\r
+\r
+  // In case the firmware has been shadowed in the System Memory\r
+  if ((FdBase >= SystemMemoryBase) && (FdTop <= SystemMemoryTop)) {\r
+    // Check if there is enough space between the top of the system memory and the top of the\r
+    // firmware to place the UEFI memory (for PEI & DXE phases)\r
+    if (SystemMemoryTop - FdTop >= FixedPcdGet32 (PcdSystemMemoryUefiRegionSize)) {\r
+      UefiMemoryBase = SystemMemoryTop - FixedPcdGet32 (PcdSystemMemoryUefiRegionSize);\r
+    } else {\r
+      // Check there is enough space for the UEFI memory\r
+      ASSERT (SystemMemoryBase + FixedPcdGet32 (PcdSystemMemoryUefiRegionSize) <= FdBase);\r
+\r
+      UefiMemoryBase = FdBase - FixedPcdGet32 (PcdSystemMemoryUefiRegionSize);\r
+    }\r

   } else {\r
   } else {\r

-    // In case of a non standalone UEFI, we set the UEFI memory below the Firmware Volume\r
-    UefiMemoryBase = FixedPcdGet32 (PcdNormalFdBaseAddress) - FixedPcdGet32 (PcdSystemMemoryUefiRegionSize);\r
+    // Check the Firmware does not overlapped with the system memory\r
+    ASSERT ((FdBase < SystemMemoryBase) || (FdBase >= SystemMemoryTop));\r
+    ASSERT ((FdTop <= SystemMemoryBase) || (FdTop > SystemMemoryTop));\r
+\r
+    UefiMemoryBase = SystemMemoryTop - FixedPcdGet32 (PcdSystemMemoryUefiRegionSize);\r

   }\r
   }\r

-  Status = PeiServicesInstallPeiMemory (UefiMemoryBase,FixedPcdGet32 (PcdSystemMemoryUefiRegionSize));\r
+\r
+  Status = PeiServicesInstallPeiMemory (UefiMemoryBase, FixedPcdGet32 (PcdSystemMemoryUefiRegionSize));\r

   ASSERT_EFI_ERROR (Status);\r
 \r
   // Initialize MMU and Memory HOBs (Resource Descriptor HOBs)\r
   ASSERT_EFI_ERROR (Status);\r
 \r
   // Initialize MMU and Memory HOBs (Resource Descriptor HOBs)\r

diff --git a/ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.inf b/ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.inf
index 0d578648a7d4500b463a853cb6a72e3728fd9d53..e0174635546bb9dd2ba7e64d0f9097f234a0bede 100755 (executable)
--- a/ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.inf
+++ b/ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.inf
@@ -49,16 +49,14 @@
 \r
 [FeaturePcd]\r
   gEmbeddedTokenSpaceGuid.PcdPrePiProduceMemoryTypeInformationHob\r
 \r
 [FeaturePcd]\r
   gEmbeddedTokenSpaceGuid.PcdPrePiProduceMemoryTypeInformationHob\r

+  gArmPlatformTokenSpaceGuid.PcdSystemMemoryInitializeInSec\r

 \r
 [FixedPcd]\r
 \r
 [FixedPcd]\r

-  gArmPlatformTokenSpaceGuid.PcdStandalone\r
-\r

   gArmTokenSpaceGuid.PcdNormalFdBaseAddress\r
   gArmTokenSpaceGuid.PcdNormalFdSize\r
 \r
   gArmTokenSpaceGuid.PcdSystemMemoryBase\r
   gArmTokenSpaceGuid.PcdSystemMemorySize\r
   gArmTokenSpaceGuid.PcdNormalFdBaseAddress\r
   gArmTokenSpaceGuid.PcdNormalFdSize\r
 \r
   gArmTokenSpaceGuid.PcdSystemMemoryBase\r
   gArmTokenSpaceGuid.PcdSystemMemorySize\r

-  gArmPlatformTokenSpaceGuid.PcdSystemMemoryFixRegionSize\r

   gArmPlatformTokenSpaceGuid.PcdSystemMemoryUefiRegionSize\r
   \r
   gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiACPIReclaimMemory\r
   gArmPlatformTokenSpaceGuid.PcdSystemMemoryUefiRegionSize\r
   \r
   gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiACPIReclaimMemory\r

diff --git a/ArmPlatformPkg/PrePi/Exception.S b/ArmPlatformPkg/PrePi/Exception.S
index b07f0e8d0069ab64f0f45e3fdc1dd88b932b6970..bd59682237dbb594cb59adcc02a0f9449122e904 100755 (executable)
--- a/ArmPlatformPkg/PrePi/Exception.S
+++ b/ArmPlatformPkg/PrePi/Exception.S
@@ -1,101 +1,101 @@
-//
-//  Copyright (c) 2011, ARM Limited. All rights reserved.
-//  
-# 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        
-#  http://opensource.org/licenses/bsd-license.php
-#
-#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
-#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
-#
-#
-
-#include <AsmMacroIoLib.h>
-#include <Base.h>
-#include <AutoGen.h>
-
-#start of the code section
-.text
-.align 5
-
-# IMPORT
-GCC_ASM_IMPORT(PrePiCommonExceptionEntry)
-
-# EXPORT
-GCC_ASM_EXPORT(PrePiVectorTable)
-
-//============================================================
-//Default Exception Handlers
-//============================================================
-  
-ASM_PFX(PrePiVectorTable):
-  b _DefaultResetHandler
-  b _DefaultUndefined
-  b _DefaultSWI
-  b _DefaultPrefetchAbort
-  b _DefaultDataAbort
-  b _DefaultReserved
-  b _DefaultIrq
-  b _DefaultFiq
-
-//
-// Default Exception handlers: There is no plan to return from any of these exceptions.
-// No context saving at all.
-//
-_DefaultResetHandler:
-  mov  r1, lr
-  # Switch to SVC for common stack
-  cps  #0x13
-  mov  r0, #0
-   blx   ASM_PFX(PrePiCommonExceptionEntry)
-
-_DefaultUndefined:
-  sub  r1, LR, #4
-  # Switch to SVC for common stack
-  cps  #0x13
-  mov  r0, #1
-   blx   ASM_PFX(PrePiCommonExceptionEntry)
-
-_DefaultSWI:
-  sub  r1, LR, #4
-  # Switch to SVC for common stack
-  cps  #0x13
-  mov  r0, #2
-   blx   ASM_PFX(PrePiCommonExceptionEntry)
-
-_DefaultPrefetchAbort:
-  sub  r1, LR, #4
-  # Switch to SVC for common stack
-  cps  #0x13
-  mov  r0, #3
-   blx   ASM_PFX(PrePiCommonExceptionEntry)
-
-_DefaultDataAbort:
-  sub  r1, LR, #8
-  # Switch to SVC for common stack
-  cps  #0x13
-  mov  r0, #4
-   blx   ASM_PFX(PrePiCommonExceptionEntry)
-
-_DefaultReserved:
-  mov  r1, lr
-  # Switch to SVC for common stack
-  cps  #0x13
-  mov  r0, #5
-   blx   ASM_PFX(PrePiCommonExceptionEntry)
-
-_DefaultIrq:
-  sub  r1, LR, #4
-  # Switch to SVC for common stack
-  cps  #0x13
-  mov  r0, #6
-   blx   ASM_PFX(PrePiCommonExceptionEntry)
-
-_DefaultFiq:
-  sub  r1, LR, #4
-  # Switch to SVC for common stack
-  cps  #0x13
-  mov  r0, #7
-   blx   ASM_PFX(PrePiCommonExceptionEntry)
-
+//\r
+//  Copyright (c) 2011, ARM Limited. All rights reserved.\r
+//  \r
+# This program and the accompanying materials                          \r
+#  are licensed and made available under the terms and conditions of the BSD License         \r
+#  which accompanies this distribution.  The full text of the license may be found at        \r
+#  http://opensource.org/licenses/bsd-license.php\r
+#\r
+#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
+#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+#\r
+#\r
+\r
+#include <AsmMacroIoLib.h>\r
+#include <Base.h>\r
+#include <AutoGen.h>\r
+\r
+#start of the code section\r
+.text\r
+.align 5\r
+\r
+# IMPORT\r
+GCC_ASM_IMPORT(PrePiCommonExceptionEntry)\r
+\r
+# EXPORT\r
+GCC_ASM_EXPORT(PrePiVectorTable)\r
+\r
+//============================================================\r
+//Default Exception Handlers\r
+//============================================================\r
+  \r
+ASM_PFX(PrePiVectorTable):\r
+  b _DefaultResetHandler\r
+  b _DefaultUndefined\r
+  b _DefaultSWI\r
+  b _DefaultPrefetchAbort\r
+  b _DefaultDataAbort\r
+  b _DefaultReserved\r
+  b _DefaultIrq\r
+  b _DefaultFiq\r
+\r
+//\r
+// Default Exception handlers: There is no plan to return from any of these exceptions.\r
+// No context saving at all.\r
+//\r
+_DefaultResetHandler:\r
+  mov  r1, lr\r
+  # Switch to SVC for common stack\r
+  cps  #0x13\r
+  mov  r0, #0\r
+  blx   ASM_PFX(PrePiCommonExceptionEntry)\r
+\r
+_DefaultUndefined:\r
+  sub  r1, LR, #4\r
+  # Switch to SVC for common stack\r
+  cps  #0x13\r
+  mov  r0, #1\r
+  blx   ASM_PFX(PrePiCommonExceptionEntry)\r
+\r
+_DefaultSWI:\r
+  sub  r1, LR, #4\r
+  # Switch to SVC for common stack\r
+  cps  #0x13\r
+  mov  r0, #2\r
+  blx   ASM_PFX(PrePiCommonExceptionEntry)\r
+\r
+_DefaultPrefetchAbort:\r
+  sub  r1, LR, #4\r
+  # Switch to SVC for common stack\r
+  cps  #0x13\r
+  mov  r0, #3\r
+  blx   ASM_PFX(PrePiCommonExceptionEntry)\r
+\r
+_DefaultDataAbort:\r
+  sub  r1, LR, #8\r
+  # Switch to SVC for common stack\r
+  cps  #0x13\r
+  mov  r0, #4\r
+  blx   ASM_PFX(PrePiCommonExceptionEntry)\r
+\r
+_DefaultReserved:\r
+  mov  r1, lr\r
+  # Switch to SVC for common stack\r
+  cps  #0x13\r
+  mov  r0, #5\r
+  blx   ASM_PFX(PrePiCommonExceptionEntry)\r
+\r
+_DefaultIrq:\r
+  sub  r1, LR, #4\r
+  # Switch to SVC for common stack\r
+  cps  #0x13\r
+  mov  r0, #6\r
+  blx   ASM_PFX(PrePiCommonExceptionEntry)\r
+\r
+_DefaultFiq:\r
+  sub  r1, LR, #4\r
+  # Switch to SVC for common stack\r
+  cps  #0x13\r
+  mov  r0, #7\r
+  blx   ASM_PFX(PrePiCommonExceptionEntry)\r
+\r

diff --git a/ArmPlatformPkg/PrePi/MainMPCore.c b/ArmPlatformPkg/PrePi/MainMPCore.c
index 238b919e2973ff03d8d57fa573e7b3f72bc7bb72..165e7cfcb0b3eab02609f24c2ab5af856610079a 100644 (file)
--- a/ArmPlatformPkg/PrePi/MainMPCore.c
+++ b/ArmPlatformPkg/PrePi/MainMPCore.c
@@ -21,20 +21,19 @@
 VOID\r
 PrimaryMain (\r
   IN  UINTN                     UefiMemoryBase,\r
 VOID\r
 PrimaryMain (\r
   IN  UINTN                     UefiMemoryBase,\r

-  IN  UINTN                     StackBase,\r

   IN  UINT64                    StartTimeStamp\r
   )\r
 {\r
   //Enable the GIC Distributor\r
   PL390GicEnableDistributor(PcdGet32(PcdGicDistributorBase));\r
 \r
   IN  UINT64                    StartTimeStamp\r
   )\r
 {\r
   //Enable the GIC Distributor\r
   PL390GicEnableDistributor(PcdGet32(PcdGicDistributorBase));\r
 \r

-  // If ArmVe has not been built as Standalone then we need to wake up the secondary cores\r
-  if (!FixedPcdGet32(PcdStandalone)) {\r
+  // In some cases, the secondary cores are waiting for an SGI from the next stage boot loader toresume their initialization\r
+  if (!FixedPcdGet32(PcdSendSgiToBringUpSecondaryCores)) {\r

     // Sending SGI to all the Secondary CPU interfaces\r
     PL390GicSendSgiTo (PcdGet32(PcdGicDistributorBase), GIC_ICDSGIR_FILTER_EVERYONEELSE, 0x0E);\r
   }\r
 \r
     // Sending SGI to all the Secondary CPU interfaces\r
     PL390GicSendSgiTo (PcdGet32(PcdGicDistributorBase), GIC_ICDSGIR_FILTER_EVERYONEELSE, 0x0E);\r
   }\r
 \r

-  PrePiMain (UefiMemoryBase, StackBase, StartTimeStamp);\r
+  PrePiMain (UefiMemoryBase, StartTimeStamp);\r

 \r
   // We must never return\r
   ASSERT(FALSE);\r
 \r
   // We must never return\r
   ASSERT(FALSE);\r

diff --git a/ArmPlatformPkg/PrePi/MainUniCore.c b/ArmPlatformPkg/PrePi/MainUniCore.c
index f8ce408f6db8cbbb2882f7e3155596d954a60ca9..c92d9a55b309d0a506e02cbbeefc8af14e56ceeb 100644 (file)
--- a/ArmPlatformPkg/PrePi/MainUniCore.c
+++ b/ArmPlatformPkg/PrePi/MainUniCore.c
@@ -17,11 +17,10 @@
 VOID\r
 PrimaryMain (\r
   IN  UINTN                     UefiMemoryBase,\r
 VOID\r
 PrimaryMain (\r
   IN  UINTN                     UefiMemoryBase,\r

-  IN  UINTN                     StackBase,\r

   IN  UINT64                    StartTimeStamp\r
   )\r
 {\r
   IN  UINT64                    StartTimeStamp\r
   )\r
 {\r

-  PrePiMain (UefiMemoryBase, StackBase, StartTimeStamp);\r
+  PrePiMain (UefiMemoryBase, StartTimeStamp);\r

 \r
   // We must never return\r
   ASSERT(FALSE);\r
 \r
   // We must never return\r
   ASSERT(FALSE);\r

diff --git a/ArmPlatformPkg/PrePi/ModuleEntryPoint.S b/ArmPlatformPkg/PrePi/ModuleEntryPoint.S
index 0857024a2778d18310170be18ff3c89ab373bacd..a8c779fba914249191339e5748eec46acd86cb51 100755 (executable)
--- a/ArmPlatformPkg/PrePi/ModuleEntryPoint.S
+++ b/ArmPlatformPkg/PrePi/ModuleEntryPoint.S
@@ -16,50 +16,70 @@
 #include <Library/PcdLib.h>\r
 #include <AutoGen.h>\r
 \r
 #include <Library/PcdLib.h>\r
 #include <AutoGen.h>\r
 \r

-#start of the code section\r

 .text\r
 .align 3\r
 \r
 .text\r
 .align 3\r
 \r

-#global symbols referenced by this module\r
+# Global symbols referenced by this module\r

 GCC_ASM_IMPORT(CEntryPoint)\r
 GCC_ASM_IMPORT(CEntryPoint)\r

+GCC_ASM_EXPORT(_ModuleEntryPoint)\r

 \r
 StartupAddr: .word    CEntryPoint\r
 \r
 \r
 StartupAddr: .word    CEntryPoint\r
 \r

-#make _ModuleEntryPoint as global\r
-GCC_ASM_EXPORT(_ModuleEntryPoint)\r
-\r

 \r
 ASM_PFX(_ModuleEntryPoint):\r
   // Identify CPU ID\r
   mrc   p15, 0, r0, c0, c0, 5\r
   and   r0, #0xf\r
 \r
 \r
 ASM_PFX(_ModuleEntryPoint):\r
   // Identify CPU ID\r
   mrc   p15, 0, r0, c0, c0, 5\r
   and   r0, #0xf\r
 \r

-_UefiMemoryBase:\r
-#if FixedPcdGet32(PcdStandalone)\r
+_SetSVCMode:\r
+  // Enter SVC mode\r
+  mov     r1, #0x13|0x80|0x40\r
+  msr     CPSR_c, r1\r
+\r
+// Check if we can install the size at the top of the System Memory or if we need\r
+// to install the stacks at the bottom of the Firmware Device (case the FD is located\r
+// at the top of the DRAM)\r
+_SetupStackPosition:\r

   // Compute Top of System Memory\r
   LoadConstantToReg (FixedPcdGet32(PcdSystemMemoryBase), r1)\r
   LoadConstantToReg (FixedPcdGet32(PcdSystemMemorySize), r2)\r
   add   r1, r1, r2      // r1 = SystemMemoryTop = PcdSystemMemoryBase + PcdSystemMemorySize\r
   // Compute Top of System Memory\r
   LoadConstantToReg (FixedPcdGet32(PcdSystemMemoryBase), r1)\r
   LoadConstantToReg (FixedPcdGet32(PcdSystemMemorySize), r2)\r
   add   r1, r1, r2      // r1 = SystemMemoryTop = PcdSystemMemoryBase + PcdSystemMemorySize\r

-#else\r
-  // If it is not a Standalone, we must compute the top of the UEFI memory with the base of the FD\r
-  LoadConstantToReg (FixedPcdGet32(PcdNormalFdBaseAddress), r1)\r
-#endif\r

 \r
 \r

-  // Compute Base of UEFI Memory\r
-  LoadConstantToReg (FixedPcdGet32(PcdSystemMemoryUefiRegionSize), r2)\r
-  sub   r1, r1, r2      // r1 = SystemMemoryTop - PcdSystemMemoryUefiRegionSize = UefiMemoryBase\r
+  // Calculate Top of the Firmware Device\r
+  LoadConstantToReg (FixedPcdGet32(PcdNormalFdBaseAddress), r2)\r
+  LoadConstantToReg (FixedPcdGet32(PcdNormalFdSize), r3)\r
+  add   r3, r3, r2      // r4 = FdTop = PcdNormalFdBaseAddress + PcdNormalFdSize\r
+\r
+  // UEFI Memory Size (stacks are allocated in this region)\r
+  LoadConstantToReg (FixedPcdGet32(PcdSystemMemoryUefiRegionSize), r4)\r
+\r
+  //\r
+  // Reserve the memory for the UEFI region (contain stacks on its top)\r
+  //\r
+\r
+  // Calculate how much space there is between the top of the Firmware and the Top of the System Memory\r
+  subs r5, r1, r3              // r5 = SystemMemoryTop - FdTop\r
+  bmi  _SetupStack             // Jump if negative (FdTop > SystemMemoryTop)\r
+  cmp  r5, r4\r
+  bge  _SetupStack\r
+\r
+  // Case the top of stacks is the FdBaseAddress\r
+  mov  r1, r2\r

 \r
 _SetupStack:\r
   // Compute Base of Normal stacks for CPU Cores\r
 \r
 _SetupStack:\r
   // Compute Base of Normal stacks for CPU Cores\r

-  LoadConstantToReg (FixedPcdGet32(PcdCPUCoresNonSecStackSize), r2)\r
-  mul   r3, r0, r2      // r3 = core_id * stack_size = offset from the stack base\r
-  sub   sp, r1, r3      // r3 = UefiMemoryBase - StackOffset = TopOfStack\r
+  LoadConstantToReg (FixedPcdGet32(PcdCPUCoresNonSecStackSize), r5)\r
+  mul   r3, r0, r5      // r3 = core_id * stack_size = offset from the stack base\r
+  sub   sp, r1, r3      // r3 = (SystemMemoryTop|FdBaseAddress) - StackOffset = TopOfStack\r
+\r
+  // Calculate the Base of the UEFI Memory\r
+  sub  r1, r1, r4\r

 \r
 \r

-  // Only allocate memory in top of the primary core stack\r
+  // Only allocate memory for global variables at top of the primary core stack\r

   cmp   r0, #0\r
   bne   _PrepareArguments\r
 \r
   cmp   r0, #0\r
   bne   _PrepareArguments\r
 \r

-_AllocateGlobalPeiVariables:\r
+_AllocateGlobalPrePiVariables:\r

   // Reserve top of the stack for Global PEI Variables (eg: PeiServicesTablePointer)\r
   LoadConstantToReg (FixedPcdGet32(PcdPeiGlobalVariableSize), r4)\r
   // The reserved place must be 8-bytes aligned for pushing 64-bit variable on the stack\r
   // Reserve top of the stack for Global PEI Variables (eg: PeiServicesTablePointer)\r
   LoadConstantToReg (FixedPcdGet32(PcdPeiGlobalVariableSize), r4)\r
   // The reserved place must be 8-bytes aligned for pushing 64-bit variable on the stack\r


@@ -69,16 +89,12 @@ _AllocateGlobalPeiVariables:
   sub   sp, sp, r4\r
 \r
 _PrepareArguments:\r
   sub   sp, sp, r4\r
 \r
 _PrepareArguments:\r

-  // Pass the StackBase to the C Entrypoint (UefiMemoryBase - StackSize - StackOffset)\r
-  sub   r2, r1, r2\r
-  sub   r2, r3\r

   // Move sec startup address into a data register\r
   // Ensure we're jumping to FV version of the code (not boot remapped alias)\r
   // Move sec startup address into a data register\r
   // Ensure we're jumping to FV version of the code (not boot remapped alias)\r

-  ldr   r3, StartupAddr\r
+  ldr   r2, StartupAddr\r

 \r
 \r

-  // jump to PrePiCore C code\r
+  // Jump to PrePiCore C code\r

   //    r0 = core_id\r
   //    r1 = UefiMemoryBase\r
   //    r0 = core_id\r
   //    r1 = UefiMemoryBase\r

-  //    r2 = StackBase\r
-  blx   r3\r
+  blx   r2\r

 \r
 \r

diff --git a/ArmPlatformPkg/PrePi/ModuleEntryPoint.asm b/ArmPlatformPkg/PrePi/ModuleEntryPoint.asm
index 52690f8ecd9ceb7b352b68ae23e1972cc562db41..00abcb304af1861ffa67fa3afe977dc536dc46b3 100644 (file)
--- a/ArmPlatformPkg/PrePi/ModuleEntryPoint.asm
+++ b/ArmPlatformPkg/PrePi/ModuleEntryPoint.asm
@@ -31,28 +31,51 @@ _ModuleEntryPoint
   mrc   p15, 0, r0, c0, c0, 5\r
   and   r0, #0xf\r
 \r
   mrc   p15, 0, r0, c0, c0, 5\r
   and   r0, #0xf\r
 \r

-_UefiMemoryBase\r
-#if FixedPcdGet32(PcdStandalone)\r
+_SetSVCMode\r
+  // Enter SVC mode\r
+  mov     r1, #0x13|0x80|0x40\r
+  msr     CPSR_c, r1\r
+\r
+// Check if we can install the size at the top of the System Memory or if we need\r
+// to install the stacks at the bottom of the Firmware Device (case the FD is located\r
+// at the top of the DRAM)\r
+_SetupStackPosition\r

   // Compute Top of System Memory\r
   LoadConstantToReg (FixedPcdGet32(PcdSystemMemoryBase), r1)\r
   LoadConstantToReg (FixedPcdGet32(PcdSystemMemorySize), r2)\r
   add   r1, r1, r2      // r1 = SystemMemoryTop = PcdSystemMemoryBase + PcdSystemMemorySize\r
   // Compute Top of System Memory\r
   LoadConstantToReg (FixedPcdGet32(PcdSystemMemoryBase), r1)\r
   LoadConstantToReg (FixedPcdGet32(PcdSystemMemorySize), r2)\r
   add   r1, r1, r2      // r1 = SystemMemoryTop = PcdSystemMemoryBase + PcdSystemMemorySize\r

-#else\r
-  // If it is not a Standalone, we must compute the top of the UEFI memory with the base of the FD\r
-  LoadConstantToReg (FixedPcdGet32(PcdNormalFdBaseAddress), r1)\r
-#endif\r

 \r
 \r

-  // Compute Base of UEFI Memory\r
-  LoadConstantToReg (FixedPcdGet32(PcdSystemMemoryUefiRegionSize), r2)\r
-  sub   r1, r1, r2      // r1 = SystemMemoryTop - PcdSystemMemoryUefiRegionSize = UefiMemoryBase\r
+  // Calculate Top of the Firmware Device\r
+  LoadConstantToReg (FixedPcdGet32(PcdNormalFdBaseAddress), r2)\r
+  LoadConstantToReg (FixedPcdGet32(PcdNormalFdSize), r3)\r
+  add   r3, r3, r2      // r4 = FdTop = PcdNormalFdBaseAddress + PcdNormalFdSize\r
+\r
+  // UEFI Memory Size (stacks are allocated in this region)\r
+  LoadConstantToReg (FixedPcdGet32(PcdSystemMemoryUefiRegionSize), r4)\r
+\r
+  //\r
+  // Reserve the memory for the UEFI region (contain stacks on its top)\r
+  //\r
+\r
+  // Calculate how much space there is between the top of the Firmware and the Top of the System Memory\r
+  subs r5, r1, r3              // r5 = SystemMemoryTop - FdTop\r
+  bmi  _SetupStack             // Jump if negative (FdTop > SystemMemoryTop)\r
+  cmp  r5, r4\r
+  bge  _SetupStack\r
+\r
+  // Case the top of stacks is the FdBaseAddress\r
+  mov  r1, r2\r

 \r
 _SetupStack\r
   // Compute Base of Normal stacks for CPU Cores\r
 \r
 _SetupStack\r
   // Compute Base of Normal stacks for CPU Cores\r

-  LoadConstantToReg (FixedPcdGet32(PcdCPUCoresNonSecStackSize), r2)\r
-  mul   r3, r0, r2      // r3 = core_id * stack_size = offset from the stack base\r
-  sub   sp, r1, r3      // r3 = UefiMemoryBase - StackOffset = TopOfStack\r
+  LoadConstantToReg (FixedPcdGet32(PcdCPUCoresNonSecStackSize), r5)\r
+  mul   r3, r0, r5      // r3 = core_id * stack_size = offset from the stack base\r
+  sub   sp, r1, r3      // r3 = (SystemMemoryTop|FdBaseAddress) - StackOffset = TopOfStack\r
+\r
+  // Calculate the Base of the UEFI Memory\r
+  sub  r1, r1, r4\r

 \r
 \r

-  // Only allocate memory in top of the primary core stack\r
+  // Only allocate memory for global variables at top of the primary core stack\r

   cmp   r0, #0\r
   bne   _PrepareArguments\r
 \r
   cmp   r0, #0\r
   bne   _PrepareArguments\r
 \r


@@ -66,17 +89,13 @@ _AllocateGlobalPrePiVariables
   sub   sp, sp, r4\r
 \r
 _PrepareArguments\r
   sub   sp, sp, r4\r
 \r
 _PrepareArguments\r

-  // Pass the StackBase to the C Entrypoint (UefiMemoryBase - StackSize - StackOffset)\r
-  sub   r2, r1, r2\r
-  sub   r2, r3\r

   // Move sec startup address into a data register\r
   // Ensure we're jumping to FV version of the code (not boot remapped alias)\r
   // Move sec startup address into a data register\r
   // Ensure we're jumping to FV version of the code (not boot remapped alias)\r

-  ldr   r3, StartupAddr\r
+  ldr   r2, StartupAddr\r

 \r
 \r

-  // jump to PrePiCore C code\r
+  // Jump to PrePiCore C code\r

   //    r0 = core_id\r
   //    r1 = UefiMemoryBase\r
   //    r0 = core_id\r
   //    r1 = UefiMemoryBase\r

-  //    r2 = StackBase\r
-  blx   r3\r
+  blx   r2\r

 \r
   END\r
 \r
   END\r

diff --git a/ArmPlatformPkg/PrePi/PeiMPCore.inf b/ArmPlatformPkg/PrePi/PeiMPCore.inf
index c7d18d439489a7a5e3864037bd4ca4a24c6063f4..d441407ad3b5b7ef72b870d7032102c76822e609 100755 (executable)
--- a/ArmPlatformPkg/PrePi/PeiMPCore.inf
+++ b/ArmPlatformPkg/PrePi/PeiMPCore.inf
@@ -81,9 +81,9 @@
 
   gArmTokenSpaceGuid.PcdSystemMemoryBase
   gArmTokenSpaceGuid.PcdSystemMemorySize
 
   gArmTokenSpaceGuid.PcdSystemMemoryBase
   gArmTokenSpaceGuid.PcdSystemMemorySize

-  gArmPlatformTokenSpaceGuid.PcdSystemMemoryFixRegionSize

   gArmPlatformTokenSpaceGuid.PcdSystemMemoryUefiRegionSize
   
   gArmPlatformTokenSpaceGuid.PcdSystemMemoryUefiRegionSize
   

+  gArmPlatformTokenSpaceGuid.PcdMPCoreMaxCores

   gEmbeddedTokenSpaceGuid.PcdPrePiCpuMemorySize
   gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize
 
   gEmbeddedTokenSpaceGuid.PcdPrePiCpuMemorySize
   gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize
 

diff --git a/ArmPlatformPkg/PrePi/PeiUniCore.inf b/ArmPlatformPkg/PrePi/PeiUniCore.inf
index 3af265576e6ab7a08777582dfe97dd82c1c05e95..2439452d614520978195add6d3551cfcc28a75c3 100755 (executable)
--- a/ArmPlatformPkg/PrePi/PeiUniCore.inf
+++ b/ArmPlatformPkg/PrePi/PeiUniCore.inf
@@ -1,93 +1,93 @@
-#/** @file
-#  
-#  Copyright (c) 2011, 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
-#  http://opensource.org/licenses/bsd-license.php
-#  
-#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-#  
-#**/
-
-[Defines]
-  INF_VERSION                    = 0x00010005
-  BASE_NAME                      = ArmPlatformPrePiUniCore
-  FILE_GUID                      = d959e387-7b91-452c-90e0-a1dbac90ddb8
-  MODULE_TYPE                    = SEC
-  VERSION_STRING                 = 1.0
-
-[Sources.ARM]
-  PrePi.c
-  ModuleEntryPoint.S   | GCC
-  ModuleEntryPoint.asm | RVCT
-  Exception.asm | RVCT
-  Exception.S | GCC
-  MainUniCore.c
-  
-[Packages]
-  MdePkg/MdePkg.dec
-  MdeModulePkg/MdeModulePkg.dec
-  EmbeddedPkg/EmbeddedPkg.dec
-  ArmPkg/ArmPkg.dec
-  ArmPlatformPkg/ArmPlatformPkg.dec
-  IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
-
-[LibraryClasses]
-  BaseLib
-  DebugLib
-  DebugAgentLib
-  ArmLib
-  IoLib
-  TimerLib
-  SerialPortLib
-  ExtractGuidedSectionLib
-  LzmaDecompressLib
-  PeCoffGetEntryPointLib
-  DebugAgentLib
-  PrePiLib
-  ArmPlatformLib
-  MemoryAllocationLib
-  HobLib
-  PrePiHobListPointerLib
-  PlatformPeiLib
-  MemoryInitPeiLib
-
-[FeaturePcd]  
-  gEmbeddedTokenSpaceGuid.PcdCacheEnable
-  gEmbeddedTokenSpaceGuid.PcdPrePiProduceMemoryTypeInformationHob
-  gArmPlatformTokenSpaceGuid.PcdSendSgiToBringUpSecondaryCores
-
-[FixedPcd]
-  gArmTokenSpaceGuid.PcdVFPEnabled
-
-  gArmTokenSpaceGuid.PcdNormalFdBaseAddress
-  gArmTokenSpaceGuid.PcdNormalFdSize
-
-  gArmTokenSpaceGuid.PcdNormalFvBaseAddress
-  gArmTokenSpaceGuid.PcdNormalFvSize
-
-  gArmPlatformTokenSpaceGuid.PcdCPUCoresNonSecStackBase
-  gArmPlatformTokenSpaceGuid.PcdCPUCoresNonSecStackSize
-
-  gArmPlatformTokenSpaceGuid.PcdPeiGlobalVariableSize
-  gArmPlatformTokenSpaceGuid.PcdHobListPtrGlobalOffset
-
-  gArmTokenSpaceGuid.PcdSystemMemoryBase
-  gArmTokenSpaceGuid.PcdSystemMemorySize
-  gArmPlatformTokenSpaceGuid.PcdSystemMemoryFixRegionSize
-  gArmPlatformTokenSpaceGuid.PcdSystemMemoryUefiRegionSize
-  
-  gEmbeddedTokenSpaceGuid.PcdPrePiCpuMemorySize
-  gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize
-
-  gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiACPIReclaimMemory
-  gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiACPIMemoryNVS
-  gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiReservedMemoryType
-  gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiRuntimeServicesData
-  gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiRuntimeServicesCode
-  gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiBootServicesCode
-  gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiBootServicesData
-  gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiLoaderCode
-  gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiLoaderData
+#/** @file\r
+#  \r
+#  Copyright (c) 2011, ARM Ltd. All rights reserved.<BR>\r
+#  This program and the accompanying materials\r
+#  are licensed and made available under the terms and conditions of the BSD License\r
+#  which accompanies this distribution.  The full text of the license may be found at\r
+#  http://opensource.org/licenses/bsd-license.php\r
+#  \r
+#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+#  \r
+#**/\r
+\r
+[Defines]\r
+  INF_VERSION                    = 0x00010005\r
+  BASE_NAME                      = ArmPlatformPrePiUniCore\r
+  FILE_GUID                      = d959e387-7b91-452c-90e0-a1dbac90ddb8\r
+  MODULE_TYPE                    = SEC\r
+  VERSION_STRING                 = 1.0\r
+\r
+[Sources.ARM]\r
+  PrePi.c\r
+  ModuleEntryPoint.S   | GCC\r
+  ModuleEntryPoint.asm | RVCT\r
+  Exception.asm | RVCT\r
+  Exception.S | GCC\r
+  MainUniCore.c\r
+  \r
+[Packages]\r
+  MdePkg/MdePkg.dec\r
+  MdeModulePkg/MdeModulePkg.dec\r
+  EmbeddedPkg/EmbeddedPkg.dec\r
+  ArmPkg/ArmPkg.dec\r
+  ArmPlatformPkg/ArmPlatformPkg.dec\r
+  IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec\r
+\r
+[LibraryClasses]\r
+  BaseLib\r
+  DebugLib\r
+  DebugAgentLib\r
+  ArmLib\r
+  IoLib\r
+  TimerLib\r
+  SerialPortLib\r
+  ExtractGuidedSectionLib\r
+  LzmaDecompressLib\r
+  PeCoffGetEntryPointLib\r
+  DebugAgentLib\r
+  PrePiLib\r
+  ArmPlatformLib\r
+  MemoryAllocationLib\r
+  HobLib\r
+  PrePiHobListPointerLib\r
+  PlatformPeiLib\r
+  MemoryInitPeiLib\r
+\r
+[FeaturePcd]  \r
+  gEmbeddedTokenSpaceGuid.PcdCacheEnable\r
+  gEmbeddedTokenSpaceGuid.PcdPrePiProduceMemoryTypeInformationHob\r
+  gArmPlatformTokenSpaceGuid.PcdSendSgiToBringUpSecondaryCores\r
+\r
+[FixedPcd]\r
+  gArmTokenSpaceGuid.PcdVFPEnabled\r
+\r
+  gArmTokenSpaceGuid.PcdNormalFdBaseAddress\r
+  gArmTokenSpaceGuid.PcdNormalFdSize\r
+\r
+  gArmTokenSpaceGuid.PcdNormalFvBaseAddress\r
+  gArmTokenSpaceGuid.PcdNormalFvSize\r
+\r
+  gArmPlatformTokenSpaceGuid.PcdCPUCoresNonSecStackBase\r
+  gArmPlatformTokenSpaceGuid.PcdCPUCoresNonSecStackSize\r
+\r
+  gArmPlatformTokenSpaceGuid.PcdPeiGlobalVariableSize\r
+  gArmPlatformTokenSpaceGuid.PcdHobListPtrGlobalOffset\r
+\r
+  gArmTokenSpaceGuid.PcdSystemMemoryBase\r
+  gArmTokenSpaceGuid.PcdSystemMemorySize\r
+  gArmPlatformTokenSpaceGuid.PcdSystemMemoryUefiRegionSize\r
+  \r
+  gArmPlatformTokenSpaceGuid.PcdMPCoreMaxCores\r
+  gEmbeddedTokenSpaceGuid.PcdPrePiCpuMemorySize\r
+  gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize\r
+\r
+  gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiACPIReclaimMemory\r
+  gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiACPIMemoryNVS\r
+  gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiReservedMemoryType\r
+  gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiRuntimeServicesData\r
+  gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiRuntimeServicesCode\r
+  gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiBootServicesCode\r
+  gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiBootServicesData\r
+  gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiLoaderCode\r
+  gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiLoaderData\r

diff --git a/ArmPlatformPkg/PrePi/PrePi.c b/ArmPlatformPkg/PrePi/PrePi.c
index 98831ed1841b7a16d084720634a3708326e66559..5a88b47fe92d0d52c24a25a03a7e2f768a2ce20a 100755 (executable)
--- a/ArmPlatformPkg/PrePi/PrePi.c
+++ b/ArmPlatformPkg/PrePi/PrePi.c
@@ -49,14 +49,16 @@ LzmaDecompressLibConstructor (
 VOID\r
 PrePiMain (\r
   IN  UINTN                     UefiMemoryBase,\r
 VOID\r
 PrePiMain (\r
   IN  UINTN                     UefiMemoryBase,\r

-  IN  UINTN                     StackBase,\r

   IN  UINT64                    StartTimeStamp\r
   )\r
 {\r
   IN  UINT64                    StartTimeStamp\r
   )\r
 {\r

-  EFI_HOB_HANDOFF_INFO_TABLE**   PrePiHobBase;\r
+  EFI_HOB_HANDOFF_INFO_TABLE**  PrePiHobBase;\r

   EFI_STATUS                    Status;\r
   CHAR8                         Buffer[100];\r
   UINTN                         CharCount;\r
   EFI_STATUS                    Status;\r
   CHAR8                         Buffer[100];\r
   UINTN                         CharCount;\r

+  UINTN                         UefiMemoryTop;\r
+  UINTN                         StacksSize;\r
+  UINTN                         StacksBase;\r

 \r
   // Enable program flow prediction, if supported.\r
   ArmEnableBranchPrediction ();\r
 \r
   // Enable program flow prediction, if supported.\r
   ArmEnableBranchPrediction ();\r


@@ -76,19 +78,24 @@ PrePiMain (
 \r
   PrePiHobBase = (EFI_HOB_HANDOFF_INFO_TABLE**)(PcdGet32 (PcdCPUCoresNonSecStackBase) + (PcdGet32 (PcdCPUCoresNonSecStackSize) / 2) - PcdGet32 (PcdHobListPtrGlobalOffset));\r
 \r
 \r
   PrePiHobBase = (EFI_HOB_HANDOFF_INFO_TABLE**)(PcdGet32 (PcdCPUCoresNonSecStackBase) + (PcdGet32 (PcdCPUCoresNonSecStackSize) / 2) - PcdGet32 (PcdHobListPtrGlobalOffset));\r
 \r

-  // We leave UINT32 at the top of UEFI memory for PcdPrePiHobBase\r
+  UefiMemoryTop = UefiMemoryBase + FixedPcdGet32 (PcdSystemMemoryUefiRegionSize);\r
+  StacksSize = PcdGet32 (PcdCPUCoresNonSecStackSize) * PcdGet32 (PcdMPCoreMaxCores);\r
+  StacksBase = UefiMemoryTop - StacksSize;\r
+\r
+  // Declare the PI/UEFI memory region\r

   *PrePiHobBase = HobConstructor (\r
     (VOID*)UefiMemoryBase,\r
     FixedPcdGet32 (PcdSystemMemoryUefiRegionSize),\r
     (VOID*)UefiMemoryBase,\r
   *PrePiHobBase = HobConstructor (\r
     (VOID*)UefiMemoryBase,\r
     FixedPcdGet32 (PcdSystemMemoryUefiRegionSize),\r
     (VOID*)UefiMemoryBase,\r

-    (VOID*)(UefiMemoryBase + FixedPcdGet32 (PcdSystemMemoryUefiRegionSize) - sizeof(UINT32)));\r
+    (VOID*)StacksBase  // The top of the UEFI Memory is reserved for the stacks\r
+    );\r

 \r
   // Initialize MMU and Memory HOBs (Resource Descriptor HOBs)\r
   Status = MemoryPeim (UefiMemoryBase, FixedPcdGet32 (PcdSystemMemoryUefiRegionSize));\r
   ASSERT_EFI_ERROR (Status);\r
 \r
 \r
   // Initialize MMU and Memory HOBs (Resource Descriptor HOBs)\r
   Status = MemoryPeim (UefiMemoryBase, FixedPcdGet32 (PcdSystemMemoryUefiRegionSize));\r
   ASSERT_EFI_ERROR (Status);\r
 \r

-  // Create the Stack HOB\r
-  BuildStackHob (StackBase, FixedPcdGet32(PcdCPUCoresNonSecStackSize));\r
+  // Create the Stacks HOB (reserve the memory for all stacks)\r
+  BuildStackHob (StacksBase, StacksSize);\r

 \r
   // Set the Boot Mode\r
   SetBootMode (ArmPlatformGetBootMode ());\r
 \r
   // Set the Boot Mode\r
   SetBootMode (ArmPlatformGetBootMode ());\r


@@ -99,8 +106,8 @@ PrePiMain (
 \r
   BuildMemoryTypeInformationHob ();\r
 \r
 \r
   BuildMemoryTypeInformationHob ();\r
 \r

-  //InitializeDebugAgent (DEBUG_AGENT_INIT_PREMEM_SEC, NULL, NULL);\r
-  //SaveAndSetDebugTimerInterrupt (TRUE);\r
+  InitializeDebugAgent (DEBUG_AGENT_INIT_PREMEM_SEC, NULL, NULL);\r
+  SaveAndSetDebugTimerInterrupt (TRUE);\r

 \r
   // Now, the HOB List has been initialized, we can register performance information\r
   PERF_START (NULL, "PEI", NULL, StartTimeStamp);\r
 \r
   // Now, the HOB List has been initialized, we can register performance information\r
   PERF_START (NULL, "PEI", NULL, StartTimeStamp);\r


@@ -129,41 +136,38 @@ PrePiMain (
 VOID\r
 CEntryPoint (\r
   IN  UINTN                     CoreId,\r
 VOID\r
 CEntryPoint (\r
   IN  UINTN                     CoreId,\r

-  IN  UINTN                     UefiMemoryBase,\r
-  IN  UINTN                     StackBase\r
+  IN  UINTN                     UefiMemoryBase\r

   )\r
 {\r
   UINT64   StartTimeStamp;\r
 \r
   )\r
 {\r
   UINT64   StartTimeStamp;\r
 \r

-  StartTimeStamp = 0;\r
-\r
-  if ((CoreId == 0) && PerformanceMeasurementEnabled ()) {\r
+  if ((CoreId == ARM_PRIMARY_CORE) && PerformanceMeasurementEnabled ()) {\r

     // Initialize the Timer Library to setup the Timer HW controller\r
     TimerConstructor ();\r
     // We cannot call yet the PerformanceLib because the HOB List has not been initialized\r
     StartTimeStamp = GetPerformanceCounter ();\r
   }\r
 \r
     // Initialize the Timer Library to setup the Timer HW controller\r
     TimerConstructor ();\r
     // We cannot call yet the PerformanceLib because the HOB List has not been initialized\r
     StartTimeStamp = GetPerformanceCounter ();\r
   }\r
 \r

-  //Clean Data cache\r
-  ArmCleanInvalidateDataCache();\r
+  // Clean Data cache\r
+  ArmCleanInvalidateDataCache ();\r

 \r
 \r

-  //Invalidate instruction cache\r
-  ArmInvalidateInstructionCache();\r
+  // Invalidate instruction cache\r
+  ArmInvalidateInstructionCache ();\r

 \r
   //TODO:Drain Write Buffer\r
 \r
   // Enable Instruction & Data caches\r
 \r
   //TODO:Drain Write Buffer\r
 \r
   // Enable Instruction & Data caches\r

-  ArmEnableDataCache();\r
-  ArmEnableInstructionCache();\r
+  ArmEnableDataCache ();\r
+  ArmEnableInstructionCache ();\r

 \r
   // Write VBAR - The Vector table must be 32-byte aligned\r
 \r
   // Write VBAR - The Vector table must be 32-byte aligned\r

-  ASSERT(((UINT32)PrePiVectorTable & ((1 << 5)-1)) == 0);\r
-  ArmWriteVBar((UINT32)PrePiVectorTable);\r
+  ASSERT (((UINT32)PrePiVectorTable & ((1 << 5)-1)) == 0);\r
+  ArmWriteVBar ((UINT32)PrePiVectorTable);\r

 \r
 \r

-  //If not primary Jump to Secondary Main\r
-  if(0 == CoreId) {\r
+  // If not primary Jump to Secondary Main\r
+  if (CoreId == ARM_PRIMARY_CORE) {\r

     // Goto primary Main.\r
     // Goto primary Main.\r

-    PrimaryMain (UefiMemoryBase, StackBase, StartTimeStamp);\r
+    PrimaryMain (UefiMemoryBase, StartTimeStamp);\r

   } else {\r
     SecondaryMain (CoreId);\r
   }\r
   } else {\r
     SecondaryMain (CoreId);\r
   }\r

diff --git a/ArmPlatformPkg/PrePi/PrePi.h b/ArmPlatformPkg/PrePi/PrePi.h
index b1d39c669ae05ef8b7640b789427c9761fadc3ed..f62e263571cb2fe179e1292272737568f5ff4495 100644 (file)
--- a/ArmPlatformPkg/PrePi/PrePi.h
+++ b/ArmPlatformPkg/PrePi/PrePi.h
@@ -27,6 +27,7 @@
 \r
 #include <Chipset/ArmV7.h>\r
 \r
 \r
 #include <Chipset/ArmV7.h>\r
 \r

+#define ARM_PRIMARY_CORE  0\r

 #define SerialPrint(txt)  SerialPortWrite (txt, AsciiStrLen(txt)+1);\r
 \r
 // Vector Table for PrePi Phase\r
 #define SerialPrint(txt)  SerialPortWrite (txt, AsciiStrLen(txt)+1);\r
 \r
 // Vector Table for PrePi Phase\r


@@ -44,15 +45,14 @@ TimerConstructor (
 VOID\r
 PrePiMain (\r
   IN  UINTN                     UefiMemoryBase,\r
 VOID\r
 PrePiMain (\r
   IN  UINTN                     UefiMemoryBase,\r

-  IN  UINTN                     StackBase,\r

   IN  UINT64                    StartTimeStamp\r
   );\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 MemoryPeim (\r
   IN  UINT64                    StartTimeStamp\r
   );\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 MemoryPeim (\r

-  IN EFI_PHYSICAL_ADDRESS               UefiMemoryBase,\r
-  IN UINT64                             UefiMemorySize\r
+  IN EFI_PHYSICAL_ADDRESS       UefiMemoryBase,\r
+  IN UINT64                     UefiMemorySize\r

   );\r
 \r
 EFI_STATUS\r
   );\r
 \r
 EFI_STATUS\r


@@ -64,7 +64,6 @@ PlatformPeim (
 VOID\r
 PrimaryMain (\r
   IN  UINTN                     UefiMemoryBase,\r
 VOID\r
 PrimaryMain (\r
   IN  UINTN                     UefiMemoryBase,\r

-  IN  UINTN                     StackBase,\r

   IN  UINT64                    StartTimeStamp\r
   );\r
 \r
   IN  UINT64                    StartTimeStamp\r
   );\r
 \r