ArmPkg/ArmLib: Added helper functions for accessing CPU ACTLR

[mirror_edk2.git] / ArmPkg / Library / ArmLib / Common / Arm / ArmLibSupport.S

diff --git a/ArmPkg/Library/ArmLib/Common/Arm/ArmLibSupport.S b/ArmPkg/Library/ArmLib/Common/Arm/ArmLibSupport.S
index f3b949565f187a44517787c731458bd5e0fd1327..08a433cc8245e14e4897b59982b81d5b4dd3c240 100644 (file)
--- a/ArmPkg/Library/ArmLib/Common/Arm/ArmLibSupport.S
+++ b/ArmPkg/Library/ArmLib/Common/Arm/ArmLibSupport.S
@@ -47,6 +47,8 @@ GCC_ASM_EXPORT(ArmWriteHVBar)
 GCC_ASM_EXPORT(ArmCallWFE)\r
 GCC_ASM_EXPORT(ArmCallSEV)\r
 GCC_ASM_EXPORT(ArmReadSctlr)\r
+GCC_ASM_EXPORT(ArmReadCpuActlr)\r
+GCC_ASM_EXPORT(ArmWriteCpuActlr)\r
 \r
 #------------------------------------------------------------------------------\r
 \r
@@ -161,7 +163,6 @@ ASM_PFX(ArmWriteHVBar):
   mcr     p15, 4, r0, c12, c0, 0\r
   bx      lr\r
 \r
-\r
 ASM_PFX(ArmReadMVBar):\r
   mrc     p15, 0, r0, c12, c0, 1\r
   bx      lr\r
@@ -179,7 +180,17 @@ ASM_PFX(ArmCallSEV):
   bx      lr\r
 \r
 ASM_PFX(ArmReadSctlr):\r
-  mrc     p15, 0, R0, c1, c0, 0      @ Read SCTLR into R0 (Read control register configuration data)\r
-  bx     lr\r
+  mrc     p15, 0, r0, c1, c0, 0      @ Read SCTLR into R0 (Read control register configuration data)\r
+  bx      lr\r
+\r
+ASM_PFX(ArmReadCpuActlr):\r
+  mrc     p15, 0, r0, c1, c0, 1\r
+  bx      lr\r
+\r
+ASM_PFX(ArmWriteCpuActlr):\r
+  mcr     p15, 0, r0, c1, c0, 1\r
+  dsb\r
+  isb\r
+  bx      lr\r
 \r
 ASM_FUNCTION_REMOVE_IF_UNREFERENCED\r