From patchwork Tue Apr 9 03:12:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Druzhinin X-Patchwork-Id: 10890439 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C14F013B5 for ; Tue, 9 Apr 2019 03:14:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A8C4E26AE3 for ; Tue, 9 Apr 2019 03:14:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9CF0C286A1; Tue, 9 Apr 2019 03:14:49 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 1276826AE3 for ; Tue, 9 Apr 2019 03:14:49 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hDhBy-0006lO-DZ; Tue, 09 Apr 2019 03:12:58 +0000 Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hDhBw-0006l0-Ps for xen-devel@lists.xenproject.org; Tue, 09 Apr 2019 03:12:56 +0000 X-Inumbo-ID: 5eb50e31-5a75-11e9-92d7-bc764e045a96 Received: from SMTP03.CITRIX.COM (unknown [162.221.156.55]) by us1-rack-dfw2.inumbo.com (Halon) with ESMTPS id 5eb50e31-5a75-11e9-92d7-bc764e045a96; Tue, 09 Apr 2019 03:12:55 +0000 (UTC) X-IronPort-AV: E=Sophos;i="5.60,327,1549929600"; d="scan'208";a="83070518" From: Igor Druzhinin To: Date: Tue, 9 Apr 2019 04:12:40 +0100 Message-ID: <1554779560-26204-4-git-send-email-igor.druzhinin@citrix.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1554779560-26204-1-git-send-email-igor.druzhinin@citrix.com> References: <1554779560-26204-1-git-send-email-igor.druzhinin@citrix.com> MIME-Version: 1.0 Subject: [Xen-devel] [PATCH v2 3/3] OvmfPkg/XenSupport: turn off address decoding before BAR sizing X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Igor Druzhinin , ard.biesheuvel@linaro.org, jordan.l.justen@intel.com, julien.grall@arm.com, anthony.perard@citrix.com, xen-devel@lists.xenproject.org, lersek@redhat.com Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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 --- Changes in v2: * coding style issues and minor suggestions --- OvmfPkg/Library/PciHostBridgeLib/XenSupport.c | 35 +++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/OvmfPkg/Library/PciHostBridgeLib/XenSupport.c b/OvmfPkg/Library/PciHostBridgeLib/XenSupport.c index f763134..67a37cd 100644 --- a/OvmfPkg/Library/PciHostBridgeLib/XenSupport.c +++ b/OvmfPkg/Library/PciHostBridgeLib/XenSupport.c @@ -55,6 +55,35 @@ PcatPciRootBridgeBarExisted ( EnableInterrupts (); } +#define 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 & PCI_COMMAND_DECODE) { + PciWrite16 (Address, *OriginalValue & ~PCI_COMMAND_DECODE); + } + } else { + if (Value & PCI_COMMAND_DECODE) { + PciWrite16 (Address, Value); + } + } +} + STATIC VOID PcatPciRootBridgeParseBars ( @@ -81,6 +110,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, (UINT16 *)&OriginalValue + ); + for (Offset = BarOffsetBase; Offset < BarOffsetEnd; Offset += sizeof (UINT32)) { PcatPciRootBridgeBarExisted ( PCI_LIB_ADDRESS (Bus, Device, Function, Offset),