ArmPlatformPkg: Remove PcdStandalone from Sec module and Introduce ArmPlatformSecExtraAction()

The PcdStandalone is a PCD ARM Ltd uses to make the difference between a standalone UEFI (boot
from cold boot to Boot Manager without user intervention) and a Debug UEFI firmware (the firmware
engineer has to copy the Normale World image into the DRAM to enable his/her firmware).

By coping the firmware into DRAM in the non standalone version it is much faster than reflashing
the NOR Flash after each build.

ArmPlatformSecExtraAction() function is called just before the Sec module jump to normal world.
The platform firmware can run extra actions at this stage.
The 'ARM Standalone' concept has moved to the implementation of ArmPlatformSecExtraAction() for
the ARM development boards (in ArmPlatformPkg/Library/DebugSecExtraActionLib).


ArmPlatformPkg: Enable DebugAgentLib in Sec and PrePeiCore


ArmPlatformPkg: Fix line endings in some source files

Use CR+LF line endings as defined by the EDK2 coding convention




git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11991 6f19259b-4bc3-4df7-8a09-765794883524

6 files changed, 168 insertions, 160 deletions

diff --git a/ArmPlatformPkg/PrePeiCore/Exception.S b/ArmPlatformPkg/PrePeiCore/Exception.S
index 159a4d0578..abce21d0a5 100644
--- a/ArmPlatformPkg/PrePeiCore/Exception.S
+++ b/ArmPlatformPkg/PrePeiCore/Exception.S
@@ -1,102 +1,102 @@
-//
-//  Copyright (c) 2011, ARM Limited. All rights reserved.
-//  
-# This program and the accompanying materials                          
-#  are licensed and made available under the terms and conditions of the BSD License         
-#  which accompanies this distribution.  The full text of the license may be found at        
-#  http://opensource.org/licenses/bsd-license.php
-#
-#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
-#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
-#
-#
-
-#include <AsmMacroIoLib.h>
-#include <Base.h>
-#include <AutoGen.h>
-
-#start of the code section
-.text
+//

+//  Copyright (c) 2011, ARM Limited. All rights reserved.

+//  

+# This program and the accompanying materials                          

+#  are licensed and made available under the terms and conditions of the BSD License         

+#  which accompanies this distribution.  The full text of the license may be found at        

+#  http://opensource.org/licenses/bsd-license.php

+#

+#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     

+#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             

+#

+#

+

+#include <AsmMacroIoLib.h>

+#include <Base.h>

+#include <AutoGen.h>

+

+#start of the code section

+.text

 .align 5

 

-# IMPORT
-GCC_ASM_IMPORT(PeiCommonExceptionEntry)
-
-# EXPORT
-GCC_ASM_EXPORT(PeiVectorTable)
+# IMPORT

+GCC_ASM_IMPORT(PeiCommonExceptionEntry)

+

+# EXPORT

+GCC_ASM_EXPORT(PeiVectorTable)

+

+//============================================================

+//Default Exception Handlers

+//============================================================

+  

+  

+ASM_PFX(PeiVectorTable):

+  b _DefaultResetHandler

+  b _DefaultUndefined

+  b _DefaultSWI

+  b _DefaultPrefetchAbort

+  b _DefaultDataAbort

+  b _DefaultReserved

+  b _DefaultIrq

+  b _DefaultFiq

+

+//

+// Default Exception handlers: There is no plan to return from any of these exceptions.

+// No context saving at all.

+//

+_DefaultResetHandler:

+  mov  r1, lr

+  # Switch to SVC for common stack

+  cps  #0x13

+  mov  r0, #0

+  blx  ASM_PFX(PeiCommonExceptionEntry)

+

+_DefaultUndefined:

+  sub  r1, LR, #4

+  # Switch to SVC for common stack

+  cps  #0x13

+  mov  r0, #1

+  blx  ASM_PFX(PeiCommonExceptionEntry)

+

+_DefaultSWI:

+  sub  r1, LR, #4

+  # Switch to SVC for common stack

+  cps  #0x13

+  mov  r0, #2

+  blx  ASM_PFX(PeiCommonExceptionEntry)

+

+_DefaultPrefetchAbort:

+  sub  r1, LR, #4

+  # Switch to SVC for common stack

+  cps  #0x13

+  mov  r0, #3

+  blx  ASM_PFX(PeiCommonExceptionEntry)

+

+_DefaultDataAbort:

+  sub  r1, LR, #8

+  # Switch to SVC for common stack

+  cps  #0x13

+  mov  r0, #4

+  blx  ASM_PFX(PeiCommonExceptionEntry)

+

+_DefaultReserved:

+  mov  r1, lr

+  # Switch to SVC for common stack

+  cps  #0x13

+  mov  r0, #5

+  blx  ASM_PFX(PeiCommonExceptionEntry)

+

+_DefaultIrq:

+  sub  r1, LR, #4

+  # Switch to SVC for common stack

+  cps  #0x13

+  mov  r0, #6

+  blx  ASM_PFX(PeiCommonExceptionEntry)

 

-//============================================================
-//Default Exception Handlers
-//============================================================
-  
-  
-ASM_PFX(PeiVectorTable):
-  b _DefaultResetHandler
-  b _DefaultUndefined
-  b _DefaultSWI
-  b _DefaultPrefetchAbort
-  b _DefaultDataAbort
-  b _DefaultReserved
-  b _DefaultIrq
-  b _DefaultFiq
-
-//
-// Default Exception handlers: There is no plan to return from any of these exceptions.
-// No context saving at all.
-//
-_DefaultResetHandler:
-  mov  r1, lr
-  # Switch to SVC for common stack
-  cps  #0x13
-  mov  r0, #0
-  blx  ASM_PFX(PeiCommonExceptionEntry)
-
-_DefaultUndefined:
-  sub  r1, LR, #4
-  # Switch to SVC for common stack
-  cps  #0x13
-  mov  r0, #1
-  blx  ASM_PFX(PeiCommonExceptionEntry)
-
-_DefaultSWI:
-  sub  r1, LR, #4
-  # Switch to SVC for common stack
-  cps  #0x13
-  mov  r0, #2
-  blx  ASM_PFX(PeiCommonExceptionEntry)
-
-_DefaultPrefetchAbort:
-  sub  r1, LR, #4
-  # Switch to SVC for common stack
-  cps  #0x13
-  mov  r0, #3
-  blx  ASM_PFX(PeiCommonExceptionEntry)
-
-_DefaultDataAbort:
-  sub  r1, LR, #8
-  # Switch to SVC for common stack
-  cps  #0x13
-  mov  r0, #4
-  blx  ASM_PFX(PeiCommonExceptionEntry)
-
-_DefaultReserved:
-  mov  r1, lr
-  # Switch to SVC for common stack
-  cps  #0x13
-  mov  r0, #5
-  blx  ASM_PFX(PeiCommonExceptionEntry)
-
-_DefaultIrq:
-  sub  r1, LR, #4
-  # Switch to SVC for common stack
-  cps  #0x13
-  mov  r0, #6
-  blx  ASM_PFX(PeiCommonExceptionEntry)
-
-_DefaultFiq:
-  sub  r1, LR, #4
-  # Switch to SVC for common stack
-  cps  #0x13
-  mov  r0, #7
-  blx  ASM_PFX(PeiCommonExceptionEntry)
+_DefaultFiq:

+  sub  r1, LR, #4

+  # Switch to SVC for common stack

+  cps  #0x13

+  mov  r0, #7

+  blx  ASM_PFX(PeiCommonExceptionEntry)

 

diff --git a/ArmPlatformPkg/PrePeiCore/Exception.asm b/ArmPlatformPkg/PrePeiCore/Exception.asm
index 16e0d9d14c..55bd4af1dd 100644
--- a/ArmPlatformPkg/PrePeiCore/Exception.asm
+++ b/ArmPlatformPkg/PrePeiCore/Exception.asm
@@ -21,71 +21,71 @@
   PRESERVE8

   AREA    PrePeiCoreException, CODE, READONLY, CODEALIGN, ALIGN=5

 

-//============================================================
-//Default Exception Handlers
-//============================================================
-  
-  
-PeiVectorTable
-  b _DefaultResetHandler
-  b _DefaultUndefined
-  b _DefaultSWI
-  b _DefaultPrefetchAbort
-  b _DefaultDataAbort
-  b _DefaultReserved
-  b _DefaultIrq
-  b _DefaultFiq
-
+//============================================================

+//Default Exception Handlers

+//============================================================

+  

+  

+PeiVectorTable

+  b _DefaultResetHandler

+  b _DefaultUndefined

+  b _DefaultSWI

+  b _DefaultPrefetchAbort

+  b _DefaultDataAbort

+  b _DefaultReserved

+  b _DefaultIrq

+  b _DefaultFiq

+

 //

 // Default Exception handlers: There is no plan to return from any of these exceptions.

-// No context saving at all.
+// No context saving at all.

 //

-_DefaultResetHandler
+_DefaultResetHandler

    mov  r1, lr

-   cps       #0x13                     ; Switch to SVC for common stack
-   mov  r0, #0
-   blx   PeiCommonExceptionEntry
-
-_DefaultUndefined
+   cps       #0x13                     ; Switch to SVC for common stack

+   mov  r0, #0

+   blx   PeiCommonExceptionEntry

+

+_DefaultUndefined

    sub  r1, LR, #4

-   cps       #0x13                     ; Switch to SVC for common stack
-   mov  r0, #1
-   blx   PeiCommonExceptionEntry
-
-_DefaultSWI
+   cps       #0x13                     ; Switch to SVC for common stack

+   mov  r0, #1

+   blx   PeiCommonExceptionEntry

+

+_DefaultSWI

    sub  r1, LR, #4

-   cps       #0x13                     ; Switch to SVC for common stack
-   mov  r0, #2
-   blx   PeiCommonExceptionEntry
-
-_DefaultPrefetchAbort
+   cps       #0x13                     ; Switch to SVC for common stack

+   mov  r0, #2

+   blx   PeiCommonExceptionEntry

+

+_DefaultPrefetchAbort

    sub  r1, LR, #4

-   cps       #0x13                     ; Switch to SVC for common stack
-   mov  r0, #3
-   blx   PeiCommonExceptionEntry
-
-_DefaultDataAbort
+   cps       #0x13                     ; Switch to SVC for common stack

+   mov  r0, #3

+   blx   PeiCommonExceptionEntry

+

+_DefaultDataAbort

    sub  r1, LR, #8

-   cps       #0x13                     ; Switch to SVC for common stack
-   mov  r0, #4
-   blx   PeiCommonExceptionEntry
-
-_DefaultReserved
+   cps       #0x13                     ; Switch to SVC for common stack

+   mov  r0, #4

+   blx   PeiCommonExceptionEntry

+

+_DefaultReserved

    mov  r1, lr

-   cps       #0x13                     ; Switch to SVC for common stack
-   mov  r0, #5
-   blx   PeiCommonExceptionEntry
-   
-_DefaultIrq
+   cps       #0x13                     ; Switch to SVC for common stack

+   mov  r0, #5

+   blx   PeiCommonExceptionEntry

+   

+_DefaultIrq

    sub  r1, LR, #4

-   cps       #0x13                     ; Switch to SVC for common stack
-   mov  r0, #6
-   blx   PeiCommonExceptionEntry
-
-_DefaultFiq
+   cps       #0x13                     ; Switch to SVC for common stack

+   mov  r0, #6

+   blx   PeiCommonExceptionEntry

+

+_DefaultFiq

    sub  r1, LR, #4

-   cps       #0x13                     ; Switch to SVC for common stack
-   mov  r0, #7
-   blx   PeiCommonExceptionEntry
+   cps       #0x13                     ; Switch to SVC for common stack

+   mov  r0, #7

+   blx   PeiCommonExceptionEntry

 

   END

diff --git a/ArmPlatformPkg/PrePeiCore/MainMPCore.c b/ArmPlatformPkg/PrePeiCore/MainMPCore.c
index 17a0002dee..35c41540f4 100644
--- a/ArmPlatformPkg/PrePeiCore/MainMPCore.c
+++ b/ArmPlatformPkg/PrePeiCore/MainMPCore.c
@@ -69,7 +69,7 @@ PrimaryMain (
   PL390GicEnableDistributor(PcdGet32(PcdGicDistributorBase));

 

   // If ArmVe has not been built as Standalone then we need to wake up the secondary cores

-  if (!PcdGet32(PcdStandalone)) {

+  if (FeaturePcdGet(PcdSendSgiToBringUpSecondaryCores)) {

     // Sending SGI to all the Secondary CPU interfaces

     PL390GicSendSgiTo (PcdGet32(PcdGicDistributorBase), GIC_ICDSGIR_FILTER_EVERYONEELSE, 0x0E);

   }

diff --git a/ArmPlatformPkg/PrePeiCore/PrePeiCore.c b/ArmPlatformPkg/PrePeiCore/PrePeiCore.c
index ccf0e7d3d4..0b7f973d53 100644
--- a/ArmPlatformPkg/PrePeiCore/PrePeiCore.c
+++ b/ArmPlatformPkg/PrePeiCore/PrePeiCore.c
@@ -16,6 +16,7 @@
 #include <Library/IoLib.h>

 #include <Library/BaseLib.h>

 #include <Library/BaseMemoryLib.h>

+#include <Library/DebugAgentLib.h>

 #include <Library/PrintLib.h>

 #include <Library/ArmLib.h>

 #include <Library/SerialPortLib.h>

@@ -62,7 +63,11 @@ CEntryPoint (
 

   //If not primary Jump to Secondary Main

   if(0 == CoreId) {

-    //Goto primary Main.

+    // Initialize the Debug Agent for Source Level Debugging

+    InitializeDebugAgent (DEBUG_AGENT_INIT_POSTMEM_SEC, NULL, NULL);

+    SaveAndSetDebugTimerInterrupt (TRUE);

+

+    // Goto primary Main.

     PrimaryMain (PeiCoreEntryPoint);

   } else {

     SecondaryMain (CoreId);

diff --git a/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf b/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf
index bcde6c4b10..8c255443af 100644
--- a/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf
+++ b/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf
@@ -42,6 +42,7 @@
   ArmMPCoreMailBoxLib

   BaseLib

   DebugLib

+  DebugAgentLib

   IoLib

   PL390GicNonSecLib

   PrintLib

@@ -50,9 +51,10 @@
 [Ppis]

   gEfiTemporaryRamSupportPpiGuid

 

-[FixedPcd]

-  gArmPlatformTokenSpaceGuid.PcdStandalone

+[FeaturePcd]

+  gArmPlatformTokenSpaceGuid.PcdSendSgiToBringUpSecondaryCores

 

+[FixedPcd]

   gArmTokenSpaceGuid.PcdNormalFvBaseAddress

   gArmTokenSpaceGuid.PcdNormalFvSize

 

diff --git a/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf b/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf
index 5b0886d0dd..f37bcb0751 100644
--- a/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf
+++ b/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf
@@ -41,16 +41,17 @@
   ArmPlatformLib

   BaseLib

   DebugLib

+  DebugAgentLib

   IoLib

   PrintLib

-  SerialPortLib

 

 [Ppis]

   gEfiTemporaryRamSupportPpiGuid

 

-[FixedPcd]

-  gArmPlatformTokenSpaceGuid.PcdStandalone

+[FeaturePcd]

+  gArmPlatformTokenSpaceGuid.PcdSendSgiToBringUpSecondaryCores

 

+[FixedPcd]

   gArmTokenSpaceGuid.PcdNormalFvBaseAddress

   gArmTokenSpaceGuid.PcdNormalFvSize