X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=OvmfPkg%2FLibrary%2FAcpiTimerLib%2FAcpiTimerLib.c;h=c6441281b4b6b750a976bade3e3336e4e3bddc76;hb=d3a24ff5516446e6beeb8cc07e28fd5b24c19405;hp=7f41a869d87e1778693e5642c5b972c754915aea;hpb=56d7640a53bf23a4afa211c49b82527879edf65f;p=mirror_edk2.git

diff --git a/OvmfPkg/Library/AcpiTimerLib/AcpiTimerLib.c b/OvmfPkg/Library/AcpiTimerLib/AcpiTimerLib.c
index 7f41a869d8..c6441281b4 100644
--- a/OvmfPkg/Library/AcpiTimerLib/AcpiTimerLib.c
+++ b/OvmfPkg/Library/AcpiTimerLib/AcpiTimerLib.c
@@ -1,25 +1,64 @@
 /** @file
   ACPI Timer implements one instance of Timer Library.
 
-  Copyright (c) 2008, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2008 - 2012, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2011, Andrei Warkentin <andreiw@motorola.com>
+
   This program and the accompanying materials are
   licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
   http://opensource.org/licenses/bsd-license.php
-  
+
   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
-**/ 
+**/
 
 #include <Base.h>
 #include <Library/TimerLib.h>
 #include <Library/BaseLib.h>
 #include <Library/IoLib.h>
 #include <Library/PciLib.h>
-
-#define ACPI_TIMER_FREQUENCY   3579545
-#define ACPI_TIMER_COUNT_SIZE  0x01000000
+#include <Library/DebugLib.h>
+#include <Library/PcdLib.h>
+#include <IndustryStandard/Pci22.h>
+#include <IndustryStandard/Acpi.h>
+
+//
+// PCI Location of PIIX4 Power Management PCI Configuration Registers
+//
+#define PIIX4_POWER_MANAGEMENT_BUS       0x00
+#define PIIX4_POWER_MANAGEMENT_DEVICE    0x01
+#define PIIX4_POWER_MANAGEMENT_FUNCTION  0x03
+
+//
+// Macro to access PIIX4 Power Management PCI Configuration Registers
+//
+#define PIIX4_PCI_POWER_MANAGEMENT_REGISTER(Register) \
+  PCI_LIB_ADDRESS (                                   \
+    PIIX4_POWER_MANAGEMENT_BUS,                       \
+    PIIX4_POWER_MANAGEMENT_DEVICE,                    \
+    PIIX4_POWER_MANAGEMENT_FUNCTION,                  \
+    Register                                          \
+    )
+
+//
+// PIIX4 Power Management PCI Configuration Registers
+//
+#define PMBA                PIIX4_PCI_POWER_MANAGEMENT_REGISTER (0x40)
+#define   PMBA_RTE          BIT0
+#define PMREGMISC           PIIX4_PCI_POWER_MANAGEMENT_REGISTER (0x80)
+#define   PMIOSE            BIT0
+
+//
+// The ACPI Time in the PIIX4 is a 24-bit counter
+//
+#define ACPI_TIMER_COUNT_SIZE  BIT24
+
+//
+// Offset in the PIIX4 Power Management Base Address to the ACPI Timer 
+//
+#define ACPI_TIMER_OFFSET      0x8
 
 /**
   The constructor function enables ACPI IO space.
@@ -36,17 +75,23 @@ AcpiTimerLibConstructor (
   VOID
   )
 {
-  UINT8 Device;
-
-  Device = 1;
-  // Device = 7;
-
   //
-  // ACPI Timer enable is in Bus 0, Device ?, Function 3
+  // Check to see if the PIIX4 Power Management Base Address is already enabled
   //
-  PciOr8         (PCI_LIB_ADDRESS (0,Device,3,0x04), 0x01);
-  PciAndThenOr32 (PCI_LIB_ADDRESS (0,Device,3,0x40), (UINT32) ~0xfc0, 0x400);
-  PciOr8         (PCI_LIB_ADDRESS (0,Device,3,0x80), 0x01);  return RETURN_SUCCESS;
+  if ((PciRead8 (PMREGMISC) & PMIOSE) == 0) {
+    //
+    // If the PIIX4 Power Management Base Address is not programmed, 
+    // then program the PIIX4 Power Management Base Address from a PCD.
+    //
+    PciAndThenOr32 (PMBA, (UINT32)(~0x0000FFC0), PcdGet16 (PcdAcpiPmBaseAddress));
+
+    //
+    // Enable PMBA I/O port decodes in PMREGMISC
+    //
+    PciOr8 (PMREGMISC, PMIOSE);
+  }
+  
+  return RETURN_SUCCESS;
 }
 
 /**
@@ -57,13 +102,15 @@ AcpiTimerLibConstructor (
   @return The tick counter read.
 
 **/
-STATIC
 UINT32
 InternalAcpiGetTimerTick (
   VOID
   )
 {
-  return IoRead32 (0x408);
+  //
+  //   Read PMBA to read and return the current ACPI timer value.
+  //
+  return IoRead32 ((PciRead32 (PMBA) & ~PMBA_RTE) + ACPI_TIMER_OFFSET);
 }
 
 /**
@@ -75,7 +122,6 @@ InternalAcpiGetTimerTick (
   @param  Delay     A period of time to delay in ticks.
 
 **/
-STATIC
 VOID
 InternalAcpiDelay (
   IN      UINT32                    Delay
@@ -220,3 +266,39 @@ GetPerformanceCounterProperties (
 
   return ACPI_TIMER_FREQUENCY;
 }
+
+/**
+  Converts elapsed ticks of performance counter to time in nanoseconds.
+
+  This function converts the elapsed ticks of running performance counter to
+  time value in unit of nanoseconds.
+
+  @param  Ticks     The number of elapsed ticks of running performance counter.
+
+  @return The elapsed time in nanoseconds.
+
+**/
+UINT64
+EFIAPI
+GetTimeInNanoSecond (
+  IN      UINT64                     Ticks
+  )
+{
+  UINT64  NanoSeconds;
+  UINT32  Remainder;
+
+  //
+  //          Ticks
+  // Time = --------- x 1,000,000,000
+  //        Frequency
+  //
+  NanoSeconds = MultU64x32 (DivU64x32Remainder (Ticks, ACPI_TIMER_FREQUENCY, &Remainder), 1000000000u);
+
+  //
+  // Frequency < 0x100000000, so Remainder < 0x100000000, then (Remainder * 1,000,000,000)
+  // will not overflow 64-bit.
+  //
+  NanoSeconds += DivU64x32 (MultU64x32 ((UINT64) Remainder, 1000000000u), ACPI_TIMER_FREQUENCY);
+
+  return NanoSeconds;
+}