From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=162.221.156.55; helo=smtp03.citrix.com; envelope-from=prvs=95947cb43=igor.druzhinin@citrix.com; receiver=edk2-devel@lists.01.org Received: from SMTP03.CITRIX.COM (smtp03.citrix.com [162.221.156.55]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id C860121A07095 for ; Mon, 4 Mar 2019 07:04:21 -0800 (PST) X-IronPort-AV: E=Sophos;i="5.58,440,1544486400"; d="scan'208";a="79599631" From: Igor Druzhinin To: CC: , , , , , Igor Druzhinin Date: Mon, 4 Mar 2019 15:04:08 +0000 Message-ID: <1551711848-22470-4-git-send-email-igor.druzhinin@citrix.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1551711848-22470-1-git-send-email-igor.druzhinin@citrix.com> References: <1551711848-22470-1-git-send-email-igor.druzhinin@citrix.com> MIME-Version: 1.0 Subject: [PATCH 3/3] OvmfPkg/XenSupport: turn off address decoding before BAR sizing X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Mar 2019 15:04:22 -0000 Content-Type: text/plain On Xen, hvmloader firmware leaves address decoding enabled for enumerated PCI device before jumping into OVMF. OVMF seems to expect it to be disabled and tries to size PCI BARs in several places without disabling it which causes BAR64, for example, being incorrectly placed by QEMU. Fix it by disabling PCI address decoding explicitly before the first attempt to size BARs on Xen. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Igor Druzhinin --- OvmfPkg/Library/PciHostBridgeLib/XenSupport.c | 34 +++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/OvmfPkg/Library/PciHostBridgeLib/XenSupport.c b/OvmfPkg/Library/PciHostBridgeLib/XenSupport.c index 408fb24..9940335 100644 --- a/OvmfPkg/Library/PciHostBridgeLib/XenSupport.c +++ b/OvmfPkg/Library/PciHostBridgeLib/XenSupport.c @@ -55,6 +55,33 @@ PcatPciRootBridgeBarExisted ( EnableInterrupts (); } +#define EFI_PCI_COMMAND_DECODE ((UINT16)(EFI_PCI_COMMAND_IO_SPACE | \ + EFI_PCI_COMMAND_MEMORY_SPACE)) +STATIC +VOID +PcatPciRootBridgeDecoding ( + IN UINTN Address, + IN BOOLEAN Enabled, + OUT UINT16 *OriginalValue + ) +{ + UINT16 Value; + + // + // Preserve the original value + // + Value = *OriginalValue; + *OriginalValue = PciRead16 (Address); + + if (!Enabled) { + if (*OriginalValue & EFI_PCI_COMMAND_DECODE) + PciWrite16 (Address, *OriginalValue & ~EFI_PCI_COMMAND_DECODE); + } else { + if (Value & EFI_PCI_COMMAND_DECODE) + PciWrite16 (Address, Value); + } +} + STATIC VOID PcatPciRootBridgeParseBars ( @@ -76,6 +103,7 @@ PcatPciRootBridgeParseBars ( UINT32 Value; UINT32 OriginalUpperValue; UINT32 UpperValue; + UINT16 OriginalCommand; UINT64 Mask; UINTN Offset; UINT64 Base; @@ -83,6 +111,12 @@ PcatPciRootBridgeParseBars ( UINT64 Limit; PCI_ROOT_BRIDGE_APERTURE *MemAperture; + // Disable address decoding for every device before OVMF starts sizing it + PcatPciRootBridgeDecoding ( + PCI_LIB_ADDRESS (Bus, Device, Function, PCI_COMMAND_OFFSET), + FALSE, &OriginalCommand + ); + for (Offset = BarOffsetBase; Offset < BarOffsetEnd; Offset += sizeof (UINT32)) { PcatPciRootBridgeBarExisted ( PCI_LIB_ADDRESS (Bus, Device, Function, Offset), -- 2.7.4