ARM Packages: Replaced the macro GetCorePositionFromMpId() by the ArmPlatformGetCoreP...

[mirror_edk2.git] / ArmPlatformPkg / ArmVExpressPkg / Library / ArmVExpressLibRTSM / Arm / RTSMHelper.asm

diff --git a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibRTSM/Arm/RTSMHelper.asm b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibRTSM/Arm/RTSMHelper.asm
index 167762c34e1a47f599bc13181aabf4f15d99d27a..02b9f0f4a7f0aa149a0c93fad63ecdebf0a3f7b0 100644 (file)
--- a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibRTSM/Arm/RTSMHelper.asm
+++ b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibRTSM/Arm/RTSMHelper.asm
@@ -1,5 +1,5 @@
 //\r
-//  Copyright (c) 2011-2012, ARM Limited. All rights reserved.\r
+//  Copyright (c) 2011-2013, ARM Limited. All rights reserved.\r
 //  \r
 //  This program and the accompanying materials                          \r
 //  are licensed and made available under the terms and conditions of the BSD License         \r
@@ -13,6 +13,7 @@
 \r
 #include <AsmMacroIoLib.h>\r
 #include <Base.h>\r
+#include <Library/ArmLib.h>\r
 #include <Library/PcdLib.h>\r
 \r
 #include <Chipset/ArmCortexA9.h>\r
@@ -24,9 +25,10 @@
   EXPORT    ArmGetCpuCountPerCluster\r
   EXPORT    ArmPlatformIsPrimaryCore\r
   EXPORT    ArmPlatformGetPrimaryCoreMpId\r
+  EXPORT    ArmPlatformGetCorePosition\r
 \r
-  IMPORT  _gPcd_FixedAtBuild_PcdArmPrimaryCore\r
-  IMPORT  _gPcd_FixedAtBuild_PcdArmPrimaryCoreMask\r
+  IMPORT    _gPcd_FixedAtBuild_PcdArmPrimaryCore\r
+  IMPORT    _gPcd_FixedAtBuild_PcdArmPrimaryCoreMask\r
 \r
   AREA RTSMHelper, CODE, READONLY\r
 \r
@@ -103,4 +105,15 @@ ArmPlatformIsPrimaryCore FUNCTION
   bx   lr\r
   ENDFUNC\r
 \r
+//UINTN\r
+//ArmPlatformGetCorePosition (\r
+//  IN UINTN MpId\r
+//  );\r
+ArmPlatformGetCorePosition FUNCTION\r
+  and   r1, r0, #ARM_CORE_MASK\r
+  and   r0, r0, #ARM_CLUSTER_MASK\r
+  add   r0, r1, r0, LSR #7\r
+  bx    lr\r
+  ENDFUNC\r
+\r
   END\r