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

[mirror_edk2.git] / OvmfPkg / Library / AcpiTimerLib / BaseAcpiTimerLib.c

diff --git a/OvmfPkg/Library/AcpiTimerLib/BaseAcpiTimerLib.c b/OvmfPkg/Library/AcpiTimerLib/BaseAcpiTimerLib.c
index a839495e673dbd7f124fed24fd2dbda590d7bd80..6d1e1cb05e00091f425093e325bf85a8bd8e4a2d 100644 (file)
--- a/OvmfPkg/Library/AcpiTimerLib/BaseAcpiTimerLib.c
+++ b/OvmfPkg/Library/AcpiTimerLib/BaseAcpiTimerLib.c
@@ -3,13 +3,7 @@
 \r
   Copyright (C) 2014, Gabriel L. Somlo <somlo@cmu.edu>\r
 \r
-  This program and the accompanying materials are licensed and made\r
-  available under the terms and conditions of the BSD License which\r
-  accompanies this distribution.   The full text of the license may\r
-  be found at 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
+  SPDX-License-Identifier: BSD-2-Clause-Patent\r
 **/\r
 \r
 #include <Library/DebugLib.h>\r
@@ -20,7 +14,7 @@
 //\r
 // Cached ACPI Timer IO Address\r
 //\r
-STATIC UINT32 mAcpiTimerIoAddr;\r
+STATIC UINT32  mAcpiTimerIoAddr;\r
 \r
 /**\r
   The constructor function caches the ACPI tick counter address, and,\r
@@ -35,12 +29,12 @@ AcpiTimerLibConstructor (
   VOID\r
   )\r
 {\r
-  UINT16 HostBridgeDevId;\r
-  UINTN Pmba;\r
-  UINT32 PmbaAndVal;\r
-  UINT32 PmbaOrVal;\r
-  UINTN AcpiCtlReg;\r
-  UINT8 AcpiEnBit;\r
+  UINT16  HostBridgeDevId;\r
+  UINTN   Pmba;\r
+  UINT32  PmbaAndVal;\r
+  UINT32  PmbaOrVal;\r
+  UINTN   AcpiCtlReg;\r
+  UINT8   AcpiEnBit;\r
 \r
   //\r
   // Query Host Bridge DID to determine platform type\r
@@ -61,9 +55,16 @@ AcpiTimerLibConstructor (
       AcpiCtlReg = POWER_MGMT_REGISTER_Q35 (ICH9_ACPI_CNTL);\r
       AcpiEnBit  = ICH9_ACPI_CNTL_ACPI_EN;\r
       break;\r
+    case CLOUDHV_DEVICE_ID:\r
+      mAcpiTimerIoAddr =  CLOUDHV_ACPI_TIMER_IO_ADDRESS;\r
+      return RETURN_SUCCESS;\r
     default:\r
-      DEBUG ((EFI_D_ERROR, "%a: Unknown Host Bridge Device ID: 0x%04x\n",\r
-        __FUNCTION__, HostBridgeDevId));\r
+      DEBUG ((\r
+        DEBUG_ERROR,\r
+        "%a: Unknown Host Bridge Device ID: 0x%04x\n",\r
+        __FUNCTION__,\r
+        HostBridgeDevId\r
+        ));\r
       ASSERT (FALSE);\r
       return RETURN_UNSUPPORTED;\r
   }\r