ArmPlatformPkg/Sec: Moved Exception Vector Table to ArmPkg/DebugAgentBaseLib

[mirror_edk2.git] / ArmPlatformPkg / Sec / SecEntryPoint.asm

diff --git a/ArmPlatformPkg/Sec/SecEntryPoint.asm b/ArmPlatformPkg/Sec/SecEntryPoint.asm
index 3556ce471fa783afd86cc9187497da5978f30e99..42d2b0268fe1fe678760b2e7ba89542a9cce0b9d 100644 (file)
--- a/ArmPlatformPkg/Sec/SecEntryPoint.asm
+++ b/ArmPlatformPkg/Sec/SecEntryPoint.asm
@@ -19,13 +19,11 @@
   \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  ArmCallWFE\r
-  IMPORT  SecVectorTable\r
   EXPORT  _ModuleEntryPoint\r
 \r
   PRESERVE8\r
@@ -33,20 +31,19 @@
   \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
@@ -61,14 +58,23 @@ _IdentifyCpu
   beq   _InitMem\r
   \r
 _WaitInitMem\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
@@ -93,7 +99,7 @@ _SetupSecondaryCoreStack
   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
@@ -110,8 +116,11 @@ _PrepareArguments
   \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