diff options
| author | oliviermartin <oliviermartin@6f19259b-4bc3-4df7-8a09-765794883524> | 2013-05-10 12:41:27 +0000 |
|---|---|---|
| committer | oliviermartin <oliviermartin@6f19259b-4bc3-4df7-8a09-765794883524> | 2013-05-10 12:41:27 +0000 |
| commit | bebda7ceec3d3024c76b3c2ed0c9b4e502a13d61 (patch) | |
| tree | 9c2d34dc7e57c2c52224c2990946778d955359fe /ArmPlatformPkg/PrePi/Arm | |
| parent | bc7b889a033a2617b650fbb5596d4f02530090bd (diff) | |
| download | edk2-bebda7ceec3d3024c76b3c2ed0c9b4e502a13d61.tar.gz edk2-bebda7ceec3d3024c76b3c2ed0c9b4e502a13d61.tar.bz2 edk2-bebda7ceec3d3024c76b3c2ed0c9b4e502a13d61.zip | |
ArmPlatformPkg/ArmPlatformLib: Added support for ArmPlatformIsPrimaryCore()
Checking if a core if the primary/boot core used to be done with the macro
IS_PRIMARY_CORE().
Some platforms exposes configuration registers to change the primary core.
Replacing the macro IS_PRIMARY_CORE() by ArmPlatformIsPrimaryCore() allows
some flexibility in the way to check the primary core.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Olivier Martin <olivier.martin@arm.com>
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
Acked-by: Ryan Harkin <ryan.harkin@linaro.org>
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@14344 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'ArmPlatformPkg/PrePi/Arm')
| -rw-r--r-- | ArmPlatformPkg/PrePi/Arm/ModuleEntryPoint.S | 10 | ||||
| -rw-r--r-- | ArmPlatformPkg/PrePi/Arm/ModuleEntryPoint.asm | 10 |
2 files changed, 12 insertions, 8 deletions
diff --git a/ArmPlatformPkg/PrePi/Arm/ModuleEntryPoint.S b/ArmPlatformPkg/PrePi/Arm/ModuleEntryPoint.S index c0c20a9206..da654c7a35 100644 --- a/ArmPlatformPkg/PrePi/Arm/ModuleEntryPoint.S +++ b/ArmPlatformPkg/PrePi/Arm/ModuleEntryPoint.S @@ -22,6 +22,7 @@ .align 3
GCC_ASM_IMPORT(CEntryPoint)
+GCC_ASM_IMPORT(ArmPlatformIsPrimaryCore)
GCC_ASM_IMPORT(ArmReadMpidr)
GCC_ASM_IMPORT(ArmPlatformStackSet)
GCC_ASM_EXPORT(_ModuleEntryPoint)
@@ -32,8 +33,8 @@ StartupAddr: .word CEntryPoint ASM_PFX(_ModuleEntryPoint):
// Get ID of this CPU in Multicore system
bl ASM_PFX(ArmReadMpidr)
- LoadConstantToReg (FixedPcdGet32(PcdArmPrimaryCoreMask), r1)
- and r6, r0, r1
+ // Keep a copy of the MpId register value
+ mov r6, r0
_SetSVCMode:
// Enter SVC mode, Disable FIQ and IRQ
@@ -118,8 +119,9 @@ _GetStackBase: bl ASM_PFX(ArmPlatformStackSet)
// Is it the Primary Core ?
- LoadConstantToReg (FixedPcdGet32(PcdArmPrimaryCore), r4)
- cmp r6, r4
+ mov r0, r6
+ bl ASM_PFX(ArmPlatformIsPrimaryCore)
+ cmp r0, #1
bne _PrepareArguments
_ReserveGlobalVariable:
diff --git a/ArmPlatformPkg/PrePi/Arm/ModuleEntryPoint.asm b/ArmPlatformPkg/PrePi/Arm/ModuleEntryPoint.asm index 5efdb532af..b78729fbc2 100644 --- a/ArmPlatformPkg/PrePi/Arm/ModuleEntryPoint.asm +++ b/ArmPlatformPkg/PrePi/Arm/ModuleEntryPoint.asm @@ -21,6 +21,7 @@ INCLUDE AsmMacroIoLib.inc
IMPORT CEntryPoint
+ IMPORT ArmPlatformIsPrimaryCore
IMPORT ArmReadMpidr
IMPORT ArmPlatformStackSet
@@ -34,8 +35,8 @@ StartupAddr DCD CEntryPoint _ModuleEntryPoint
// Get ID of this CPU in Multicore system
bl ArmReadMpidr
- LoadConstantToReg (FixedPcdGet32(PcdArmPrimaryCoreMask), r1)
- and r6, r0, r1
+ // Keep a copy of the MpId register value
+ mov r6, r0
_SetSVCMode
// Enter SVC mode, Disable FIQ and IRQ
@@ -120,8 +121,9 @@ _GetStackBase bl ArmPlatformStackSet
// Is it the Primary Core ?
- LoadConstantToReg (FixedPcdGet32(PcdArmPrimaryCore), r4)
- cmp r6, r4
+ mov r0, r6
+ bl ArmPlatformIsPrimaryCore
+ cmp r0, #1
bne _PrepareArguments
_ReserveGlobalVariable
|