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

diff --git a/ArmPkg/Include/Library/ArmLib.h b/ArmPkg/Include/Library/ArmLib.h
index 9694b9d06d0f9408cebe5db66abc8da72fbe721b..82f0c4b39c550baced01b4cd2a31b11da3cd3164 100644 (file)
--- a/ArmPkg/Include/Library/ArmLib.h
+++ b/ArmPkg/Include/Library/ArmLib.h
@@ -212,12 +212,6 @@ ArmReadIdPfr1 (
   VOID\r
   );\r
 \r
-UINT32\r
-EFIAPI\r
-Cp15IdCode (\r
-  VOID\r
-  );\r
-  \r
 UINT32\r
 EFIAPI\r
 Cp15CacheInfo (\r

diff --git a/ArmPkg/Library/ArmLib/AArch64/AArch64Support.S b/ArmPkg/Library/ArmLib/AArch64/AArch64Support.S
index 211457bd75fc864558fb82f0f0920f9326445dc9..8cf4f69f5b0bdc9220add408b3324138d3339b64 100644 (file)
--- a/ArmPkg/Library/ArmLib/AArch64/AArch64Support.S
+++ b/ArmPkg/Library/ArmLib/AArch64/AArch64Support.S
@@ -51,7 +51,6 @@ GCC_ASM_EXPORT (ArmEnableVFP)
 GCC_ASM_EXPORT (ArmCallWFI)\r
 GCC_ASM_EXPORT (ArmInvalidateInstructionAndDataTlb)\r
 GCC_ASM_EXPORT (ArmReadMpidr)\r
-GCC_ASM_EXPORT (ArmReadMidr)\r
 GCC_ASM_EXPORT (ArmReadTpidrurw)\r
 GCC_ASM_EXPORT (ArmWriteTpidrurw)\r
 GCC_ASM_EXPORT (ArmIsArchTimerImplemented)\r
@@ -469,9 +468,6 @@ ASM_PFX(ArmReadMpidr):
   mrs   x0, mpidr_el1           // read EL1 MPIDR\r
   ret\r
 \r
-ASM_PFX(ArmReadMidr):\r
-  mrs   x0, midr_el1            // Read Main ID Register\r
-  ret\r
 \r
 // Keep old function names for C compatibilty for now. Change later?\r
 ASM_PFX(ArmReadTpidrurw):\r

diff --git a/ArmPkg/Library/ArmLib/Arm11/Arm11Support.S b/ArmPkg/Library/ArmLib/Arm11/Arm11Support.S
index e18023e6ae66b84ac3b815d3ba2b0149df5712a0..2f4be7e93f54495c31ee37a2ec9130f1e49d1f3b 100644 (file)
--- a/ArmPkg/Library/ArmLib/Arm11/Arm11Support.S
+++ b/ArmPkg/Library/ArmLib/Arm11/Arm11Support.S
@@ -43,7 +43,6 @@ GCC_ASM_EXPORT(ArmSetHighVectors)
 GCC_ASM_EXPORT(ArmIsMpCore)\r
 GCC_ASM_EXPORT(ArmCallWFI)\r
 GCC_ASM_EXPORT(ArmReadMpidr)\r
-GCC_ASM_EXPORT(ArmReadMidr)\r
 GCC_ASM_EXPORT(ArmUpdateTranslationTableEntry)\r
 GCC_ASM_EXPORT(ArmEnableFiq)\r
 GCC_ASM_EXPORT(ArmDisableFiq)\r
@@ -217,10 +216,6 @@ ASM_PFX(ArmReadMpidr):
   mrc     p15, 0, r0, c0, c0, 5       @ read MPIDR\r
   bx      lr\r
 \r
-ASM_PFX(ArmReadMpidr):\r
-  mrc     p15, 0, r0, c0, c0, 0       @ Read Main ID Register\r
-  bx      lr\r
-\r
 ASM_PFX(ArmEnableFiq):\r
   mrs     R0,CPSR\r
   bic     R0,R0,#0x40    @Enable FIQ interrupts\r

diff --git a/ArmPkg/Library/ArmLib/ArmV7/ArmV7Support.S b/ArmPkg/Library/ArmLib/ArmV7/ArmV7Support.S
index d402118ce2ccdc8fe26605cd517416ff90a534a2..954762717c50cf6bccbd1e23c378bd61980ec077 100644 (file)
--- a/ArmPkg/Library/ArmLib/ArmV7/ArmV7Support.S
+++ b/ArmPkg/Library/ArmLib/ArmV7/ArmV7Support.S
@@ -49,7 +49,6 @@ GCC_ASM_EXPORT (ArmCallWFI)
 GCC_ASM_EXPORT (ArmReadCbar)\r
 GCC_ASM_EXPORT (ArmInvalidateInstructionAndDataTlb)\r
 GCC_ASM_EXPORT (ArmReadMpidr)\r
-GCC_ASM_EXPORT (ArmReadMidr)\r
 GCC_ASM_EXPORT (ArmReadTpidrurw)\r
 GCC_ASM_EXPORT (ArmWriteTpidrurw)\r
 GCC_ASM_EXPORT (ArmIsArchTimerImplemented)\r
@@ -377,11 +376,7 @@ ASM_PFX(ArmInvalidateInstructionAndDataTlb):
 ASM_PFX(ArmReadMpidr):\r
   mrc     p15, 0, r0, c0, c0, 5       @ read MPIDR\r
   bx      lr\r
-\r
-ASM_PFX(ArmReadMidr):\r
-  mrc     p15, 0, r0, c0, c0, 0       @ Read Main ID Register\r
-  bx      lr\r
-\r
+  \r
 ASM_PFX(ArmReadTpidrurw):\r
   mrc     p15, 0, r0, c13, c0, 2    @ read TPIDRURW\r
   bx      lr\r

diff --git a/ArmPkg/Library/ArmLib/ArmV7/ArmV7Support.asm b/ArmPkg/Library/ArmLib/ArmV7/ArmV7Support.asm
index 8eee50dcfde51067b5badef1a8779bf75c5fcd83..4808c7ba748015fb00e77fe0838e7c182990bc27 100644 (file)
--- a/ArmPkg/Library/ArmLib/ArmV7/ArmV7Support.asm
+++ b/ArmPkg/Library/ArmLib/ArmV7/ArmV7Support.asm
@@ -46,7 +46,6 @@
     EXPORT  ArmReadCbar\r
     EXPORT  ArmInvalidateInstructionAndDataTlb\r
     EXPORT  ArmReadMpidr\r
-    EXPORT  ArmReadMidr\r
     EXPORT  ArmReadTpidrurw\r
     EXPORT  ArmWriteTpidrurw\r
     EXPORT  ArmIsArchTimerImplemented\r
@@ -372,10 +371,6 @@ ArmReadMpidr
   mrc     p15, 0, r0, c0, c0, 5     ; read MPIDR\r
   bx      lr\r
 \r
-ArmReadMidr\r
-  mrc     p15, 0, r0, c0, c0, 0      ; Read Main ID Register\r
-  bx      lr\r
-\r
 ArmReadTpidrurw\r
   mrc     p15, 0, r0, c13, c0, 2    ; read TPIDRURW\r
   bx      lr\r

diff --git a/ArmPkg/Library/ArmLib/Common/AArch64/ArmLibSupport.S b/ArmPkg/Library/ArmLib/Common/AArch64/ArmLibSupport.S
index 5dd3fca5e958de10dd33e71ff94c676310040359..f7cc55724532feffc281cacd7eb9d732b98948e4 100644 (file)
--- a/ArmPkg/Library/ArmLib/Common/AArch64/ArmLibSupport.S
+++ b/ArmPkg/Library/ArmLib/Common/AArch64/ArmLibSupport.S
@@ -17,7 +17,7 @@
 \r
 .text\r
 .align 3\r
-GCC_ASM_EXPORT (ArmMainIdCode)\r
+GCC_ASM_EXPORT (ArmReadMidr)\r
 GCC_ASM_EXPORT (ArmCacheInfo)\r
 GCC_ASM_EXPORT (ArmGetInterruptState)\r
 GCC_ASM_EXPORT (ArmGetFiqState)\r
@@ -43,7 +43,7 @@ GCC_ASM_EXPORT (ArmCallSEV)
 .set DAIF_FIQ_BIT,   (1 << 0)\r
 .set DAIF_IRQ_BIT,   (1 << 1)\r
 \r
-ASM_PFX(ArmiMainIdCode):\r
+ASM_PFX(ArmReadMidr):\r
   mrs     x0, midr_el1        // Read from Main ID Register (MIDR)\r
   ret\r
 \r

diff --git a/ArmPkg/Library/ArmLib/Common/Arm/ArmLibSupport.S b/ArmPkg/Library/ArmLib/Common/Arm/ArmLibSupport.S
index 4c95565e8f085c004609e88e31256855aa5a5f31..57b205a7a826033728374dd4b49f620711f957f3 100644 (file)
--- a/ArmPkg/Library/ArmLib/Common/Arm/ArmLibSupport.S
+++ b/ArmPkg/Library/ArmLib/Common/Arm/ArmLibSupport.S
@@ -1,7 +1,7 @@
 #------------------------------------------------------------------------------ \r
 #\r
 # Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>\r
-# Copyright (c) 2011-2013, ARM Limited. All rights reserved.\r
+# Copyright (c) 2011 - 2014, 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
@@ -23,7 +23,7 @@
 \r
 .text\r
 .align 2\r
-GCC_ASM_EXPORT(Cp15IdCode)\r
+GCC_ASM_EXPORT(ArmReadMidr)\r
 GCC_ASM_EXPORT(Cp15CacheInfo)\r
 GCC_ASM_EXPORT(ArmGetInterruptState)\r
 GCC_ASM_EXPORT(ArmGetFiqState)\r
@@ -50,7 +50,7 @@ GCC_ASM_EXPORT(ArmReadSctlr)
 \r
 #------------------------------------------------------------------------------\r
 \r
-ASM_PFX(Cp15IdCode):\r
+ASM_PFX(ArmReadMidr):\r
   mrc     p15,0,R0,c0,c0,0\r
   bx      LR\r
 \r

diff --git a/ArmPkg/Library/ArmLib/Common/Arm/ArmLibSupport.asm b/ArmPkg/Library/ArmLib/Common/Arm/ArmLibSupport.asm
index f4b22943ff2c5012c988e959447d6f3e6fc811cf..a464e4d86cb18d6f8a6ec759d309c01be4c8a1eb 100644 (file)
--- a/ArmPkg/Library/ArmLib/Common/Arm/ArmLibSupport.asm
+++ b/ArmPkg/Library/ArmLib/Common/Arm/ArmLibSupport.asm
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------ \r
 //\r
 // Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>\r
-// Copyright (c) 2011-2013, ARM Limited. All rights reserved.\r
+// Copyright (c) 2011 - 2014, 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
@@ -23,7 +23,7 @@
 #define dsb\r
 #endif\r
 \r
-    EXPORT Cp15IdCode\r
+    EXPORT ArmReadMidr\r
     EXPORT Cp15CacheInfo\r
     EXPORT ArmGetInterruptState\r
     EXPORT ArmGetFiqState\r
@@ -50,7 +50,7 @@
 \r
     AREA ArmLibSupport, CODE, READONLY\r
 \r
-Cp15IdCode\r
+ArmReadMidr\r
   mrc     p15,0,R0,c0,c0,0\r
   bx      LR\r
 \r