3 files changed, 35 insertions, 2 deletions
diff --git a/ArmPkg/Include/Library/ArmLib.h b/ArmPkg/Include/Library/ArmLib.h
index 4550ea6..b12be14 100644
--- a/ArmPkg/Include/Library/ArmLib.h
+++ b/ArmPkg/Include/Library/ArmLib.h
@@ -570,4 +570,16 @@ ArmReadSctlr (
   VOID
   );
 
+UINTN
+EFIAPI
+ArmReadHVBar (
+  VOID
+  );
+
+VOID
+EFIAPI
+ArmWriteHVBar (
+  IN  UINTN   HypModeVectorBase
+  );
+
 #endif // __ARM_LIB__
diff --git a/ArmPkg/Library/ArmLib/Common/Arm/ArmLibSupport.S b/ArmPkg/Library/ArmLib/Common/Arm/ArmLibSupport.S
index b191854..71aee43 100644
--- a/ArmPkg/Library/ArmLib/Common/Arm/ArmLibSupport.S
+++ b/ArmPkg/Library/ArmLib/Common/Arm/ArmLibSupport.S
@@ -1,7 +1,7 @@
 #------------------------------------------------------------------------------ 
 #
 # Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>
-# Copyright (c) 2011-2012, ARM Limited. All rights reserved.
+# Copyright (c) 2011-2013, ARM Limited. All rights reserved.
 #
 # This program and the accompanying materials
 # are licensed and made available under the terms and conditions of the BSD License
@@ -44,6 +44,8 @@ GCC_ASM_EXPORT(ArmReadScr)
 GCC_ASM_EXPORT(ArmWriteScr)
 GCC_ASM_EXPORT(ArmReadMVBar)
 GCC_ASM_EXPORT(ArmWriteMVBar)
+GCC_ASM_EXPORT(ArmReadHVBar)
+GCC_ASM_EXPORT(ArmWriteHVBar)
 GCC_ASM_EXPORT(ArmCallWFE)
 GCC_ASM_EXPORT(ArmCallSEV)
 GCC_ASM_EXPORT(ArmReadSctlr)
@@ -161,6 +163,15 @@ ASM_PFX(ArmWriteScr):
   mcr     p15, 0, r0, c1, c1, 0
   bx      lr
 
+ASM_PFX(ArmReadHVBar):
+  mrc     p15, 4, r0, c12, c0, 0
+  bx      lr
+
+ASM_PFX(ArmWriteHVBar):
+  mcr     p15, 4, r0, c12, c0, 0
+  bx      lr
+
+
 ASM_PFX(ArmReadMVBar):
   mrc     p15, 0, r0, c12, c0, 1
   bx      lr
diff --git a/ArmPkg/Library/ArmLib/Common/Arm/ArmLibSupport.asm b/ArmPkg/Library/ArmLib/Common/Arm/ArmLibSupport.asm
index fd0f332..1636010 100644
--- a/ArmPkg/Library/ArmLib/Common/Arm/ArmLibSupport.asm
+++ b/ArmPkg/Library/ArmLib/Common/Arm/ArmLibSupport.asm
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------ 
 //
 // Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>
-// Copyright (c) 2011-2012, ARM Limited. All rights reserved.
+// Copyright (c) 2011-2013, ARM Limited. All rights reserved.
 //
 // This program and the accompanying materials
 // are licensed and made available under the terms and conditions of the BSD License
@@ -44,6 +44,8 @@
     EXPORT ArmWriteScr
     EXPORT ArmReadMVBar
     EXPORT ArmWriteMVBar
+    EXPORT ArmReadHVBar
+    EXPORT ArmWriteHVBar
     EXPORT ArmCallWFE
     EXPORT ArmCallSEV
     EXPORT ArmReadSctlr
@@ -161,6 +163,14 @@ ArmWriteScr
   mcr     p15, 0, r0, c1, c1, 0
   bx      lr
 
+ArmReadHVBar
+  mrc     p15, 4, r0, c12, c0, 0
+  bx      lr
+
+ArmWriteHVBar
+  mcr     p15, 4, r0, c12, c0, 0
+  bx      lr
+
 ArmReadMVBar
   mrc     p15, 0, r0, c12, c0, 1
   bx      lr