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

[mirror_edk2.git] / ArmPkg / Include / AsmMacroIoLib.h

diff --git a/ArmPkg/Include/AsmMacroIoLib.h b/ArmPkg/Include/AsmMacroIoLib.h
index c5073297417568a7ced154547a70fbb4cf31ffc0..dac2e150cc88bc468ab3a560abfa10f9b6769ae2 100644 (file)
--- a/ArmPkg/Include/AsmMacroIoLib.h
+++ b/ArmPkg/Include/AsmMacroIoLib.h
@@ -120,16 +120,6 @@
   .long (_Data)           ;                 \\r
 1:\r
 \r
-// Convert the (ClusterId,CoreId) into a Core Position\r
-// We assume there are 4 cores per cluster\r
-// Note: 0xFFFF is the magic value for ARM_CORE_MASK | ARM_CLUSTER_MASK\r
-#define GetCorePositionFromMpId(Pos, MpId, Tmp)  \\r
-  ldr   Tmp, =0xFFFF                             \\r
-  and   MpId, Tmp                                \\r
-  lsr   Pos, MpId, #6 ;                          \\r
-  and   Tmp, MpId, #3 ;                          \\r
-  add   Pos, Pos, Tmp\r
-\r
 // Reserve a region at the top of the Primary Core stack\r
 // for Global variables for the XIP phase\r
 #define SetPrimaryStack(StackTop, GlobalSize, Tmp)  \\r
@@ -211,16 +201,6 @@ _InitializePrimaryStackEnd:
 #define LoadConstantToReg(Data, Reg) \\r
   ldr  Reg, =Data\r
 \r
-// Convert the (ClusterId,CoreId) into a Core Position\r
-// We assume there are 4 cores per cluster\r
-// Note: 0xFFFF is the magic value for ARM_CORE_MASK | ARM_CLUSTER_MASK\r
-#define GetCorePositionFromMpId(Pos, MpId, Tmp)    \\r
-  ldr   Tmp, =0xFFFF ;                             \\r
-  and   MpId, Tmp ;                                \\r
-  lsr   Pos, MpId, #6 ;                            \\r
-  and   Tmp, MpId, #3 ;                            \\r
-  add   Pos, Pos, Tmp\r
-\r
 #define SetPrimaryStack(StackTop, GlobalSize, Tmp)  \\r
   and     Tmp, GlobalSize, #7         ;             \\r
   rsbne   Tmp, Tmp, #8                ;             \\r
@@ -313,8 +293,6 @@ _InitializePrimaryStackEnd:
 // conditional load testing eq flag\r
 #define LoadConstantToRegIfEq(Data, Reg)  LoadConstantToRegIfEqMacro Data, Reg\r
 \r
-#define GetCorePositionFromMpId(Pos, MpId, Tmp)  GetCorePositionFromMpId Pos, MpId, Tmp\r
-\r
 #define SetPrimaryStack(StackTop,GlobalSize,Tmp) SetPrimaryStack StackTop, GlobalSize, Tmp\r
 \r
 // Initialize the Global Variable with '0'\r