\r
IMPORT CEntryPoint\r
IMPORT ArmPlatformSecBootAction\r
- IMPORT ArmPlatformInitializeBootMemory\r
+ IMPORT ArmPlatformSecBootMemoryInit\r
IMPORT ArmDisableInterrupts\r
IMPORT ArmDisableCachesAndMmu\r
- IMPORT ArmWriteVBar\r
IMPORT ArmReadMpidr\r
- IMPORT SecVectorTable\r
- IMPORT ArmCpuSynchronizeWait\r
+ IMPORT ArmCallWFE\r
EXPORT _ModuleEntryPoint\r
\r
PRESERVE8\r
\r
StartupAddr DCD CEntryPoint\r
\r
-_ModuleEntryPoint\r
+_ModuleEntryPoint FUNCTION\r
// First ensure all interrupts are disabled\r
blx ArmDisableInterrupts\r
\r
// Ensure that the MMU and caches are off\r
blx ArmDisableCachesAndMmu\r
\r
+ // By default, we are doing a cold boot\r
+ mov r10, #ARM_SEC_COLD_BOOT\r
+\r
// Jump to Platform Specific Boot Action function\r
blx ArmPlatformSecBootAction\r
\r
- // Set VBAR to the start of the exception vectors in Secure Mode\r
- ldr r0, =SecVectorTable\r
- blx ArmWriteVBar\r
-\r
_IdentifyCpu \r
// Identify CPU ID\r
bl ArmReadMpidr\r
beq _InitMem\r
\r
_WaitInitMem\r
- mov r0, #ARM_CPU_EVENT_BOOT_MEM_INIT\r
- bl ArmCpuSynchronizeWait\r
+ // If we are not doing a cold boot in this case we should assume the Initial Memory to be already initialized\r
+ // Otherwise we have to wait the Primary Core to finish the initialization\r
+ cmp r10, #ARM_SEC_COLD_BOOT\r
+ bne _SetupSecondaryCoreStack\r
+\r
+ // Wait for the primary core to initialize the initial memory (event: BOOT_MEM_INIT)\r
+ bl ArmCallWFE\r
// Now the Init Mem is initialized, we setup the secondary core stacks\r
b _SetupSecondaryCoreStack\r
\r
_InitMem\r
+ // If we are not doing a cold boot in this case we should assume the Initial Memory to be already initialized\r
+ cmp r10, #ARM_SEC_COLD_BOOT\r
+ bne _SetupPrimaryCoreStack\r
+\r
// Initialize Init Boot Memory\r
- bl ArmPlatformInitializeBootMemory\r
+ bl ArmPlatformSecBootMemoryInit\r
\r
// Only Primary CPU could run this line (the secondary cores have jumped from _IdentifyCpu to _SetupStack)\r
LoadConstantToReg (FixedPcdGet32(PcdArmPrimaryCore), r5)\r
add r1, r1, r2\r
\r
// Get the Core Position (ClusterId * 4) + CoreId\r
- GetCorePositionInStack(r0, r5, r2)\r
+ GetCorePositionFromMpId(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 r0, r0, #1\r
\r
\r
// Jump to SEC C code\r
// r0 = mp_id\r
+ // r1 = Boot Mode\r
mov r0, r5\r
+ mov r1, r10\r
blx r3\r
+ ENDFUNC\r
\r
_NeverReturn\r
b _NeverReturn\r