tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ArmPkg/ArmLib: Rationalise ArmReadMidr and cognate functions. 

The function ArmReadMidr has been recently added, but that functionality was
already present under other names such as Cp15IdCode and ArmMainIdCode.  This
change removes redundant code and moves the function to the Common library.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Olivier Martin <olivier.martin@arm.com>



git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15276 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
Olivier Martin 2014-03-01 11:00:07 +00:00 committed by oliviermartin
parent 992a1f830d
commit f6c5a29bb9
8 changed files with 9 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ArmPkg/Include/Library/ArmLib.h
View File

@ -212,12 +212,6 @@ ArmReadIdPfr1 (
VOID VOID
); );
UINT32
EFIAPI
Cp15IdCode (
VOID
);
UINT32 UINT32
EFIAPI EFIAPI
Cp15CacheInfo ( Cp15CacheInfo (

4
ArmPkg/Library/ArmLib/AArch64/AArch64Support.S
View File

@ -51,7 +51,6 @@ GCC_ASM_EXPORT (ArmEnableVFP)
GCC_ASM_EXPORT (ArmCallWFI) GCC_ASM_EXPORT (ArmCallWFI)
GCC_ASM_EXPORT (ArmInvalidateInstructionAndDataTlb) GCC_ASM_EXPORT (ArmInvalidateInstructionAndDataTlb)
GCC_ASM_EXPORT (ArmReadMpidr) GCC_ASM_EXPORT (ArmReadMpidr)
GCC_ASM_EXPORT (ArmReadMidr)
GCC_ASM_EXPORT (ArmReadTpidrurw) GCC_ASM_EXPORT (ArmReadTpidrurw)
GCC_ASM_EXPORT (ArmWriteTpidrurw) GCC_ASM_EXPORT (ArmWriteTpidrurw)
GCC_ASM_EXPORT (ArmIsArchTimerImplemented) GCC_ASM_EXPORT (ArmIsArchTimerImplemented)
@ -469,9 +468,6 @@ ASM_PFX(ArmReadMpidr):
mrs x0, mpidr_el1 // read EL1 MPIDR mrs x0, mpidr_el1 // read EL1 MPIDR
ret ret
ASM_PFX(ArmReadMidr):
mrs x0, midr_el1 // Read Main ID Register
ret
// Keep old function names for C compatibilty for now. Change later? // Keep old function names for C compatibilty for now. Change later?
ASM_PFX(ArmReadTpidrurw): ASM_PFX(ArmReadTpidrurw):

5
ArmPkg/Library/ArmLib/Arm11/Arm11Support.S
View File

@ -43,7 +43,6 @@ GCC_ASM_EXPORT(ArmSetHighVectors)
GCC_ASM_EXPORT(ArmIsMpCore) GCC_ASM_EXPORT(ArmIsMpCore)
GCC_ASM_EXPORT(ArmCallWFI) GCC_ASM_EXPORT(ArmCallWFI)
GCC_ASM_EXPORT(ArmReadMpidr) GCC_ASM_EXPORT(ArmReadMpidr)
GCC_ASM_EXPORT(ArmReadMidr)
GCC_ASM_EXPORT(ArmUpdateTranslationTableEntry) GCC_ASM_EXPORT(ArmUpdateTranslationTableEntry)
GCC_ASM_EXPORT(ArmEnableFiq) GCC_ASM_EXPORT(ArmEnableFiq)
GCC_ASM_EXPORT(ArmDisableFiq) GCC_ASM_EXPORT(ArmDisableFiq)
@ -217,10 +216,6 @@ ASM_PFX(ArmReadMpidr):
mrc p15, 0, r0, c0, c0, 5 @ read MPIDR mrc p15, 0, r0, c0, c0, 5 @ read MPIDR
bx lr bx lr
ASM_PFX(ArmReadMpidr):
mrc p15, 0, r0, c0, c0, 0 @ Read Main ID Register
bx lr
ASM_PFX(ArmEnableFiq): ASM_PFX(ArmEnableFiq):
mrs R0,CPSR mrs R0,CPSR
bic R0,R0,#0x40 @Enable FIQ interrupts bic R0,R0,#0x40 @Enable FIQ interrupts

5
ArmPkg/Library/ArmLib/ArmV7/ArmV7Support.S
View File

@ -49,7 +49,6 @@ GCC_ASM_EXPORT (ArmCallWFI)
GCC_ASM_EXPORT (ArmReadCbar) GCC_ASM_EXPORT (ArmReadCbar)
GCC_ASM_EXPORT (ArmInvalidateInstructionAndDataTlb) GCC_ASM_EXPORT (ArmInvalidateInstructionAndDataTlb)
GCC_ASM_EXPORT (ArmReadMpidr) GCC_ASM_EXPORT (ArmReadMpidr)
GCC_ASM_EXPORT (ArmReadMidr)
GCC_ASM_EXPORT (ArmReadTpidrurw) GCC_ASM_EXPORT (ArmReadTpidrurw)
GCC_ASM_EXPORT (ArmWriteTpidrurw) GCC_ASM_EXPORT (ArmWriteTpidrurw)
GCC_ASM_EXPORT (ArmIsArchTimerImplemented) GCC_ASM_EXPORT (ArmIsArchTimerImplemented)
@ -378,10 +377,6 @@ ASM_PFX(ArmReadMpidr):
mrc p15, 0, r0, c0, c0, 5 @ read MPIDR mrc p15, 0, r0, c0, c0, 5 @ read MPIDR
bx lr bx lr
ASM_PFX(ArmReadMidr):
mrc p15, 0, r0, c0, c0, 0 @ Read Main ID Register
bx lr
ASM_PFX(ArmReadTpidrurw): ASM_PFX(ArmReadTpidrurw):
mrc p15, 0, r0, c13, c0, 2 @ read TPIDRURW mrc p15, 0, r0, c13, c0, 2 @ read TPIDRURW
bx lr bx lr

5
ArmPkg/Library/ArmLib/ArmV7/ArmV7Support.asm
View File

@ -46,7 +46,6 @@
EXPORT ArmReadCbar EXPORT ArmReadCbar
EXPORT ArmInvalidateInstructionAndDataTlb EXPORT ArmInvalidateInstructionAndDataTlb
EXPORT ArmReadMpidr EXPORT ArmReadMpidr
EXPORT ArmReadMidr
EXPORT ArmReadTpidrurw EXPORT ArmReadTpidrurw
EXPORT ArmWriteTpidrurw EXPORT ArmWriteTpidrurw
EXPORT ArmIsArchTimerImplemented EXPORT ArmIsArchTimerImplemented
@ -372,10 +371,6 @@ ArmReadMpidr
mrc p15, 0, r0, c0, c0, 5 ; read MPIDR mrc p15, 0, r0, c0, c0, 5 ; read MPIDR
bx lr bx lr
ArmReadMidr
mrc p15, 0, r0, c0, c0, 0 ; Read Main ID Register
bx lr
ArmReadTpidrurw ArmReadTpidrurw
mrc p15, 0, r0, c13, c0, 2 ; read TPIDRURW mrc p15, 0, r0, c13, c0, 2 ; read TPIDRURW
bx lr bx lr

4
ArmPkg/Library/ArmLib/Common/AArch64/ArmLibSupport.S
View File

@ -17,7 +17,7 @@
.text .text
.align 3 .align 3
GCC_ASM_EXPORT (ArmMainIdCode) GCC_ASM_EXPORT (ArmReadMidr)
GCC_ASM_EXPORT (ArmCacheInfo) GCC_ASM_EXPORT (ArmCacheInfo)
GCC_ASM_EXPORT (ArmGetInterruptState) GCC_ASM_EXPORT (ArmGetInterruptState)
GCC_ASM_EXPORT (ArmGetFiqState) GCC_ASM_EXPORT (ArmGetFiqState)
@ -43,7 +43,7 @@ GCC_ASM_EXPORT (ArmCallSEV)
.set DAIF_FIQ_BIT, (1 << 0) .set DAIF_FIQ_BIT, (1 << 0)
.set DAIF_IRQ_BIT, (1 << 1) .set DAIF_IRQ_BIT, (1 << 1)
ASM_PFX(ArmiMainIdCode): ASM_PFX(ArmReadMidr):
mrs x0, midr_el1 // Read from Main ID Register (MIDR) mrs x0, midr_el1 // Read from Main ID Register (MIDR)
ret ret

6
ArmPkg/Library/ArmLib/Common/Arm/ArmLibSupport.S
View File

@ -1,7 +1,7 @@
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# #
# Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR> # Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>
# Copyright (c) 2011-2013, ARM Limited. All rights reserved. # Copyright (c) 2011 - 2014, ARM Limited. All rights reserved.
# #
# This program and the accompanying materials # This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD License # are licensed and made available under the terms and conditions of the BSD License
@ -23,7 +23,7 @@
.text .text
.align 2 .align 2
GCC_ASM_EXPORT(Cp15IdCode) GCC_ASM_EXPORT(ArmReadMidr)
GCC_ASM_EXPORT(Cp15CacheInfo) GCC_ASM_EXPORT(Cp15CacheInfo)
GCC_ASM_EXPORT(ArmGetInterruptState) GCC_ASM_EXPORT(ArmGetInterruptState)
GCC_ASM_EXPORT(ArmGetFiqState) GCC_ASM_EXPORT(ArmGetFiqState)
@ -50,7 +50,7 @@ GCC_ASM_EXPORT(ArmReadSctlr)
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
ASM_PFX(Cp15IdCode): ASM_PFX(ArmReadMidr):
mrc p15,0,R0,c0,c0,0 mrc p15,0,R0,c0,c0,0
bx LR bx LR

6
ArmPkg/Library/ArmLib/Common/Arm/ArmLibSupport.asm
View File

@ -1,7 +1,7 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// //
// Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR> // Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>
// Copyright (c) 2011-2013, ARM Limited. All rights reserved. // Copyright (c) 2011 - 2014, ARM Limited. All rights reserved.
// //
// This program and the accompanying materials // This program and the accompanying materials
// are licensed and made available under the terms and conditions of the BSD License // are licensed and made available under the terms and conditions of the BSD License
@ -23,7 +23,7 @@
#define dsb #define dsb
#endif #endif
EXPORT Cp15IdCode EXPORT ArmReadMidr
EXPORT Cp15CacheInfo EXPORT Cp15CacheInfo
EXPORT ArmGetInterruptState EXPORT ArmGetInterruptState
EXPORT ArmGetFiqState EXPORT ArmGetFiqState
@ -50,7 +50,7 @@
AREA ArmLibSupport, CODE, READONLY AREA ArmLibSupport, CODE, READONLY
Cp15IdCode ArmReadMidr
mrc p15,0,R0,c0,c0,0 mrc p15,0,R0,c0,c0,0
bx LR bx LR