ArmPlatformPkg/Sec: Added support for Non Cold Boot Paths

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

diff --git a/ArmPlatformPkg/Sec/Helper.asm b/ArmPlatformPkg/Sec/Helper.asm
index a03a90626ee14137d2a2d7e8e152d1b6878e0d25..b31cc31a97eeca196291f86bfbe6bf5a3ab73cae 100644 (file)
--- a/ArmPlatformPkg/Sec/Helper.asm
+++ b/ArmPlatformPkg/Sec/Helper.asm
@@ -20,17 +20,18 @@
 \r
 // r0: Monitor World EntryPoint\r
 // r1: MpId\r
-// r2: Secure Monitor mode stack\r
-enter_monitor_mode\r
-    cmp     r2, #0                      // If a Secure Monitor stack base has not been defined then use the Secure stack\r
-    moveq   r2, sp\r
+// r2: SecBootMode\r
+// r3: Secure Monitor mode stack\r
+enter_monitor_mode FUNCTION\r
+    cmp     r3, #0                      // If a Secure Monitor stack base has not been defined then use the Secure stack\r
+    moveq   r3, sp\r
 \r
     mrs     r4, cpsr                    // Save current mode (SVC) in r4\r
-    bic     r3, r4, #0x1f               // Clear all mode bits\r
-    orr     r3, r3, #0x16               // Set bits for Monitor mode\r
-    msr     cpsr_cxsf, r3               // We are now in Monitor Mode\r
+    bic     r5, r4, #0x1f               // Clear all mode bits\r
+    orr     r5, r5, #0x16               // Set bits for Monitor mode\r
+    msr     cpsr_cxsf, r5               // We are now in Monitor Mode\r
 \r
-    mov     sp, r2                      // Set the stack of the Monitor Mode\r
+    mov     sp, r3                      // Set the stack of the Monitor Mode\r
 \r
     mov     lr, r0                      // Use the pass entrypoint as lr\r
     \r
@@ -38,8 +39,11 @@ enter_monitor_mode
 \r
     mov     r4, r0                      // Swap EntryPoint and MpId registers\r
     mov     r0, r1\r
+    mov     r1, r2\r
+    mov     r2, r3\r
 \r
     bx      r4\r
+    ENDFUNC\r
 \r
 // We cannot use the instruction 'movs pc, lr' because the caller can be written either in ARM or Thumb2 assembler.\r
 // When we will jump into this function, we will set the CPSR flag to ARM assembler. By copying directly 'lr' into\r