summaryrefslogtreecommitdiffstats
path: root/ArmPkg
diff options
context:
space:
mode:
authorSami Mujawar <sami.mujawar@arm.com>2017-05-16 11:10:44 +0100
committerLeif Lindholm <leif.lindholm@linaro.org>2017-05-22 15:19:34 +0100
commit23d6348f924d27e72acdb3b5747ca26697e677e1 (patch)
tree0e31cfcdf36215fb64dba251fb248b5be4631293 /ArmPkg
parent7320b8ed1879b31657a8d6a62e6cd0ff1f645754 (diff)
downloadedk2-23d6348f924d27e72acdb3b5747ca26697e677e1.tar.gz
edk2-23d6348f924d27e72acdb3b5747ca26697e677e1.tar.bz2
edk2-23d6348f924d27e72acdb3b5747ca26697e677e1.zip
ArmPkg: Add CNTHCTL_EL2 support functions
Added helper functions for reading and writing the CNTHCTL_EL2 register. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Sami Mujawar <sami.mujawar@arm.com> Signed-off-by: Evan Lloyd <evan.lloyd@arm.com> Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
Diffstat (limited to 'ArmPkg')
-rw-r--r--ArmPkg/Include/Chipset/AArch64.h12
-rw-r--r--ArmPkg/Library/ArmLib/AArch64/AArch64Support.S10
2 files changed, 21 insertions, 1 deletions
diff --git a/ArmPkg/Include/Chipset/AArch64.h b/ArmPkg/Include/Chipset/AArch64.h
index cebfc5da42..76c2cc735e 100644
--- a/ArmPkg/Include/Chipset/AArch64.h
+++ b/ArmPkg/Include/Chipset/AArch64.h
@@ -1,7 +1,7 @@
/** @file
Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>
- Copyright (c) 2011 - 2015, ARM Ltd. All rights reserved.<BR>
+ Copyright (c) 2011 - 2017, ARM Ltd. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
@@ -235,4 +235,14 @@ ArmWriteCptr (
IN UINT64 Cptr
);
+UINT32
+ArmReadCntHctl (
+ VOID
+ );
+
+VOID
+ArmWriteCntHctl (
+ IN UINT32 CntHctl
+ );
+
#endif // __AARCH64_H__
diff --git a/ArmPkg/Library/ArmLib/AArch64/AArch64Support.S b/ArmPkg/Library/ArmLib/AArch64/AArch64Support.S
index 6e8074a486..dde6a75652 100644
--- a/ArmPkg/Library/ArmLib/AArch64/AArch64Support.S
+++ b/ArmPkg/Library/ArmLib/AArch64/AArch64Support.S
@@ -480,4 +480,14 @@ ASM_FUNC(ArmReadCurrentEL)
mrs x0, CurrentEL
ret
+// UINT32 ArmReadCntHctl(VOID)
+ASM_FUNC(ArmReadCntHctl)
+ mrs x0, cnthctl_el2
+ ret
+
+// VOID ArmWriteCntHctl(UINT32 CntHctl)
+ASM_FUNC(ArmWriteCntHctl)
+ msr cnthctl_el2, x0
+ ret
+
ASM_FUNCTION_REMOVE_IF_UNREFERENCED