ArmPkg: Add helper function to read the Memory Model Feature Register 4

In AARCH32, CCIDX support is indicated in the MMFR4 register - unlike
under AARCH64 where it's in MMFR2. Add a helper function to read it.

Signed-off-by: Rebecca Cran <rebecca@nuviainc.com>
Reviewed-by: Sami Mujawar <sami.mujawar@arm.com>
Reviewed-by: Leif Lindholm <leif@nuviainc.com>

diff --git a/ArmPkg/Library/ArmLib/Arm/ArmLibSupportV7.S b/ArmPkg/Library/ArmLib/Arm/ArmLibSupportV7.S
index 01c91b10fcb72f195736fdd512aa82c97a85c458..a60a2f6341322da78b2ff92b38268266c7331157 100644 (file)
--- a/ArmPkg/Library/ArmLib/Arm/ArmLibSupportV7.S
+++ b/ArmPkg/Library/ArmLib/Arm/ArmLibSupportV7.S
@@ -60,6 +60,10 @@ ASM_FUNC(ArmDisableInterrupts)
   isb\r
   bx      LR\r
 \r
+ASM_FUNC(ArmReadIdMmfr4)\r
+  mrc    p15,0,r0,c0,c2,6     @ Read ID_MMFR4 Register\r
+  bx     lr\r
+\r
 // UINT32\r
 // ReadCCSIDR (\r
 //   IN UINT32 CSSELR\r

diff --git a/ArmPkg/Library/ArmLib/Arm/ArmLibSupportV7.asm b/ArmPkg/Library/ArmLib/Arm/ArmLibSupportV7.asm
index 26ffa331b9295a94ea3fa12d1ef85113da690315..1679b09b797abe66a4031f0181699ae723f47ad4 100644 (file)
--- a/ArmPkg/Library/ArmLib/Arm/ArmLibSupportV7.asm
+++ b/ArmPkg/Library/ArmLib/Arm/ArmLibSupportV7.asm
@@ -64,6 +64,10 @@
   isb\r
   bx      LR\r
 \r
+ RVCT_ASM_EXPORT ArmReadIdMmfr4\r
+  mrc    p15,0,r0,c0,c2,6     ; Read ID_MMFR4 Register\r
+  bx     LR\r
+\r
 // UINT32\r
 // ReadCCSIDR (\r
 //   IN UINT32 CSSELR\r

diff --git a/ArmPkg/Library/ArmLib/Arm/ArmV7Lib.h b/ArmPkg/Library/ArmLib/Arm/ArmV7Lib.h
index bb7bda0a3aeb001749a7b3cfa7be2805942fd5be..dcf6723b803b4985955b80ecf6d7d73257dfb766 100644 (file)
--- a/ArmPkg/Library/ArmLib/Arm/ArmV7Lib.h
+++ b/ArmPkg/Library/ArmLib/Arm/ArmV7Lib.h
@@ -48,9 +48,13 @@ ArmCleanInvalidateDataCacheEntryBySetWay (
   IN  UINTN   SetWayFormat\r
   );\r
 \r
-UINTN\r
+/** Reads the ID_MMFR4 register.\r
+\r
+   @return The contents of the ID_MMFR4 register.\r
+**/\r
+UINT32\r
 EFIAPI\r
-ArmReadIdPfr0 (\r
+ArmReadIdMmfr4 (\r
   VOID\r
   );\r
 \r