UefiCpuPkg: Move AsmRelocateApLoopStart from Mpfuncs.nasm to AmdSev.nasm

[mirror_edk2.git] / ArmPlatformPkg / PrePi / AArch64 / ArchPrePi.c

diff --git a/ArmPlatformPkg/PrePi/AArch64/ArchPrePi.c b/ArmPlatformPkg/PrePi/AArch64/ArchPrePi.c
index 217986107e44185c2c6e11ca8a417fad659cde2f..296b029e08bfb8c56f9a17d93dd26c0e9d0b1270 100644 (file)
--- a/ArmPlatformPkg/PrePi/AArch64/ArchPrePi.c
+++ b/ArmPlatformPkg/PrePi/AArch64/ArchPrePi.c
@@ -1,15 +1,9 @@
 /** @file\r
-*\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
-*  which accompanies this distribution.  The full text of the license may be found at\r
-*  http://opensource.org/licenses/bsd-license.php\r
-*\r
-*  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-*  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
-*\r
+\r
+  Copyright (c) 2011-2017, ARM Limited. All rights reserved.\r
+\r
+  SPDX-License-Identifier: BSD-2-Clause-Patent\r
+\r
 **/\r
 \r
 #include "PrePi.h"\r
@@ -29,5 +23,12 @@ ArchInitialize (
   if (ArmReadCurrentEL () == AARCH64_EL2) {\r
     // Trap General Exceptions. All exceptions that would be routed to EL1 are routed to EL2\r
     ArmWriteHcr (ARM_HCR_TGE);\r
+\r
+    /* Enable Timer access for non-secure EL1 and EL0\r
+       The cnthctl_el2 register bits are architecturally\r
+       UNKNOWN on reset.\r
+       Disable event stream as it is not in use at this stage\r
+    */\r
+    ArmWriteCntHctl (CNTHCTL_EL2_EL1PCTEN | CNTHCTL_EL2_EL1PCEN);\r
   }\r
 }\r