ArmPkg/ArmLib: Functions to access ARM HYP Vector base address register.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Olivier Martin <olivier.martin@arm.com>
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@14189 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/ArmPkg/Include/Library/ArmLib.h b/ArmPkg/Include/Library/ArmLib.h
index 4550ea6ba0a3763e07d92656e1b920d7b16b7de8..b12be1424e0bbfce17e1fd4849ab15ecf168ceed 100644 (file)
--- a/ArmPkg/Include/Library/ArmLib.h
+++ b/ArmPkg/Include/Library/ArmLib.h
@@ -570,4 +570,16 @@ ArmReadSctlr (
   VOID\r
   );\r
 \r
+UINTN\r
+EFIAPI\r
+ArmReadHVBar (\r
+  VOID\r
+  );\r
+\r
+VOID\r
+EFIAPI\r
+ArmWriteHVBar (\r
+  IN  UINTN   HypModeVectorBase\r
+  );\r
+\r
 #endif // __ARM_LIB__\r

diff --git a/ArmPkg/Library/ArmLib/Common/Arm/ArmLibSupport.S b/ArmPkg/Library/ArmLib/Common/Arm/ArmLibSupport.S
index b19185412cb3f4b2f3203818daa51f8d23b7c529..71aee430739e62615ceab805a9cf210a93b2c138 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-2012, ARM Limited. All rights reserved.\r
+# Copyright (c) 2011-2013, 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
@@ -44,6 +44,8 @@ GCC_ASM_EXPORT(ArmReadScr)
 GCC_ASM_EXPORT(ArmWriteScr)\r
 GCC_ASM_EXPORT(ArmReadMVBar)\r
 GCC_ASM_EXPORT(ArmWriteMVBar)\r
+GCC_ASM_EXPORT(ArmReadHVBar)\r
+GCC_ASM_EXPORT(ArmWriteHVBar)\r
 GCC_ASM_EXPORT(ArmCallWFE)\r
 GCC_ASM_EXPORT(ArmCallSEV)\r
 GCC_ASM_EXPORT(ArmReadSctlr)\r
@@ -161,6 +163,15 @@ ASM_PFX(ArmWriteScr):
   mcr     p15, 0, r0, c1, c1, 0\r
   bx      lr\r
 \r
+ASM_PFX(ArmReadHVBar):\r
+  mrc     p15, 4, r0, c12, c0, 0\r
+  bx      lr\r
+\r
+ASM_PFX(ArmWriteHVBar):\r
+  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

diff --git a/ArmPkg/Library/ArmLib/Common/Arm/ArmLibSupport.asm b/ArmPkg/Library/ArmLib/Common/Arm/ArmLibSupport.asm
index fd0f332bd65c3ce86ea7d1ff175bdc192ec28915..1636010e0f0cbf71344317a66cb64bffa0da53ae 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-2012, ARM Limited. All rights reserved.\r
+// Copyright (c) 2011-2013, 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
@@ -44,6 +44,8 @@
     EXPORT ArmWriteScr\r
     EXPORT ArmReadMVBar\r
     EXPORT ArmWriteMVBar\r
+    EXPORT ArmReadHVBar\r
+    EXPORT ArmWriteHVBar\r
     EXPORT ArmCallWFE\r
     EXPORT ArmCallSEV\r
     EXPORT ArmReadSctlr\r
@@ -161,6 +163,14 @@ ArmWriteScr
   mcr     p15, 0, r0, c1, c1, 0\r
   bx      lr\r
 \r
+ArmReadHVBar\r
+  mrc     p15, 4, r0, c12, c0, 0\r
+  bx      lr\r
+\r
+ArmWriteHVBar\r
+  mcr     p15, 4, r0, c12, c0, 0\r
+  bx      lr\r
+\r
 ArmReadMVBar\r
   mrc     p15, 0, r0, c12, c0, 1\r
   bx      lr\r