diff options
| author | oliviermartin <oliviermartin@6f19259b-4bc3-4df7-8a09-765794883524> | 2013-05-10 12:46:11 +0000 |
|---|---|---|
| committer | oliviermartin <oliviermartin@6f19259b-4bc3-4df7-8a09-765794883524> | 2013-05-10 12:46:11 +0000 |
| commit | 2d45f194d98a1ff4f7d78b96a551d903969262b4 (patch) | |
| tree | 44da87e635d32e58c65c10768562e3a120ca1128 /ArmPkg | |
| parent | d05ca26cb891d8491641c378db4b0a0fcfc599d1 (diff) | |
| download | edk2-2d45f194d98a1ff4f7d78b96a551d903969262b4.tar.gz edk2-2d45f194d98a1ff4f7d78b96a551d903969262b4.tar.bz2 edk2-2d45f194d98a1ff4f7d78b96a551d903969262b4.zip | |
ARM Packages: Replaced the macro GetCorePositionFromMpId() by the ArmPlatformGetCorePosition()
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@14346 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'ArmPkg')
| -rw-r--r-- | ArmPkg/Include/AsmMacroIoLib.h | 22 | ||||
| -rw-r--r-- | ArmPkg/Include/AsmMacroIoLib.inc | 11 |
2 files changed, 0 insertions, 33 deletions
diff --git a/ArmPkg/Include/AsmMacroIoLib.h b/ArmPkg/Include/AsmMacroIoLib.h index c507329741..dac2e150cc 100644 --- a/ArmPkg/Include/AsmMacroIoLib.h +++ b/ArmPkg/Include/AsmMacroIoLib.h @@ -120,16 +120,6 @@ .long (_Data) ; \
1:
-// Convert the (ClusterId,CoreId) into a Core Position
-// We assume there are 4 cores per cluster
-// Note: 0xFFFF is the magic value for ARM_CORE_MASK | ARM_CLUSTER_MASK
-#define GetCorePositionFromMpId(Pos, MpId, Tmp) \
- ldr Tmp, =0xFFFF \
- and MpId, Tmp \
- lsr Pos, MpId, #6 ; \
- and Tmp, MpId, #3 ; \
- add Pos, Pos, Tmp
-
// Reserve a region at the top of the Primary Core stack
// for Global variables for the XIP phase
#define SetPrimaryStack(StackTop, GlobalSize, Tmp) \
@@ -211,16 +201,6 @@ _InitializePrimaryStackEnd: #define LoadConstantToReg(Data, Reg) \
ldr Reg, =Data
-// Convert the (ClusterId,CoreId) into a Core Position
-// We assume there are 4 cores per cluster
-// Note: 0xFFFF is the magic value for ARM_CORE_MASK | ARM_CLUSTER_MASK
-#define GetCorePositionFromMpId(Pos, MpId, Tmp) \
- ldr Tmp, =0xFFFF ; \
- and MpId, Tmp ; \
- lsr Pos, MpId, #6 ; \
- and Tmp, MpId, #3 ; \
- add Pos, Pos, Tmp
-
#define SetPrimaryStack(StackTop, GlobalSize, Tmp) \
and Tmp, GlobalSize, #7 ; \
rsbne Tmp, Tmp, #8 ; \
@@ -313,8 +293,6 @@ _InitializePrimaryStackEnd: // conditional load testing eq flag
#define LoadConstantToRegIfEq(Data, Reg) LoadConstantToRegIfEqMacro Data, Reg
-#define GetCorePositionFromMpId(Pos, MpId, Tmp) GetCorePositionFromMpId Pos, MpId, Tmp
-
#define SetPrimaryStack(StackTop,GlobalSize,Tmp) SetPrimaryStack StackTop, GlobalSize, Tmp
// Initialize the Global Variable with '0'
diff --git a/ArmPkg/Include/AsmMacroIoLib.inc b/ArmPkg/Include/AsmMacroIoLib.inc index 5796adcb12..54c32d4c34 100644 --- a/ArmPkg/Include/AsmMacroIoLib.inc +++ b/ArmPkg/Include/AsmMacroIoLib.inc @@ -80,17 +80,6 @@ ldr $Reg, =($Data)
MEND
- MACRO
- GetCorePositionFromMpId $Pos, $MpId, $Tmp
- ;Note: The ARM macro does not support the pre-processing. 0xFF and (0xFF << 8) are the values of
- ; ARM_CORE_MASK and ARM_CLUSTER_MASK
- mov $Tmp, #(0xFF :OR: (0xFF << 8))
- and $MpId, $Tmp
- lsr $Pos, $MpId, #6
- and $Tmp, $MpId, #3
- add $Pos, $Pos, $Tmp
- MEND
-
; The reserved place must be 8-bytes aligned for pushing 64-bit variable on the stack
; Note: Global Size will be modified
MACRO
|