ArmPkg/ArmV7Lib: add function to test for presence of MP extensions

Some MMU manipulation is dependent on the presence of the multiprocessing
extensions. So add a function that returns this information.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@18895 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/ArmPkg/Library/ArmLib/ArmV7/ArmLibSupportV7.S b/ArmPkg/Library/ArmLib/ArmV7/ArmLibSupportV7.S
index b94239f785c7f72c4d141f5ce634e16755b57e6c..d9e3c86b690748b6e0db01878de52917218584a8 100644 (file)
--- a/ArmPkg/Library/ArmLib/ArmV7/ArmLibSupportV7.S
+++ b/ArmPkg/Library/ArmLib/ArmV7/ArmLibSupportV7.S
@@ -19,6 +19,7 @@
 .align 2\r
 \r
 GCC_ASM_EXPORT(ArmIsMpCore)\r
+GCC_ASM_EXPORT(ArmHasMpExtensions)\r
 GCC_ASM_EXPORT(ArmEnableAsynchronousAbort)\r
 GCC_ASM_EXPORT(ArmDisableAsynchronousAbort)\r
 GCC_ASM_EXPORT(ArmEnableIrq)\r
@@ -44,6 +45,12 @@ ASM_PFX(ArmIsMpCore):
   movne   R0, #0\r
   bx      LR\r
 \r
+ASM_PFX(ArmHasMpExtensions):\r
+  mrc     p15,0,R0,c0,c0,5\r
+  // Get Multiprocessing extension (bit31)\r
+  lsr     R0, R0, #31\r
+  bx      LR\r
+\r
 ASM_PFX(ArmEnableAsynchronousAbort):\r
   cpsie   a\r
   isb\r

diff --git a/ArmPkg/Library/ArmLib/ArmV7/ArmLibSupportV7.asm b/ArmPkg/Library/ArmLib/ArmV7/ArmLibSupportV7.asm
index 82daa3ce16985650bf7b422b50d9ff101a922fd8..81792322535354129fcf470c97e571813919015e 100644 (file)
--- a/ArmPkg/Library/ArmLib/ArmV7/ArmLibSupportV7.asm
+++ b/ArmPkg/Library/ArmLib/ArmV7/ArmLibSupportV7.asm
@@ -15,6 +15,7 @@
 \r
 \r
     EXPORT  ArmIsMpCore\r
+    EXPORT  ArmHasMpExtensions\r
     EXPORT  ArmEnableAsynchronousAbort\r
     EXPORT  ArmDisableAsynchronousAbort\r
     EXPORT  ArmEnableIrq\r
@@ -43,6 +44,12 @@ ArmIsMpCore
   movne   R0, #0\r
   bx      LR\r
 \r
+ArmHasMpExtensions\r
+  mrc     p15,0,R0,c0,c0,5\r
+  // Get Multiprocessing extension (bit31)\r
+  lsr     R0, R0, #31\r
+  bx      LR\r
+\r
 ArmEnableAsynchronousAbort\r
   cpsie   a\r
   isb\r

diff --git a/ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.h b/ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.h
index df770cf7d798bce906d348dd222915bd04fae627..e138613ca548dce03b13e756f00a4142c1aee0a5 100644 (file)
--- a/ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.h
+++ b/ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.h
@@ -28,5 +28,11 @@ ArmReadIdMmfr0 (
   VOID\r
   );\r
 \r
+BOOLEAN\r
+EFIAPI\r
+ArmHasMpExtensions (\r
+  VOID\r
+  );\r
+\r
 #endif // __ARM_V7_LIB_H__\r
 \r