From 44e272fd6ab9d7b859588eeffc02b8cd78d3c76b Mon Sep 17 00:00:00 2001 From: oliviermartin Date: Thu, 22 Sep 2011 23:02:13 +0000 Subject: ArmPlatformPkg/ArmPlatformLib: Introduce ArmPlatformSecBootAction function This function is called at the initial stage of the Secure boot process to allow platform vendors to add early actions. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12413 6f19259b-4bc3-4df7-8a09-765794883524 --- .../Library/ArmRealViewEbLibRTSM/ArmRealViewEbBoot.S | 13 +++++++++++++ .../Library/ArmRealViewEbLibRTSM/ArmRealViewEbBoot.asm | 13 +++++++++++++ .../Library/ArmVExpressLibCTA9x4/CTA9x4Boot.S | 13 +++++++++++++ .../Library/ArmVExpressLibCTA9x4/CTA9x4Boot.asm | 13 +++++++++++++ ArmPlatformPkg/Include/Library/ArmPlatformLib.h | 14 ++++++++++++++ ArmPlatformPkg/Sec/SecEntryPoint.S | 12 ++++++++---- ArmPlatformPkg/Sec/SecEntryPoint.asm | 12 ++++++++---- 7 files changed, 82 insertions(+), 8 deletions(-) diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbBoot.S b/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbBoot.S index 037efd9..3f8c9ce 100755 --- a/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbBoot.S +++ b/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbBoot.S @@ -20,9 +20,22 @@ .text .align 3 +GCC_ASM_EXPORT(ArmPlatformSecBootAction) GCC_ASM_EXPORT(ArmPlatformInitializeBootMemory) /** + Call at the beginning of the platform boot up + + This function allows the firmware platform to do extra actions at the early + stage of the platform power up. + + Note: This function must be implemented in assembler as there is no stack set up yet + +**/ +ASM_PFX(ArmPlatformSecBootAction): + bx lr + +/** Initialize the memory where the initial stacks will reside This memory can contain the initial stacks (Secure and Secure Monitor stacks). diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbBoot.asm b/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbBoot.asm index 272a05a..9794aac 100755 --- a/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbBoot.asm +++ b/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbBoot.asm @@ -19,12 +19,25 @@ INCLUDE AsmMacroIoLib.inc + EXPORT ArmPlatformSecBootAction EXPORT ArmPlatformInitializeBootMemory PRESERVE8 AREA CTA9x4BootMode, CODE, READONLY /** + Call at the beginning of the platform boot up + + This function allows the firmware platform to do extra actions at the early + stage of the platform power up. + + Note: This function must be implemented in assembler as there is no stack set up yet + +**/ +ArmPlatformSecBootAction + bx lr + +/** Initialize the memory where the initial stacks will reside This memory can contain the initial stacks (Secure and Secure Monitor stacks). diff --git a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA9x4/CTA9x4Boot.S b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA9x4/CTA9x4Boot.S index c49c663..cd7734f 100755 --- a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA9x4/CTA9x4Boot.S +++ b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA9x4/CTA9x4Boot.S @@ -21,6 +21,7 @@ .text .align 3 +GCC_ASM_EXPORT(ArmPlatformSecBootAction) GCC_ASM_EXPORT(ArmPlatformInitializeBootMemory) GCC_ASM_IMPORT(PL35xSmcInitialize) @@ -60,6 +61,18 @@ VersatileExpressSmcConfiguration: VersatileExpressSmcConfigurationEnd: /** + Call at the beginning of the platform boot up + + This function allows the firmware platform to do extra actions at the early + stage of the platform power up. + + Note: This function must be implemented in assembler as there is no stack set up yet + +**/ +ASM_PFX(ArmPlatformSecBootAction): + bx lr + +/** Initialize the memory where the initial stacks will reside This memory can contain the initial stacks (Secure and Secure Monitor stacks). diff --git a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA9x4/CTA9x4Boot.asm b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA9x4/CTA9x4Boot.asm index 5a08307..0350608 100755 --- a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA9x4/CTA9x4Boot.asm +++ b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA9x4/CTA9x4Boot.asm @@ -20,6 +20,7 @@ INCLUDE AsmMacroIoLib.inc + EXPORT ArmPlatformSecBootAction EXPORT ArmPlatformInitializeBootMemory IMPORT PL35xSmcInitialize @@ -62,6 +63,18 @@ VersatileExpressSmcConfiguration VersatileExpressSmcConfigurationEnd /** + Call at the beginning of the platform boot up + + This function allows the firmware platform to do extra actions at the early + stage of the platform power up. + + Note: This function must be implemented in assembler as there is no stack set up yet + +**/ +ArmPlatformSecBootAction + bx lr + +/** Initialize the memory where the initial stacks will reside This memory can contain the initial stacks (Secure and Secure Monitor stacks). diff --git a/ArmPlatformPkg/Include/Library/ArmPlatformLib.h b/ArmPlatformPkg/Include/Library/ArmPlatformLib.h index 4ea640f..b266741 100644 --- a/ArmPlatformPkg/Include/Library/ArmPlatformLib.h +++ b/ArmPlatformPkg/Include/Library/ArmPlatformLib.h @@ -83,6 +83,20 @@ ArmPlatformGetBootMode ( ); /** + Call at the beginning of the platform boot up + + This function allows the firmware platform to do extra actions at the early + stage of the platform power up. + + Note: This function must be implemented in assembler as there is no stack set up yet + +**/ +VOID +ArmPlatformSecBootAction ( + VOID + ); + +/** Initialize controllers that must setup at the early stage Some peripherals must be initialized in Secure World. diff --git a/ArmPlatformPkg/Sec/SecEntryPoint.S b/ArmPlatformPkg/Sec/SecEntryPoint.S index 909f7fa..f859939 100644 --- a/ArmPlatformPkg/Sec/SecEntryPoint.S +++ b/ArmPlatformPkg/Sec/SecEntryPoint.S @@ -30,6 +30,7 @@ GCC_ASM_EXPORT(_ModuleEntryPoint) #global functions referenced by this module GCC_ASM_IMPORT(CEntryPoint) +GCC_ASM_IMPORT(ArmPlatformSecBootAction) GCC_ASM_IMPORT(ArmPlatformIsMemoryInitialized) GCC_ASM_IMPORT(ArmPlatformInitializeBootMemory) GCC_ASM_IMPORT(ArmDisableInterrupts) @@ -46,16 +47,19 @@ StartupAddr: .word ASM_PFX(CEntryPoint) SecVectorTableAddr: .word ASM_PFX(SecVectorTable) ASM_PFX(_ModuleEntryPoint): - #Set VBAR to the start of the exception vectors in Secure Mode - ldr r0, SecVectorTableAddr - bl ASM_PFX(ArmWriteVBar) - # First ensure all interrupts are disabled bl ASM_PFX(ArmDisableInterrupts) # Ensure that the MMU and caches are off bl ASM_PFX(ArmDisableCachesAndMmu) + # Jump to Platform Specific Boot Action function + blx ASM_PFX(ArmPlatformSecBootAction) + + # Set VBAR to the start of the exception vectors in Secure Mode + ldr r0, =SecVectorTable + bl ASM_PFX(ArmWriteVBar) + _IdentifyCpu: # Identify CPU ID bl ASM_PFX(ArmReadMpidr) diff --git a/ArmPlatformPkg/Sec/SecEntryPoint.asm b/ArmPlatformPkg/Sec/SecEntryPoint.asm index b291e50..472abde 100644 --- a/ArmPlatformPkg/Sec/SecEntryPoint.asm +++ b/ArmPlatformPkg/Sec/SecEntryPoint.asm @@ -20,6 +20,7 @@ INCLUDE AsmMacroIoLib.inc IMPORT CEntryPoint + IMPORT ArmPlatformSecBootAction IMPORT ArmPlatformIsMemoryInitialized IMPORT ArmPlatformInitializeBootMemory IMPORT ArmDisableInterrupts @@ -39,16 +40,19 @@ StartupAddr DCD CEntryPoint _ModuleEntryPoint - //Set VBAR to the start of the exception vectors in Secure Mode - ldr r0, =SecVectorTable - blx ArmWriteVBar - // First ensure all interrupts are disabled blx ArmDisableInterrupts // Ensure that the MMU and caches are off blx ArmDisableCachesAndMmu + // Jump to Platform Specific Boot Action function + blx ArmPlatformSecBootAction + + // Set VBAR to the start of the exception vectors in Secure Mode + ldr r0, =SecVectorTable + blx ArmWriteVBar + _IdentifyCpu // Identify CPU ID bl ArmReadMpidr -- cgit v1.1