From patchwork Tue Jun 9 00:16:13 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paulo Alcantara X-Patchwork-Id: 482054 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 332B714031E for ; Tue, 9 Jun 2015 10:17:21 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=yENG40pm; dkim-atps=neutral Received: from localhost ([::1]:60668 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z27EE-0004OG-N8 for incoming@patchwork.ozlabs.org; Mon, 08 Jun 2015 20:17:18 -0400 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) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=tbrRgA8k2YXO64dtwTn/tC4feg9OhCoyv9C5fo4c0lU=; b=yENG40pmTpy9SzUl7qAmhUVwqZ883mc8m/1nnG3FAWtAk+dEXeUcvuGbM5jjhuEFrX sagKteInDNsUpvbVxOdXgPKhzKUL/NSGjfTf1xJW1ZrLAJLi6Ueyl/lj5z//yF7Zxdes nHS4arKYGCD1XYtLMS2IOb0QoJLjbWoW8QaGbL4thUgx2FVO9CH2JqpN2P3rENv5YZ+l C7j7DHapdFOOz0nKT5t5LmwhrPNCKBrgtklctREZaJhFvGArkQpS58VMxLaugOZMjcxv Z0v1h/1oERmVPfbAmgHLxA6afVrXhEj/PiRXldR/Rr95FaFudC9NAg1/swV+1DXXb4R+ wOvw== X-Received: by 10.140.36.137 with SMTP id p9mr22318872qgp.16.1433809012088; Mon, 08 Jun 2015 17:16:52 -0700 (PDT) Received: from localhost.localdomain.localdomain (187-78-33-69.user.veloxzone.com.br. [187.78.33.69]) by mx.google.com with ESMTPSA id j60sm1955158qge.38.2015.06.08.17.16.48 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 08 Jun 2015 17:16:51 -0700 (PDT) From: Paulo Alcantara X-Google-Original-From: Paulo Alcantara To: edk2-devel@lists.sourceforge.net Date: Mon, 8 Jun 2015 21:16:13 -0300 Message-Id: <1433808974-28459-1-git-send-email-pcacjr@zytor.com> X-Mailer: git-send-email 2.1.0 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400d:c04::22c Cc: mst@redhat.com, jordan.l.justen@intel.com, qemu-devel@nongnu.org, Paulo Alcantara , pbonzini@redhat.com, lersek@redhat.com Subject: [Qemu-devel] [PATCH v5 1/2] OvmfPkg/PlatformPei: Query Host Bridge DID only once X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 ();