ArmPkg/AsmMacroIoLib: Renamed 'GetCorePositionInStack' macro into 'GetCorePositionFro...

[mirror_edk2.git] / ArmPlatformPkg / PrePi / ModuleEntryPoint.S

diff --git a/ArmPlatformPkg/PrePi/ModuleEntryPoint.S b/ArmPlatformPkg/PrePi/ModuleEntryPoint.S
index 75728c983fef016ac03f33ad8cbcda7dc07d246b..845ae208b2cdeb7b0b749275954d7280ba857f7b 100755 (executable)
--- a/ArmPlatformPkg/PrePi/ModuleEntryPoint.S
+++ b/ArmPlatformPkg/PrePi/ModuleEntryPoint.S
@@ -1,5 +1,5 @@
 //\r
-//  Copyright (c) 2011, ARM Limited. All rights reserved.\r
+//  Copyright (c) 2011-2012, 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
@@ -45,12 +45,14 @@ _SetupStackPosition:
   // Compute Top of System Memory\r
   LoadConstantToReg (FixedPcdGet32(PcdSystemMemoryBase), r1)\r
   LoadConstantToReg (FixedPcdGet32(PcdSystemMemorySize), r2)\r
+  sub   r2, r2, #1\r
   add   r1, r1, r2      // r1 = SystemMemoryTop = PcdSystemMemoryBase + PcdSystemMemorySize\r
 \r
   // Calculate Top of the Firmware Device\r
   LoadConstantToReg (FixedPcdGet32(PcdFdBaseAddress), r2)\r
   LoadConstantToReg (FixedPcdGet32(PcdFdSize), r3)\r
-  add   r3, r3, r2      // r4 = FdTop = PcdFdBaseAddress + PcdFdSize\r
+  sub   r3, r3, #1\r
+  add   r3, r3, r2      // r3 = FdTop = PcdFdBaseAddress + PcdFdSize\r
 \r
   // UEFI Memory Size (stacks are allocated in this region)\r
   LoadConstantToReg (FixedPcdGet32(PcdSystemMemoryUefiRegionSize), r4)\r
@@ -71,6 +73,24 @@ _SetupStackPosition:
 _SetupStack:\r
   // r1 contains the top of the stack (and the UEFI Memory)\r
 \r
+  // Because the 'push' instruction is equivalent to 'stmdb' (decrement before), we need to increment\r
+  // one to the top of the stack. We check if incrementing one does not overflow (case of DRAM at the\r
+  // top of the memory space)\r
+  adds  r6, r1, #1\r
+  bcs   _SetupOverflowStack\r
+\r
+_SetupAlignedStack:\r
+  mov   r1, r6\r
+  b     _GetBaseUefiMemory\r
+\r
+_SetupOverflowStack:\r
+  // Case memory at the top of the address space. Ensure the top of the stack is EFI_PAGE_SIZE\r
+  // aligned (4KB)\r
+  LoadConstantToReg (EFI_PAGE_MASK, r6)\r
+  and   r6, r6, r1\r
+  sub   r1, r1, r6\r
+\r
+_GetBaseUefiMemory:\r
   // Calculate the Base of the UEFI Memory\r
   sub   r6, r1, r4\r
 \r
@@ -83,9 +103,11 @@ _GetStackBase:
   beq   _SetupUnicoreStack\r
 \r
 _GetStackBaseMpCore:\r
+  // r1 = The top of the Mpcore Stacks\r
   // Stack for the primary core = PrimaryCoreStack\r
   LoadConstantToReg (FixedPcdGet32(PcdCPUCorePrimaryStackSize), r2)\r
   sub   r7, r1, r2\r
+\r
   // Stack for the secondary core = Number of Cluster * (4 Core per cluster) * SecondaryStackSize\r
   LoadConstantToReg (FixedPcdGet32(PcdClusterCount), r2)\r
   lsl   r2, r2, #2\r
@@ -93,8 +115,12 @@ _GetStackBaseMpCore:
   mul   r2, r2, r3\r
   sub   r7, r7, r2\r
 \r
-  // The top of the Mpcore Stacks is in r1\r
-  // The base of the MpCore Stacks is in r7\r
+  // The base of the secondary Stacks = Top of Primary stack\r
+  LoadConstantToReg (FixedPcdGet32(PcdCPUCorePrimaryStackSize), r2)\r
+  add   r1, r7, r2\r
+\r
+  // r7 = The base of the MpCore Stacks (primary stack + cluster_count * 4 * secondary stacks)\r
+  // r1 = The base of the secondary Stacks = Top of the Primary stack\r
 \r
   // Is it the Primary Core ?\r
   LoadConstantToReg (FixedPcdGet32(PcdArmPrimaryCore), r4)\r
@@ -102,36 +128,36 @@ _GetStackBaseMpCore:
   beq   _SetupPrimaryCoreStack\r
 \r
 _SetupSecondaryCoreStack:\r
-  // Base of the stack for the secondary cores is in r7\r
+  // r1 = The base of the secondary Stacks\r
 \r
   // Get the position of the cores (ClusterId * 4) + CoreId\r
-  GetCorePositionInStack(r0, r5, r4)\r
+  GetCorePositionFromMpId(r0, r5, r4)\r
   // The stack starts at the top of the stack region. Add '1' to the Core Position to get the top of the stack\r
   add   r0, r0, #1\r
   // Get the offset for the Secondary Stack\r
   mul   r0, r0, r3\r
-  add   sp, r7, r0\r
+  add   sp, r1, r0\r
 \r
   bne   _PrepareArguments\r
 \r
 _SetupPrimaryCoreStack:\r
-  // The top of the Mpcore Stacks is in r1\r
+  // r1 = Top of the primary stack\r
   LoadConstantToReg (FixedPcdGet32(PcdPeiGlobalVariableSize), r2)\r
+  b     _PreparePrimaryStack\r
+\r
+_SetupUnicoreStack:\r
+  // The top of the Unicore Stack is in r1\r
+  LoadConstantToReg (FixedPcdGet32(PcdPeiGlobalVariableSize), r2)\r
+  LoadConstantToReg (FixedPcdGet32(PcdCPUCorePrimaryStackSize), r3)\r
+\r
+  // Calculate the bottom of the primary stack (StackBase)\r
+  sub   r7, r1, r3\r
 \r
+_PreparePrimaryStack:\r
   // The reserved space for global variable must be 8-bytes aligned for pushing\r
   // 64-bit variable on the stack\r
   SetPrimaryStack (r1, r2, r3)\r
 \r
-_SetGlobals:\r
-  // Set all the PrePi global variables to 0\r
-  mov   r3, sp\r
-  mov   r2, #0x0\r
-_InitGlobals:\r
-  cmp   r3, r1\r
-  beq   _PrepareArguments\r
-  str   r2, [r3], #4\r
-  b     _InitGlobals\r
-\r
 _PrepareArguments:\r
   mov   r0, r5\r
   mov   r1, r6\r
@@ -152,17 +178,3 @@ _PrepareArguments:
 _NeverReturn:\r
   b _NeverReturn\r
 \r
-_SetupUnicoreStack:\r
-  // The top of the Unicore Stack is in r1\r
-  LoadConstantToReg (FixedPcdGet32(PcdPeiGlobalVariableSize), r2)\r
-  LoadConstantToReg (FixedPcdGet32(PcdCPUCorePrimaryStackSize), r3)\r
-\r
-  // Calculate the bottom of the primary stack (StackBase)\r
-  sub   r7, r1, r3\r
-\r
-  // The reserved space for global variable must be 8-bytes aligned for pushing\r
-  // 64-bit variable on the stack\r
-  SetPrimaryStack (r1, r2, r3)\r
-\r
-  b _SetGlobals\r
-\r