tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

OvmfPkg: AcpiPlatformDxe: when PCI is enabled, wait for Platform BDS's cue 

This patch doesn't change the behavior of AcpiPlatformDxe when
PcdPciDisableBusEnumeration is TRUE -- that is, when the driver runs on
Xen (OvmfPkg and ArmVirtPkg both), or when the driver runs on QEMU as part
of ArmVirtPkg but no PCI host bridge was found by VirtFdtDxe. In these
cases the driver continues to install the ACPI tables immediately.

However, when PcdPciDisableBusEnumeration is FALSE (i.e., when the driver
runs on QEMU as part of OVMF, or as part of ArmVirtPkg and VirtFdtDxe
finds a PCI host bridge), we now delay the ACPI table download from QEMU.
We wait until the Platform BDS tells us that root bridges have been
connected, and PciIo instances are available.

The explanation is in the patch titled

  OvmfPkg: introduce gRootBridgesConnectedEventGroupGuid

Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
This commit is contained in:
Laszlo Ersek 2016-03-13 18:09:57 +01:00
parent 158990b941
commit b6bc800d5a
3 changed files with 18 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OvmfPkg/AcpiPlatformDxe/AcpiPlatformDxe.inf
View File

@ -57,10 +57,10 @@
[Protocols]
gEfiAcpiTableProtocolGuid # PROTOCOL ALWAYS_CONSUMED
gEfiPciEnumerationCompleteProtocolGuid # PROTOCOL SOMETIMES_CONSUMED
[Guids]
gEfiXenInfoGuid
gRootBridgesConnectedEventGroupGuid
[Pcd]
gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiTableStorageFile

48
OvmfPkg/AcpiPlatformDxe/EntryPoint.c
View File

@ -13,7 +13,7 @@
WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
**/
#include <Protocol/PciEnumerationComplete.h>
#include <Guid/RootBridgesConnectedEventGroup.h>
#include "AcpiPlatform.h"
STATIC
@ -38,14 +38,15 @@ FindAcpiTableProtocol (
STATIC
VOID
EFIAPI
OnPciEnumerated (
OnRootBridgesConnected (
IN EFI_EVENT Event,
IN VOID *Context
)
{
EFI_STATUS Status;
DEBUG ((EFI_D_INFO, "%a: PCI enumeration complete, installing ACPI tables\n",
DEBUG ((EFI_D_INFO,
"%a: root bridges have been connected, installing ACPI tables\n",
__FUNCTION__));
Status = InstallAcpiTables (FindAcpiTableProtocol ());
if (EFI_ERROR (Status)) {
@ -63,9 +64,7 @@ AcpiPlatformEntryPoint (
)
{
EFI_STATUS Status;
VOID *Interface;
EFI_EVENT PciEnumerated;
VOID *Registration;
EFI_EVENT RootBridgesConnected;
//
// If the platform doesn't support PCI, or PCI enumeration has been disabled,
@ -79,36 +78,17 @@ AcpiPlatformEntryPoint (
}
//
// Similarly, if PCI enumeration has already completed, install the tables
// immediately.
// Otherwise, delay installing the ACPI tables until root bridges are
// connected. The entry point's return status will only reflect the callback
// setup. (Note that we're a DXE_DRIVER; our entry point function is invoked
// strictly before BDS is entered and can connect the root bridges.)
//
Status = gBS->LocateProtocol (&gEfiPciEnumerationCompleteProtocolGuid,
NULL /* Registration */, &Interface);
Status = gBS->CreateEventEx (EVT_NOTIFY_SIGNAL, TPL_CALLBACK,
OnRootBridgesConnected, NULL /* Context */,
&gRootBridgesConnectedEventGroupGuid, &RootBridgesConnected);
if (!EFI_ERROR (Status)) {
DEBUG ((EFI_D_INFO, "%a: PCI enumeration already complete, "
"installing ACPI tables\n", __FUNCTION__));
return InstallAcpiTables (FindAcpiTableProtocol ());
}
ASSERT (Status == EFI_NOT_FOUND);
//
// Otherwise, delay installing the ACPI tables until PCI enumeration
// completes. The entry point's return status will only reflect the callback
// setup.
//
Status = gBS->CreateEvent (EVT_NOTIFY_SIGNAL, TPL_CALLBACK, OnPciEnumerated,
NULL /* Context */, &PciEnumerated);
if (EFI_ERROR (Status)) {
return Status;
}
Status = gBS->RegisterProtocolNotify (
&gEfiPciEnumerationCompleteProtocolGuid, PciEnumerated,
&Registration);
if (EFI_ERROR (Status)) {
gBS->CloseEvent (PciEnumerated);
} else {
DEBUG ((EFI_D_INFO, "%a: PCI enumeration pending, registered callback\n",
DEBUG ((EFI_D_INFO,
"%a: waiting for root bridges to be connected, registered callback\n",
__FUNCTION__));
}

4
OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpiPlatformDxe.inf
View File

@ -47,7 +47,9 @@
[Protocols]
gEfiAcpiTableProtocolGuid # PROTOCOL ALWAYS_CONSUMED
gEfiPciEnumerationCompleteProtocolGuid # PROTOCOL SOMETIMES_CONSUMED
[Guids]
gRootBridgesConnectedEventGroupGuid
[Pcd]
gEfiMdeModulePkgTokenSpaceGuid.PcdPciDisableBusEnumeration