From mboxrd@z Thu Jan 1 00:00:00 1970 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.web08.27652.1611149654620742069 for ; Wed, 20 Jan 2021 05:34:14 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=TYLrX/gl; spf=pass (domain: redhat.com, ip: 216.205.24.124, mailfrom: lersek@redhat.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1611149653; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=1PM9hiSDe8NFISOantpSQwxBCwwHlInkO8aOT7c3xJU=; b=TYLrX/glA47vuv92cNXqbQuMDWfxerKzKpsfAf3AG0BjE532l7ZsnzhfbSm1ifEBND1xNa LG1oCgUf2FWP97J1riEwC8hxuEEougrZDIlV/69yQ0Qo5kSZ5OB1BL8+aV9tQJUbyj8ng2 zOmVga0TrsQWCy9txpC8ysf/s/p9SLI= 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-215-DJzLW5EzOT-4NDxJRrmh9g-1; Wed, 20 Jan 2021 08:34:11 -0500 X-MC-Unique: DJzLW5EzOT-4NDxJRrmh9g-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2B7348030A0; Wed, 20 Jan 2021 13:34:09 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (ovpn-115-96.ams2.redhat.com [10.36.115.96]) by smtp.corp.redhat.com (Postfix) with ESMTP id 27D345C8A7; Wed, 20 Jan 2021 13:34:05 +0000 (UTC) Subject: Re: [edk2-devel] [PATCH v6 08/11] OvmfPkg/PciHostBridgeUtilityLib: Extend parameter list of GetRootBridges To: devel@edk2.groups.io, cenjiahui@huawei.com Cc: Jordan Justen , Ard Biesheuvel , Rebecca Cran , Peter Grehan , Anthony Perard , Julien Grall , Leif Lindholm , Sami Mujawar , xieyingtai@huawei.com, wu.wubin@huawei.com, Yubo Miao References: <20210119011302.10908-1-cenjiahui@huawei.com> <20210119011302.10908-9-cenjiahui@huawei.com> From: "Laszlo Ersek" Message-ID: Date: Wed, 20 Jan 2021 14:34:05 +0100 MIME-Version: 1.0 In-Reply-To: <20210119011302.10908-9-cenjiahui@huawei.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=lersek@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit On 01/19/21 02:12, Jiahui Cen via groups.io wrote: > Extend parameter list of PciHostBridgeUtilityGetRootBridges() with > DmaAbove4G, NoExtendedConfigSpace to support for ArmVirtPkg. > > BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3059 > > Cc: Jordan Justen > Cc: Laszlo Ersek > Cc: Ard Biesheuvel > Signed-off-by: Jiahui Cen > Signed-off-by: Yubo Miao > --- > OvmfPkg/Library/PciHostBridgeUtilityLib/PciHostBridgeUtilityLib.inf | 4 --- > OvmfPkg/Include/Library/PciHostBridgeUtilityLib.h | 24 ++++++++------ > OvmfPkg/Library/PciHostBridgeLib/PciHostBridgeLib.c | 5 +++ > OvmfPkg/Library/PciHostBridgeUtilityLib/PciHostBridgeUtilityLib.c | 34 +++++++++++--------- > 4 files changed, 39 insertions(+), 28 deletions(-) > > diff --git a/OvmfPkg/Library/PciHostBridgeUtilityLib/PciHostBridgeUtilityLib.inf b/OvmfPkg/Library/PciHostBridgeUtilityLib/PciHostBridgeUtilityLib.inf > index fdae8cfe872e..83a734c1725e 100644 > --- a/OvmfPkg/Library/PciHostBridgeUtilityLib/PciHostBridgeUtilityLib.inf > +++ b/OvmfPkg/Library/PciHostBridgeUtilityLib/PciHostBridgeUtilityLib.inf > @@ -39,9 +39,5 @@ [LibraryClasses] > DebugLib > DevicePathLib > MemoryAllocationLib > - PcdLib > PciLib > QemuFwCfgLib > - > -[Pcd] > - gUefiOvmfPkgTokenSpaceGuid.PcdOvmfHostBridgePciDevId > diff --git a/OvmfPkg/Include/Library/PciHostBridgeUtilityLib.h b/OvmfPkg/Include/Library/PciHostBridgeUtilityLib.h > index 2b7d5d3725c3..a0ea44d96a67 100644 > --- a/OvmfPkg/Include/Library/PciHostBridgeUtilityLib.h > +++ b/OvmfPkg/Include/Library/PciHostBridgeUtilityLib.h > @@ -102,23 +102,27 @@ PciHostBridgeUtilityUninitRootBridge ( > /** > Utility function to return all the root bridge instances in an array. > > - @param[out] Count The number of root bridge instances. > + @param[out] Count The number of root bridge instances. > > - @param[in] Attributes Initial attributes. > + @param[in] Attributes Initial attributes. > > - @param[in] AllocAttributes Allocation attributes. > + @param[in] AllocAttributes Allocation attributes. > > - @param[in] Io IO aperture. > + @param[in] DmaAbove4G DMA above 4GB memory. > > - @param[in] Mem MMIO aperture. > + @param[in] NoExtendedConfigSpace No Extended Config Space. > > - @param[in] MemAbove4G MMIO aperture above 4G. > + @param[in] Io IO aperture. > > - @param[in] PMem Prefetchable MMIO aperture. > + @param[in] Mem MMIO aperture. > > - @param[in] PMemAbove4G Prefetchable MMIO aperture above 4G. > + @param[in] MemAbove4G MMIO aperture above 4G. > > - @return All the root bridge instances in an array. > + @param[in] PMem Prefetchable MMIO aperture. > + > + @param[in] PMemAbove4G Prefetchable MMIO aperture above 4G. > + > + @return All the root bridge instances in an array. > **/ > PCI_ROOT_BRIDGE * > EFIAPI > @@ -126,6 +130,8 @@ PciHostBridgeUtilityGetRootBridges ( > OUT UINTN *Count, > IN UINT64 Attributes, > IN UINT64 AllocationAttributes, > + IN BOOLEAN DmaAbove4G, > + IN BOOLEAN NoExtendedConfigSpace, > IN PCI_ROOT_BRIDGE_APERTURE *Io, > IN PCI_ROOT_BRIDGE_APERTURE *Mem, > IN PCI_ROOT_BRIDGE_APERTURE *MemAbove4G, > diff --git a/OvmfPkg/Library/PciHostBridgeLib/PciHostBridgeLib.c b/OvmfPkg/Library/PciHostBridgeLib/PciHostBridgeLib.c > index 6ac41ff853a9..91b9e6baa1e8 100644 > --- a/OvmfPkg/Library/PciHostBridgeLib/PciHostBridgeLib.c > +++ b/OvmfPkg/Library/PciHostBridgeLib/PciHostBridgeLib.c > @@ -9,6 +9,9 @@ > **/ > #include > > +#include (1) This #include directive does not belong in this patch. It is needed in the next patch in the series (i.e., #9), where a reference to PCI_MAX_BUS is added to this source file. IOW, you didn't split patch v4 7/9 entirely correctly. I guess I'm too tired to obsess about this though. Reviewed-by: Laszlo Ersek Laszlo > +#include > + > #include > #include > > @@ -80,6 +83,8 @@ PciHostBridgeGetRootBridges ( > Count, > Attributes, > AllocationAttributes, > + FALSE, > + PcdGet16 (PcdOvmfHostBridgePciDevId) != INTEL_Q35_MCH_DEVICE_ID, > &Io, > &Mem, > &MemAbove4G, > diff --git a/OvmfPkg/Library/PciHostBridgeUtilityLib/PciHostBridgeUtilityLib.c b/OvmfPkg/Library/PciHostBridgeUtilityLib/PciHostBridgeUtilityLib.c > index b1e74a469d50..1d78984b83ad 100644 > --- a/OvmfPkg/Library/PciHostBridgeUtilityLib/PciHostBridgeUtilityLib.c > +++ b/OvmfPkg/Library/PciHostBridgeUtilityLib/PciHostBridgeUtilityLib.c > @@ -12,12 +12,10 @@ > > #include > #include > -#include > #include > #include > #include > #include > -#include > #include > #include > #include > @@ -192,23 +190,27 @@ PciHostBridgeUtilityUninitRootBridge ( > /** > Utility function to return all the root bridge instances in an array. > > - @param[out] Count The number of root bridge instances. > + @param[out] Count The number of root bridge instances. > > - @param[in] Attributes Initial attributes. > + @param[in] Attributes Initial attributes. > > - @param[in] AllocAttributes Allocation attributes. > + @param[in] AllocAttributes Allocation attributes. > > - @param[in] Io IO aperture. > + @param[in] DmaAbove4G DMA above 4GB memory. > > - @param[in] Mem MMIO aperture. > + @param[in] NoExtendedConfigSpace No Extended Config Space. > > - @param[in] MemAbove4G MMIO aperture above 4G. > + @param[in] Io IO aperture. > > - @param[in] PMem Prefetchable MMIO aperture. > + @param[in] Mem MMIO aperture. > > - @param[in] PMemAbove4G Prefetchable MMIO aperture above 4G. > + @param[in] MemAbove4G MMIO aperture above 4G. > > - @return All the root bridge instances in an array. > + @param[in] PMem Prefetchable MMIO aperture. > + > + @param[in] PMemAbove4G Prefetchable MMIO aperture above 4G. > + > + @return All the root bridge instances in an array. > **/ > PCI_ROOT_BRIDGE * > EFIAPI > @@ -216,6 +218,8 @@ PciHostBridgeUtilityGetRootBridges ( > OUT UINTN *Count, > IN UINT64 Attributes, > IN UINT64 AllocationAttributes, > + IN BOOLEAN DmaAbove4G, > + IN BOOLEAN NoExtendedConfigSpace, > IN PCI_ROOT_BRIDGE_APERTURE *Io, > IN PCI_ROOT_BRIDGE_APERTURE *Mem, > IN PCI_ROOT_BRIDGE_APERTURE *MemAbove4G, > @@ -295,8 +299,8 @@ PciHostBridgeUtilityGetRootBridges ( > Attributes, > Attributes, > AllocationAttributes, > - FALSE, > - PcdGet16 (PcdOvmfHostBridgePciDevId) != INTEL_Q35_MCH_DEVICE_ID, > + DmaAbove4G, > + NoExtendedConfigSpace, > (UINT8) LastRootBridgeNumber, > (UINT8) (RootBridgeNumber - 1), > Io, > @@ -322,8 +326,8 @@ PciHostBridgeUtilityGetRootBridges ( > Attributes, > Attributes, > AllocationAttributes, > - FALSE, > - PcdGet16 (PcdOvmfHostBridgePciDevId) != INTEL_Q35_MCH_DEVICE_ID, > + DmaAbove4G, > + NoExtendedConfigSpace, > (UINT8) LastRootBridgeNumber, > PCI_MAX_BUS, > Io, >