From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41359) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z27Dt-0003rP-NH for qemu-devel@nongnu.org; Mon, 08 Jun 2015 20:16:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z27Do-0005AP-IN for qemu-devel@nongnu.org; Mon, 08 Jun 2015 20:16:57 -0400 Received: from mail-qg0-x22c.google.com ([2607:f8b0:400d:c04::22c]:35509) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z27Do-0005AG-Dq for qemu-devel@nongnu.org; Mon, 08 Jun 2015 20:16:52 -0400 Received: by qgg3 with SMTP id 3so1033961qgg.2 for ; Mon, 08 Jun 2015 17:16:52 -0700 (PDT) From: Paulo Alcantara Date: Mon, 8 Jun 2015 21:16:13 -0300 Message-Id: <1433808974-28459-1-git-send-email-pcacjr@zytor.com> Subject: [Qemu-devel] [PATCH v5 1/2] OvmfPkg/PlatformPei: Query Host Bridge DID only once List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: edk2-devel@lists.sourceforge.net Cc: mst@redhat.com, jordan.l.justen@intel.com, qemu-devel@nongnu.org, Paulo Alcantara , pbonzini@redhat.com, lersek@redhat.com Make HostBridgeDevId global so MemMapInitialization() can also use it to conditionally add RCRB MMIO address to HOB. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Paulo Alcantara --- OvmfPkg/PlatformPei/Platform.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/OvmfPkg/PlatformPei/Platform.c b/OvmfPkg/PlatformPei/Platform.c index 1126c65..0e41d30 100644 --- a/OvmfPkg/PlatformPei/Platform.c +++ b/OvmfPkg/PlatformPei/Platform.c @@ -61,6 +61,8 @@ EFI_PEI_PPI_DESCRIPTOR mPpiBootMode[] = { }; +UINT16 mHostBridgeDevId; + EFI_BOOT_MODE mBootMode = BOOT_WITH_FULL_CONFIGURATION; BOOLEAN mS3Supported = FALSE; @@ -229,7 +231,6 @@ MiscInitialization ( VOID ) { - UINT16 HostBridgeDevId; UINTN PmCmd; UINTN Pmba; UINTN AcpiCtlReg; @@ -246,10 +247,9 @@ MiscInitialization ( BuildCpuHob (36, 16); // - // Query Host Bridge DID to determine platform type and save to PCD + // Determine platform type and save Host Bridge DID to PCD // - HostBridgeDevId = PciRead16 (OVMF_HOSTBRIDGE_DID); - switch (HostBridgeDevId) { + switch (mHostBridgeDevId) { case INTEL_82441_DEVICE_ID: PmCmd = POWER_MGMT_REGISTER_PIIX4 (PCI_COMMAND_OFFSET); Pmba = POWER_MGMT_REGISTER_PIIX4 (PIIX4_PMBA); @@ -264,11 +264,11 @@ MiscInitialization ( break; default: DEBUG ((EFI_D_ERROR, "%a: Unknown Host Bridge Device ID: 0x%04x\n", - __FUNCTION__, HostBridgeDevId)); + __FUNCTION__, mHostBridgeDevId)); ASSERT (FALSE); return; } - PcdSet16 (PcdOvmfHostBridgePciDevId, HostBridgeDevId); + PcdSet16 (PcdOvmfHostBridgePciDevId, mHostBridgeDevId); // // If the appropriate IOspace enable bit is set, assume the ACPI PMBA @@ -400,6 +400,11 @@ InitializePlatform ( InitializeXen (); } + // + // Query Host Bridge DID + // + mHostBridgeDevId = PciRead16 (OVMF_HOSTBRIDGE_DID); + if (mBootMode != BOOT_ON_S3_RESUME) { ReserveEmuVariableNvStore (); -- 2.1.0