ArmPkg/ArmLib: rename AArch64 variant of ArmReadIdPfr0

ArmReadIdPfr0 is now used only inside ArmLib. Rename the AArch64
variant ArmReadIdAA64Pfr0 and add a declaration of that only into
local header AArch64/AArch64Lib.h.

Cc: Ard Biesheuvel <ard.biesheuvel@arm.com>
Signed-off-by: Leif Lindholm <leif@nuviainc.com>
Reviewed-by: Ard Biesheuvel <ard.biesheuvel@arm.com>

diff --git a/ArmPkg/Library/ArmLib/AArch64/AArch64Lib.c b/ArmPkg/Library/ArmLib/AArch64/AArch64Lib.c
index 5b10eb33c97d00c45b928d8e260d851fb793ddb0..53e593bc994bdf74a0490911f3f3222d1dfaa988 100644 (file)
--- a/ArmPkg/Library/ArmLib/AArch64/AArch64Lib.c
+++ b/ArmPkg/Library/ArmLib/AArch64/AArch64Lib.c
@@ -85,5 +85,5 @@ ArmHasGicSystemRegisters (
   VOID\r
   )\r
 {\r
-  return ((ArmReadIdPfr0 () & AARCH64_PFR0_GIC) != 0);\r
+  return ((ArmReadIdAA64Pfr0 () & AARCH64_PFR0_GIC) != 0);\r
 }\r

diff --git a/ArmPkg/Library/ArmLib/AArch64/AArch64Lib.h b/ArmPkg/Library/ArmLib/AArch64/AArch64Lib.h
index b2c8a8ea0b84b4adfae2beb0aaf645ba75c5d58a..85bcecda730f3a9740e21ef8f6995a2764eb9351 100644 (file)
--- a/ArmPkg/Library/ArmLib/AArch64/AArch64Lib.h
+++ b/ArmPkg/Library/ArmLib/AArch64/AArch64Lib.h
@@ -2,6 +2,7 @@
 \r
   Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>\r
   Portions Copyright (c) 2011 - 2013, ARM Ltd. All rights reserved.<BR>\r
+  Copyright (c) 2020, NUVIA Inc. All rights reserved.<BR>\r
 \r
   SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
@@ -35,5 +36,10 @@ ArmCleanInvalidateDataCacheEntryBySetWay (
   IN  UINTN   SetWayFormat\r
   );\r
 \r
+UINTN\r
+EFIAPI\r
+ArmReadIdAA64Pfr0 (\r
+  VOID\r
+  );\r
 #endif // __AARCH64_LIB_H__\r
 \r

diff --git a/ArmPkg/Library/ArmLib/AArch64/AArch64Support.S b/ArmPkg/Library/ArmLib/AArch64/AArch64Support.S
index 7f942c29ea66b798fd36e30669b86ee874e65844..129205d2ac27e323b37852e850771bf49adca063 100644 (file)
--- a/ArmPkg/Library/ArmLib/AArch64/AArch64Support.S
+++ b/ArmPkg/Library/ArmLib/AArch64/AArch64Support.S
@@ -3,6 +3,7 @@
 # Copyright (c) 2008 - 2010, Apple Inc. All rights reserved.<BR>\r
 # Copyright (c) 2011 - 2017, ARM Limited. All rights reserved.\r
 # Copyright (c) 2016, Linaro Limited. All rights reserved.\r
+# Copyright (c) 2020, NUVIA Inc. All rights reserved.\r
 #\r
 # SPDX-License-Identifier: BSD-2-Clause-Patent\r
 #\r
@@ -395,7 +396,7 @@ ASM_FUNC(ArmReadVBar)
 ASM_FUNC(ArmEnableVFP)\r
   // Check whether floating-point is implemented in the processor.\r
   mov   x1, x30                 // Save LR\r
-  bl    ArmReadIdPfr0           // Read EL1 Processor Feature Register (PFR0)\r
+  bl    ArmReadIdAA64Pfr0       // Read EL1 Processor Feature Register (PFR0)\r
   mov   x30, x1                 // Restore LR\r
   ubfx  x0, x0, #16, #4         // Extract the FP bits 16:19\r
   cmp   x0, #0xF                // Check if FP bits are '1111b',\r
@@ -448,7 +449,7 @@ ASM_FUNC(ArmIsArchTimerImplemented)
   ret\r
 \r
 \r
-ASM_FUNC(ArmReadIdPfr0)\r
+ASM_FUNC(ArmReadIdAA64Pfr0)\r
   mrs   x0, id_aa64pfr0_el1   // Read ID_AA64PFR0 Register\r
   ret\r
 \r