e2ab3f819f
On PIIX4, function 3, the PMREGMISC register at offset 0x80, with default value 0x00 has its bit 0 (PMIOSE) indicate whether the PM IO space given in the PMBA register (offset 0x40) is enabled. PMBA must be configured *before* setting this bit. On Q35/ICH9+, function 0x1f, the equivalent role is fulfilled by bit 7 (ACPI_EN) in the ACPI Control Register (ACPI_CNTL) at offset 0x44, also with a default value of 0x00. Currently, OVMF hangs when Q35 reboots, because while PMBA is reset by QEMU, the register at offset 0x80 (matching PMREGMISC on PIIX4) is not reset, since it has a completely different meaning on LPC. As such, the power management initialization logic in OVMF finds the "PMIOSE" bit enabled after a reboot and decides to skip setting PMBA. This causes the ACPI timer tick routine to read a constant value from the wrong register, which in turn causes the ACPI delay loop to hang indefinitely. This patch modifies the Base[Rom]AcpiTimerLib constructors and the PlatformPei ACPI PM init routines to use ACPI_CNTL:ACPI_EN instead of PMREGMISC:PMIOSE when running on Q35. Reported-by: Reza Jelveh <reza.jelveh@tuhh.de> Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Gabriel Somlo <somlo@cmu.edu> Reviewed-by: Laszlo Ersek <lersek@redhat.com> Reviewed-by: Jordan Justen <jordan.l.justen@intel.com> Tested-by: Laszlo Ersek <lersek@redhat.com> git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17076 6f19259b-4bc3-4df7-8a09-765794883524
118 lines
3.0 KiB
C
118 lines
3.0 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 <Library/PcdLib.h>
|
|
#include <OvmfPlatforms.h>
|
|
|
|
//
|
|
// Power Management PCI Configuration Register fields
|
|
//
|
|
#define PMBA_RTE BIT0
|
|
#define PIIX4_PMIOSE BIT0
|
|
#define Q35_ACPI_EN BIT7
|
|
|
|
//
|
|
// Offset in the Power Management Base Address to the ACPI Timer
|
|
//
|
|
#define ACPI_TIMER_OFFSET 0x8
|
|
|
|
//
|
|
// 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;
|
|
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 (0x40);
|
|
AcpiCtlReg = POWER_MGMT_REGISTER_PIIX4 (0x80); // PMREGMISC
|
|
AcpiEnBit = PIIX4_PMIOSE;
|
|
break;
|
|
case INTEL_Q35_MCH_DEVICE_ID:
|
|
Pmba = POWER_MGMT_REGISTER_Q35 (0x40);
|
|
AcpiCtlReg = POWER_MGMT_REGISTER_Q35 (0x44); // ACPI_CNTL
|
|
AcpiEnBit = Q35_ACPI_EN;
|
|
break;
|
|
default:
|
|
DEBUG ((EFI_D_ERROR, "%a: Unknown Host Bridge Device ID: 0x%04x\n",
|
|
__FUNCTION__, HostBridgeDevId));
|
|
ASSERT (FALSE);
|
|
return RETURN_UNSUPPORTED;
|
|
}
|
|
|
|
mAcpiTimerIoAddr = (PciRead32 (Pmba) & ~PMBA_RTE) + ACPI_TIMER_OFFSET;
|
|
|
|
//
|
|
// 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 the Power Management Base Address from a PCD.
|
|
//
|
|
PciAndThenOr32 (Pmba, (UINT32) ~0xFFC0, PcdGet16 (PcdAcpiPmBaseAddress));
|
|
|
|
//
|
|
// Enable PMBA I/O port decodes
|
|
//
|
|
PciOr8 (AcpiCtlReg, AcpiEnBit);
|
|
}
|
|
|
|
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);
|
|
}
|