1466b76f93
In this patch, the AcpiTimerLib instances, ResetSystemLib, and PlatformPei are modified together in order to keep VMs functional across a bisection: they all must agree on the PMBA value used. ResetSystemLib must not use dynamic PCDs. With SOURCE_DEBUG_ENABLE, it gets linked into the debug agent, therefore the same restrictions apply to it as to BaseRomAcpiTimerLib. Luckily, AcpiPmControl() is only used for powering off the virtual machine, thus the extra cost of a PCI config space read, compared to a PcdGet16(), should be negligible. This is the patch that moves the PMBA to IO port 0x0600 on Q35 in practice. The ResetSystemLib change is easiest to verify with the "reset -s" command in the UEFI shell (which goes through gRT->ResetSystem() and, in OVMF, PcAtChipsetPkg/KbcResetDxe). Cc: Gabriel Somlo <somlo@cmu.edu> Cc: Jordan Justen <jordan.l.justen@intel.com> Ref: https://bugzilla.redhat.com/show_bug.cgi?id=1333238 Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Laszlo Ersek <lersek@redhat.com> Reviewed-by: Jordan Justen <jordan.l.justen@intel.com> Tested-by: Gabriel Somlo <somlo@cmu.edu>
110 lines
2.9 KiB
C
110 lines
2.9 KiB
C
/** @file
|
|
Provide constructor and GetTick for Base instance of ACPI Timer Library
|
|
|
|
Copyright (C) 2014, Gabriel L. Somlo <somlo@cmu.edu>
|
|
|
|
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 <Library/DebugLib.h>
|
|
#include <Library/IoLib.h>
|
|
#include <Library/PciLib.h>
|
|
#include <OvmfPlatforms.h>
|
|
|
|
//
|
|
// Cached ACPI Timer IO Address
|
|
//
|
|
STATIC UINT32 mAcpiTimerIoAddr;
|
|
|
|
/**
|
|
The constructor function caches the ACPI tick counter address, and,
|
|
if necessary, enables ACPI IO space.
|
|
|
|
@retval EFI_SUCCESS The constructor always returns RETURN_SUCCESS.
|
|
|
|
**/
|
|
RETURN_STATUS
|
|
EFIAPI
|
|
AcpiTimerLibConstructor (
|
|
VOID
|
|
)
|
|
{
|
|
UINT16 HostBridgeDevId;
|
|
UINTN Pmba;
|
|
UINT32 PmbaAndVal;
|
|
UINT32 PmbaOrVal;
|
|
UINTN AcpiCtlReg;
|
|
UINT8 AcpiEnBit;
|
|
|
|
//
|
|
// Query Host Bridge DID to determine platform type
|
|
//
|
|
HostBridgeDevId = PciRead16 (OVMF_HOSTBRIDGE_DID);
|
|
switch (HostBridgeDevId) {
|
|
case INTEL_82441_DEVICE_ID:
|
|
Pmba = POWER_MGMT_REGISTER_PIIX4 (PIIX4_PMBA);
|
|
PmbaAndVal = ~(UINT32)PIIX4_PMBA_MASK;
|
|
PmbaOrVal = PIIX4_PMBA_VALUE;
|
|
AcpiCtlReg = POWER_MGMT_REGISTER_PIIX4 (PIIX4_PMREGMISC);
|
|
AcpiEnBit = PIIX4_PMREGMISC_PMIOSE;
|
|
break;
|
|
case INTEL_Q35_MCH_DEVICE_ID:
|
|
Pmba = POWER_MGMT_REGISTER_Q35 (ICH9_PMBASE);
|
|
PmbaAndVal = ~(UINT32)ICH9_PMBASE_MASK;
|
|
PmbaOrVal = ICH9_PMBASE_VALUE;
|
|
AcpiCtlReg = POWER_MGMT_REGISTER_Q35 (ICH9_ACPI_CNTL);
|
|
AcpiEnBit = ICH9_ACPI_CNTL_ACPI_EN;
|
|
break;
|
|
default:
|
|
DEBUG ((EFI_D_ERROR, "%a: Unknown Host Bridge Device ID: 0x%04x\n",
|
|
__FUNCTION__, HostBridgeDevId));
|
|
ASSERT (FALSE);
|
|
return RETURN_UNSUPPORTED;
|
|
}
|
|
|
|
//
|
|
// Check to see if the Power Management Base Address is already enabled
|
|
//
|
|
if ((PciRead8 (AcpiCtlReg) & AcpiEnBit) == 0) {
|
|
//
|
|
// If the Power Management Base Address is not programmed,
|
|
// then program it now.
|
|
//
|
|
PciAndThenOr32 (Pmba, PmbaAndVal, PmbaOrVal);
|
|
|
|
//
|
|
// Enable PMBA I/O port decodes
|
|
//
|
|
PciOr8 (AcpiCtlReg, AcpiEnBit);
|
|
}
|
|
|
|
mAcpiTimerIoAddr = (PciRead32 (Pmba) & ~PMBA_RTE) + ACPI_TIMER_OFFSET;
|
|
return RETURN_SUCCESS;
|
|
}
|
|
|
|
/**
|
|
Internal function to read the current tick counter of ACPI.
|
|
|
|
Read the current ACPI tick counter using the counter address cached
|
|
by this instance's constructor.
|
|
|
|
@return The tick counter read.
|
|
|
|
**/
|
|
UINT32
|
|
InternalAcpiGetTimerTick (
|
|
VOID
|
|
)
|
|
{
|
|
//
|
|
// Return the current ACPI timer value.
|
|
//
|
|
return IoRead32 (mAcpiTimerIoAddr);
|
|
}
|