ArmPlatformPkg/ArmPlatformLib: Added ArmPlatformGetPrimaryCoreMpId()

ArmPlatformGetPrimaryCoreMpId returns the MPID of the primary core.
The primary core might not be known at build time (eg: the platform allows
the boot CPU to be changed through board config).

This function is used during the secondary core stack initialization to know
the position of the secondary core in the SoC.
A secondary core that is at the position N, with N greater than the primary
core position, will be at the position N-1 in the list of secondary stacks
(the primary core has its own separate bigger stack).

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Olivier Martin <olivier.martin@arm.com>
Acked-by: Ryan Harkin <ryan.harkin@linaro.org>
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>



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

7 files changed, 76 insertions, 0 deletions

diff --git a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA9x4/CTA9x4Helper.S b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA9x4/CTA9x4Helper.S
index 94167d5f17..3fbc701dad 100644
--- a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA9x4/CTA9x4Helper.S
+++ b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA9x4/CTA9x4Helper.S
@@ -17,11 +17,21 @@
 .align 2

 

 GCC_ASM_EXPORT(ArmPlatformIsPrimaryCore)

+GCC_ASM_EXPORT(ArmPlatformGetPrimaryCoreMpId)

 

 GCC_ASM_IMPORT(_gPcd_FixedAtBuild_PcdArmPrimaryCore)

 GCC_ASM_IMPORT(_gPcd_FixedAtBuild_PcdArmPrimaryCoreMask)

 

 //UINTN

+//ArmPlatformGetPrimaryCoreMpId (

+//  VOID

+//  );

+ASM_PFX(ArmPlatformGetPrimaryCoreMpId):

+  LoadConstantToReg (_gPcd_FixedAtBuild_PcdArmPrimaryCoreMask, r0)

+  ldr   r0, [r0]

+  bx    lr

+

+//UINTN

 //ArmPlatformIsPrimaryCore (

 //  IN UINTN MpId

 //  );

diff --git a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA9x4/CTA9x4Helper.asm b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA9x4/CTA9x4Helper.asm
index 429026e015..246ea554d8 100644
--- a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA9x4/CTA9x4Helper.asm
+++ b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA9x4/CTA9x4Helper.asm
@@ -18,6 +18,7 @@
   INCLUDE AsmMacroIoLib.inc

 

   EXPORT  ArmPlatformIsPrimaryCore

+  EXPORT  ArmPlatformGetPrimaryCoreMpId

 

   IMPORT  _gPcd_FixedAtBuild_PcdArmPrimaryCore

   IMPORT  _gPcd_FixedAtBuild_PcdArmPrimaryCoreMask

@@ -25,6 +26,16 @@
   AREA CTA9x4Helper, CODE, READONLY

 

 //UINTN

+//ArmPlatformGetPrimaryCoreMpId (

+//  VOID

+//  );

+ArmPlatformGetPrimaryCoreMpId FUNCTION

+  LoadConstantToReg (_gPcd_FixedAtBuild_PcdArmPrimaryCoreMask, r0)

+  ldr     r0, [r0]

+  bx 	  lr

+  ENDFUNC

+

+//UINTN

 //ArmPlatformIsPrimaryCore (

 //  IN UINTN MpId

 //  );

diff --git a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibRTSM/Arm/RTSMHelper.S b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibRTSM/Arm/RTSMHelper.S
index 2977591529..847424fb4b 100644
--- a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibRTSM/Arm/RTSMHelper.S
+++ b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibRTSM/Arm/RTSMHelper.S
@@ -23,6 +23,7 @@
 

 GCC_ASM_EXPORT(ArmGetCpuCountPerCluster)

 GCC_ASM_EXPORT(ArmPlatformIsPrimaryCore)

+GCC_ASM_EXPORT(ArmPlatformGetPrimaryCoreMpId)

 

 GCC_ASM_IMPORT(_gPcd_FixedAtBuild_PcdArmPrimaryCore)

 GCC_ASM_IMPORT(_gPcd_FixedAtBuild_PcdArmPrimaryCoreMask)

@@ -36,6 +37,15 @@ ASM_PFX(ArmGetScuBaseAddress):
   mrc   p15, 4, r0, c15, c0, 0

   bx  lr

 

+//UINTN

+//ArmPlatformGetPrimaryCoreMpId (

+//  VOID

+//  );

+ASM_PFX(ArmPlatformGetPrimaryCoreMpId):

+  LoadConstantToReg (_gPcd_FixedAtBuild_PcdArmPrimaryCoreMask, r0)

+  ldr   r0, [r0]

+  bx    lr

+

 # IN None

 # OUT r0 = number of cores present in the system

 ASM_PFX(ArmGetCpuCountPerCluster):

diff --git a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibRTSM/Arm/RTSMHelper.asm b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibRTSM/Arm/RTSMHelper.asm
index 7d00d115dc..167762c34e 100644
--- a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibRTSM/Arm/RTSMHelper.asm
+++ b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibRTSM/Arm/RTSMHelper.asm
@@ -23,6 +23,7 @@
 

   EXPORT    ArmGetCpuCountPerCluster

   EXPORT    ArmPlatformIsPrimaryCore

+  EXPORT    ArmPlatformGetPrimaryCoreMpId

 

   IMPORT  _gPcd_FixedAtBuild_PcdArmPrimaryCore

   IMPORT  _gPcd_FixedAtBuild_PcdArmPrimaryCoreMask

@@ -39,6 +40,16 @@ ArmGetScuBaseAddress FUNCTION
   bx  lr

   ENDFUNC

 

+//UINTN

+//ArmPlatformGetPrimaryCoreMpId (

+//  VOID

+//  );

+ArmPlatformGetPrimaryCoreMpId FUNCTION

+  LoadConstantToReg (_gPcd_FixedAtBuild_PcdArmPrimaryCoreMask, r0)

+  ldr   r0, [r0]

+  bx    lr

+  ENDFUNC

+

 // IN None

 // OUT r0 = number of cores present in the system

 ArmGetCpuCountPerCluster FUNCTION

diff --git a/ArmPlatformPkg/Include/Library/ArmPlatformLib.h b/ArmPlatformPkg/Include/Library/ArmPlatformLib.h
index b58ddd5d3f..94ad5c176f 100644
--- a/ArmPlatformPkg/Include/Library/ArmPlatformLib.h
+++ b/ArmPlatformPkg/Include/Library/ArmPlatformLib.h
@@ -70,6 +70,20 @@ ArmPlatformIsPrimaryCore (
   );

 

 /**

+  Return the MpId of the primary core

+

+  This function returns the MpId of the primary core.

+  This function might be called from assembler before any stack is set.

+

+  @return   Return the MpId of the primary core

+

+**/

+UINTN

+ArmPlatformGetPrimaryCoreMpId (

+  VOID

+  );

+

+/**

   Return the current Boot Mode

 

   This function returns the boot reason on the platform

diff --git a/ArmPlatformPkg/Library/ArmPlatformLibNull/Arm/ArmPlatformHelper.S b/ArmPlatformPkg/Library/ArmPlatformLibNull/Arm/ArmPlatformHelper.S
index 47bf9c8946..e6f2a9e380 100644
--- a/ArmPlatformPkg/Library/ArmPlatformLibNull/Arm/ArmPlatformHelper.S
+++ b/ArmPlatformPkg/Library/ArmPlatformLibNull/Arm/ArmPlatformHelper.S
@@ -18,6 +18,7 @@
 .align 3

 

 GCC_ASM_EXPORT(ArmPlatformGetCorePosition)

+GCC_ASM_EXPORT(ArmPlatformGetPrimaryCoreMpId)

 GCC_ASM_EXPORT(ArmPlatformIsPrimaryCore)

 

 GCC_ASM_IMPORT(_gPcd_FixedAtBuild_PcdArmPrimaryCore)

@@ -33,6 +34,14 @@ ASM_PFX(ArmPlatformGetCorePosition):
   add	r0, r1, r0, LSR #7

   bx 	lr

 

+//UINTN

+//ArmPlatformGetPrimaryCoreMpId (

+//  VOID

+//  );

+ASM_PFX(ArmPlatformGetPrimaryCoreMpId):

+  LoadConstantToReg (_gPcd_FixedAtBuild_PcdArmPrimaryCoreMask, r0)

+  ldr   r0, [r0]

+  bx    lr

 

 //UINTN

 //ArmPlatformIsPrimaryCore (

diff --git a/ArmPlatformPkg/Library/ArmPlatformLibNull/Arm/ArmPlatformHelper.asm b/ArmPlatformPkg/Library/ArmPlatformLibNull/Arm/ArmPlatformHelper.asm
index 6d35182a27..84f1ee35bf 100644
--- a/ArmPlatformPkg/Library/ArmPlatformLibNull/Arm/ArmPlatformHelper.asm
+++ b/ArmPlatformPkg/Library/ArmPlatformLibNull/Arm/ArmPlatformHelper.asm
@@ -17,6 +17,7 @@
   INCLUDE AsmMacroIoLib.inc

 

   EXPORT  ArmPlatformGetCorePosition

+  EXPORT  ArmPlatformGetPrimaryCoreMpId

   EXPORT  ArmPlatformIsPrimaryCore

 

   IMPORT  _gPcd_FixedAtBuild_PcdArmPrimaryCore

@@ -37,6 +38,16 @@ ArmPlatformGetCorePosition FUNCTION
   ENDFUNC

 

 //UINTN

+//ArmPlatformGetPrimaryCoreMpId (

+//  VOID

+//  );

+ArmPlatformGetPrimaryCoreMpId FUNCTION

+  LoadConstantToReg (_gPcd_FixedAtBuild_PcdArmPrimaryCoreMask, r0)

+  ldr   r0, [r0]

+  bx    lr

+  ENDFUNC

+

+//UINTN

 //ArmPlatformIsPrimaryCore (

 //  IN UINTN MpId

 //  );