bl ASM_PFX(ArmReadMpidr)\r
// Get ID of this CPU in Multicore system\r
LoadConstantToReg (FixedPcdGet32(PcdArmPrimaryCoreMask), r1)\r
- and r0, r0, r1\r
-\r
- // Calculate the top of the primary stack\r
+ and r5, r0, r1\r
+ \r
+ // Get the top of the primary stacks (and the base of the secondary stacks)\r
LoadConstantToReg (FixedPcdGet32(PcdCPUCoresStackBase), r1)\r
LoadConstantToReg (FixedPcdGet32(PcdCPUCorePrimaryStackSize), r2)\r
- add r2, r2, r1\r
+ add r1, r1, r2\r
\r
// Is it the Primary Core ?\r
- LoadConstantToReg (FixedPcdGet32(PcdArmPrimaryCore), r1)\r
- cmp r0, r1\r
+ LoadConstantToReg (FixedPcdGet32(PcdArmPrimaryCore), r3)\r
+ cmp r5, r3\r
beq _SetupPrimaryCoreStack\r
\r
_SetupSecondaryCoreStack:\r
- // r2 = Top of the primary stack = Base of the Secondary Stacks\r
+ // r1 contains the base of the secondary stacks\r
\r
- // Get the position of the cores (ClusterId * 4) + CoreId\r
- GetCorePositionInStack(r3, r0, r1)\r
+ // Get the Core Position (ClusterId * 4) + CoreId\r
+ GetCorePositionInStack(r0, r5, r2)\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 r3, r3, #1\r
+ add r0, r0, #1\r
\r
- LoadConstantToReg (FixedPcdGet32(PcdCPUCoreSecondaryStackSize), r1)\r
// StackOffset = CorePos * StackSize\r
- mul r3, r3, r1\r
+ LoadConstantToReg (FixedPcdGet32(PcdCPUCoreSecondaryStackSize), r2)\r
+ mul r0, r0, r2\r
// SP = StackBase + StackOffset\r
- add sp, r2, r3\r
-\r
- b _PrepareArguments\r
-\r
-_SetupPrimaryCoreStack:\r
- // r2 = Top of the primary stack\r
- LoadConstantToReg (FixedPcdGet32(PcdPeiGlobalVariableSize), 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 (r2, r3, r1)\r
-\r
- // Set all the PEI global variables to 0\r
- mov r3, sp\r
- mov r1, #0x0\r
-_InitGlobals:\r
- cmp r3, r2\r
- beq _PrepareArguments\r
- str r1, [r3], #4\r
- b _InitGlobals\r
+ add sp, r1, r0\r
\r
_PrepareArguments:\r
// The PEI Core Entry Point has been computed by GenFV and stored in the second entry of the Reset Vector\r
add r2, r2, #4\r
ldr r1, [r2]\r
\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 r2, StartupAddr\r
-\r
- // jump to PrePeiCore C code\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
+ \r
+ // Jump to PrePeiCore C code\r
// r0 = mp_id\r
// r1 = pei_core_address\r
- blx r2\r
+ mov r0, r5\r
+ blx r3\r
+\r
+_SetupPrimaryCoreStack:\r
+ // r1 contains the top of the primary stack\r
+ LoadConstantToReg (FixedPcdGet32(PcdPeiGlobalVariableSize), r2)\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
+ b _PrepareArguments\r
\r
_NeverReturn:\r
b _NeverReturn\r