From nobody Mon Feb 9 16:50:54 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+75705+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+75705+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1622062245; cv=none; d=zohomail.com; s=zohoarc; b=bdzkU+4TSWFSdJTO29FGmAto5FNPt5ascAlVjd5JkazZlQ8XJl8agtzaTtoWejbkPvC+cZ39gaQCZLM1SQT6oVNuHAQt9N2IuvgzN+qRRenAB8+5BgRbDvgSy7Mdd6bCRYlQHB+N0sRxusjKOqhruFYejbgnQkagdyCCKM6x1p8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1622062245; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=NZXAhdo0oDN4Lkna41NCabYfeXWcfj6D2vZoV6AUSGI=; b=ahKA90sKdcjiKiFPC7mW+MEF2hs+G1T/RQ/eeYd5LBU73yvXwQCyBptsFbGPAa+GoPpXg/BHi73PCcYsluSb05+3U7W3BWN1lOwcrF3C/C0dIjbnSpaMC3hQ8bcAuimD/JdoEz0HVdfpK3tTrJNCFxTU8r9J1FtfmU5cW/PtQig= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+75705+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1622062245442968.7954222566872; Wed, 26 May 2021 13:50:45 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id 7AtwYY1788612xgDW6MIZrzv; Wed, 26 May 2021 13:50:45 -0700 X-Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.groups.io with SMTP id smtpd.web09.3336.1622062239538801274 for ; Wed, 26 May 2021 13:50:39 -0700 X-Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-479-UaLK6LHhPK6Prmv-PaATVg-1; Wed, 26 May 2021 16:50:35 -0400 X-MC-Unique: UaLK6LHhPK6Prmv-PaATVg-1 X-Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B756B106BB24; Wed, 26 May 2021 20:50:33 +0000 (UTC) X-Received: from lacos-laptop-7.usersys.redhat.com (ovpn-114-61.ams2.redhat.com [10.36.114.61]) by smtp.corp.redhat.com (Postfix) with ESMTP id EA1345044D; Wed, 26 May 2021 20:50:31 +0000 (UTC) From: "Laszlo Ersek" To: devel@edk2.groups.io Cc: Anthony Perard , Ard Biesheuvel , Jordan Justen , Julien Grall , Peter Grehan , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Rebecca Cran Subject: [edk2-devel] [PATCH 34/43] OvmfPkg/PciHostBridgeLibScan: remove PcdOvmfHostBridgePciDevId Date: Wed, 26 May 2021 22:14:37 +0200 Message-Id: <20210526201446.12554-35-lersek@redhat.com> In-Reply-To: <20210526201446.12554-1-lersek@redhat.com> References: <20210526201446.12554-1-lersek@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,lersek@redhat.com X-Gm-Message-State: Ysq4hJv2XXVvBr5obwHvvGHUx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1622062245; bh=NZXAhdo0oDN4Lkna41NCabYfeXWcfj6D2vZoV6AUSGI=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=LSfFSsVz8BCPKKwjoojXKLgoDyGNQionbLxQmvQ2/XUs2AyE/gLQ/SMEgBKwnZ2uv5c QGtEz3PQF0U04fZrjvHhUyBczO2dhzA6PjuXY4eBXtbLBSI245/w4hSYQcS9xCdb7ExEi yeujTDKbbLEwGb+6yE/uwcuBnCQjWRGJQsU= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" The "OvmfPkg/Library/PciHostBridgeLibScan/PciHostBridgeLibScan.inf" instance is used in the following platforms in edk2: OvmfPkg/Bhyve/BhyveX64.dsc OvmfPkg/OvmfXen.dsc Neither Bhyve nor Xen provide a Q35 board, therefore the expression PcdGet16 (PcdOvmfHostBridgePciDevId) !=3D INTEL_Q35_MCH_DEVICE_ID always evaluates to TRUE, in the PciHostBridgeLibScan instance. Replace the expression with constant TRUE, eliminating the PCD dependency. (In effect, this reports that the root bridge being registered does not support extended PCI config space.) Cc: Anthony Perard Cc: Ard Biesheuvel Cc: Jordan Justen Cc: Julien Grall Cc: Peter Grehan Cc: Philippe Mathieu-Daud=C3=A9 Cc: Rebecca Cran Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3D2122 Signed-off-by: Laszlo Ersek Reviewed-by: Philippe Mathieu-Daude --- OvmfPkg/Library/PciHostBridgeLibScan/PciHostBridgeLibScan.inf | 4 ---- OvmfPkg/Library/PciHostBridgeLibScan/XenSupport.c | 4 +--- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/OvmfPkg/Library/PciHostBridgeLibScan/PciHostBridgeLibScan.inf = b/OvmfPkg/Library/PciHostBridgeLibScan/PciHostBridgeLibScan.inf index 1ba880be6782..199db4cbbd19 100644 --- a/OvmfPkg/Library/PciHostBridgeLibScan/PciHostBridgeLibScan.inf +++ b/OvmfPkg/Library/PciHostBridgeLibScan/PciHostBridgeLibScan.inf @@ -36,12 +36,8 @@ [Packages] =20 [LibraryClasses] BaseLib BaseMemoryLib DebugLib MemoryAllocationLib - PcdLib PciHostBridgeUtilityLib PciLib - -[Pcd] - gUefiOvmfPkgTokenSpaceGuid.PcdOvmfHostBridgePciDevId diff --git a/OvmfPkg/Library/PciHostBridgeLibScan/XenSupport.c b/OvmfPkg/Li= brary/PciHostBridgeLibScan/XenSupport.c index a4a61e5836e0..edf993e82dcc 100644 --- a/OvmfPkg/Library/PciHostBridgeLibScan/XenSupport.c +++ b/OvmfPkg/Library/PciHostBridgeLibScan/XenSupport.c @@ -6,18 +6,16 @@ =20 SPDX-License-Identifier: BSD-2-Clause-Patent =20 **/ =20 #include // EFI_PCI_COMMAND_IO_SPACE -#include // INTEL_Q35_MCH_DEVICE_ID #include // DisableInterrupts() #include // ZeroMem() #include // ASSERT() #include // ReallocatePool() -#include // PcdGet16() #include // PCI_ROOT_BRIDGE_APERTURE #include // PciHostBridgeUtilityInitRo= ot... #include // PciRead32() #include // EFI_PCI_ATTRIBUTE_ISA_IO =20 #include "PciHostBridge.h" @@ -452,13 +450,13 @@ ScanForRootBridges ( (*NumberOfRootBridges + 1) * sizeof (PCI_ROOT_BRIDGE), RootBridges ); ASSERT (RootBridges !=3D NULL); PciHostBridgeUtilityInitRootBridge ( Attributes, Attributes, 0, - FALSE, PcdGet16 (PcdOvmfHostBridgePciDevId) !=3D INTEL_Q35_MCH_DEV= ICE_ID, + FALSE, TRUE /* NoExtendedConfigSpace */, (UINT8) PrimaryBus, (UINT8) SubBus, &Io, &Mem, &MemAbove4G, &mNonExistAperture, &mNonExistAperture, &RootBridges[*NumberOfRootBridges] ); RootBridges[*NumberOfRootBridges].ResourceAssigned =3D TRUE; // --=20 2.19.1.3.g30247aa5d201 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#75705): https://edk2.groups.io/g/devel/message/75705 Mute This Topic: https://groups.io/mt/83111024/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-