4 files changed, 153 insertions, 0 deletions
diff --git a/roms/edk2/ArmPkg/Library/ArmHvcLib/AArch64/ArmHvc.S b/roms/edk2/ArmPkg/Library/ArmHvcLib/AArch64/ArmHvc.S
new file mode 100644
index 000000000..39d956a02
--- /dev/null
+++ b/roms/edk2/ArmPkg/Library/ArmHvcLib/AArch64/ArmHvc.S
@@ -0,0 +1,33 @@
+//
+//  Copyright (c) 2012-2014, ARM Limited. All rights reserved.
+//  Copyright (c) 2014-2016, Linaro Limited. All rights reserved.
+//
+//  SPDX-License-Identifier: BSD-2-Clause-Patent
+//
+//
+
+#include <AsmMacroIoLibV8.h>
+
+ASM_FUNC(ArmCallHvc)
+  // Push x0 on the stack - The stack must always be quad-word aligned
+  str   x0, [sp, #-16]!
+
+  // Load the HVC arguments values into the appropriate registers
+  ldp   x6, x7, [x0, #48]
+  ldp   x4, x5, [x0, #32]
+  ldp   x2, x3, [x0, #16]
+  ldp   x0, x1, [x0, #0]
+
+  hvc   #0
+
+  // Pop the ARM_HVC_ARGS structure address from the stack into x9
+  ldr   x9, [sp], #16
+
+  // Store the HVC returned values into the ARM_HVC_ARGS structure.
+  // A HVC call can return up to 4 values
+  stp   x2, x3, [x9, #16]
+  stp   x0, x1, [x9, #0]
+
+  mov   x0, x9
+
+  ret
diff --git a/roms/edk2/ArmPkg/Library/ArmHvcLib/Arm/ArmHvc.S b/roms/edk2/ArmPkg/Library/ArmHvcLib/Arm/ArmHvc.S
new file mode 100644
index 000000000..0a5a95919
--- /dev/null
+++ b/roms/edk2/ArmPkg/Library/ArmHvcLib/Arm/ArmHvc.S
@@ -0,0 +1,45 @@
+//
+//  Copyright (c) 2012-2014, ARM Limited. All rights reserved.
+//  Copyright (c) 2014-2016, Linaro Limited. All rights reserved.
+//
+//  SPDX-License-Identifier: BSD-2-Clause-Patent
+//
+//
+
+#include <AsmMacroIoLib.h>
+
+.arch_extension virt
+
+ASM_FUNC(ArmCallHvc)
+    push    {r4-r8}
+    // r0 will be popped just after the HVC call
+    push    {r0}
+
+    // Load the HVC arguments values into the appropriate registers
+    ldr     r7, [r0, #28]
+    ldr     r6, [r0, #24]
+    ldr     r5, [r0, #20]
+    ldr     r4, [r0, #16]
+    ldr     r3, [r0, #12]
+    ldr     r2, [r0, #8]
+    ldr     r1, [r0, #4]
+    ldr     r0, [r0, #0]
+
+    hvc     #0
+
+    // Pop the ARM_HVC_ARGS structure address from the stack into r8
+    pop     {r8}
+
+    // Load the HVC returned values into the appropriate registers
+    // A HVC call can return up to 4 values - we do not need to store back r4-r7.
+    str     r3, [r8, #12]
+    str     r2, [r8, #8]
+    str     r1, [r8, #4]
+    str     r0, [r8, #0]
+
+    mov     r0, r8
+
+    // Restore the registers r4-r8
+    pop     {r4-r8}
+
+    bx      lr
diff --git a/roms/edk2/ArmPkg/Library/ArmHvcLib/Arm/ArmHvc.asm b/roms/edk2/ArmPkg/Library/ArmHvcLib/Arm/ArmHvc.asm
new file mode 100644
index 000000000..01e4d3f9c
--- /dev/null
+++ b/roms/edk2/ArmPkg/Library/ArmHvcLib/Arm/ArmHvc.asm
@@ -0,0 +1,46 @@
+//
+//  Copyright (c) 2012-2014, ARM Limited. All rights reserved.
+//  Copyright (c) 2014, Linaro Limited. All rights reserved.
+//
+//  SPDX-License-Identifier: BSD-2-Clause-Patent
+//
+//
+
+
+    INCLUDE AsmMacroExport.inc
+
+ RVCT_ASM_EXPORT ArmCallHvc
+    push    {r4-r8}
+    // r0 will be popped just after the HVC call
+    push     {r0}
+
+    // Load the HVC arguments values into the appropriate registers
+    ldr     r7, [r0, #28]
+    ldr     r6, [r0, #24]
+    ldr     r5, [r0, #20]
+    ldr     r4, [r0, #16]
+    ldr     r3, [r0, #12]
+    ldr     r2, [r0, #8]
+    ldr     r1, [r0, #4]
+    ldr     r0, [r0, #0]
+
+    hvc     #0
+
+    // Pop the ARM_HVC_ARGS structure address from the stack into r8
+    pop     {r8}
+
+    // Load the HVC returned values into the appropriate registers
+    // A HVC call can return up to 4 values - we do not need to store back r4-r7.
+    str     r3, [r8, #12]
+    str     r2, [r8, #8]
+    str     r1, [r8, #4]
+    str     r0, [r8, #0]
+
+    mov     r0, r8
+
+    // Restore the registers r4-r8
+    pop     {r4-r8}
+
+    bx      lr
+
+    END
diff --git a/roms/edk2/ArmPkg/Library/ArmHvcLib/ArmHvcLib.inf b/roms/edk2/ArmPkg/Library/ArmHvcLib/ArmHvcLib.inf
new file mode 100644
index 000000000..69f68f63d
--- /dev/null
+++ b/roms/edk2/ArmPkg/Library/ArmHvcLib/ArmHvcLib.inf
@@ -0,0 +1,29 @@
+#/** @file
+#
+#  Copyright (c) 2012-2013, ARM Ltd. All rights reserved.<BR>
+#  Copyright (c) 2014, Linaro Ltd. All rights reserved.<BR>
+#  SPDX-License-Identifier: BSD-2-Clause-Patent
+#
+#**/
+
+[Defines]
+  INF_VERSION                    = 0x00010005
+  BASE_NAME                      = ArmHvcLib
+  FILE_GUID                      = E594959A-D150-44D3-963B-BA90329D3D9A
+  MODULE_TYPE                    = BASE
+  VERSION_STRING                 = 1.0
+  LIBRARY_CLASS                  = ArmHvcLib
+
+[Sources.ARM]
+  Arm/ArmHvc.asm    | RVCT
+  Arm/ArmHvc.S      | GCC
+
+[Sources.AARCH64]
+  AArch64/ArmHvc.S
+
+[Packages]
+  MdePkg/MdePkg.dec
+  ArmPkg/ArmPkg.dec
+
+[BuildOptions]
+  RVCT:*_*_ARM_PLATFORM_FLAGS == --cpu Cortex-A15