> -----Original Message-----
> From: Schaefer, Daniel
> Sent: Wednesday, September 29, 2021 7:41 AM
> To: Chang, Abner (HPS SW/FW Technologist) <abner.ch...@hpe.com>;
> devel@edk2.groups.io
> Cc: Ard Biesheuvel <ardb+tianoc...@kernel.org>; Leif Lindholm
> <l...@nuviainc.com>; Sami Mujawar <sami.muja...@arm.com>; Jiewen Yao
> <jiewen....@intel.com>; Jordan Justen <jordan.l.jus...@intel.com>; Gerd
> Hoffmann <kra...@redhat.com>; Sunil V L <suni...@ventanamicro.com>
> Subject: Re: [edk2-devel] [PATCH V2 4/9] ArmVirtPkg/FdtPciPcdProducerLib:
> Relocate PciPcdProducerLib to OvmfPkg
>
> Oh and this also needs to be followed up with a change to edk2-platforms.
Yes, all corresponding patches on edk2-platform are all ready to send. I will
send those out once edk2 part gets reviewed-by. Then I will push those patch
sets to both repos together.
Abner
>
> On 9/29/21 07:16, Daniel Schaefer wrote:
> > Please fix the issue in the maintainers file.
> > Looks good otherwise:
> >
> > Reviewed-By: Daniel Schaefer <daniel.schae...@hpe.com>
> >
> > On 9/28/21 16:31, Abner Chang wrote:
> >> Relocate PciPcdProducerLib to OvmfPkg/Fdt, this library is
> >> leverage by both ARM and RISC-V archs.
> >>
> >> Add OvmfPkg/Fdt maintainers in Maintainers.txt
> >>
> >> Signed-off-by: Abner Chang <abner.ch...@hpe.com>
> >> Cc: Ard Biesheuvel <ardb+tianoc...@kernel.org>
> >> Cc: Leif Lindholm <l...@nuviainc.com>
> >> Cc: Sami Mujawar <sami.muja...@arm.com>
> >> Cc: Jiewen Yao <jiewen....@intel.com>
> >> Cc: Jordan Justen <jordan.l.jus...@intel.com>
> >> Cc: Gerd Hoffmann <kra...@redhat.com>
> >> Cc: Daniel Schaefer <daniel.schae...@hpe.com>
> >> Cc: Sunil V L <suni...@ventanamicro.com>
> >> ---
> >> ArmVirtPkg/ArmVirtCloudHv.dsc | 8 ++++----
> >> ArmVirtPkg/ArmVirtKvmTool.dsc | 8 ++++----
> >> ArmVirtPkg/ArmVirtQemu.dsc | 8 ++++----
> >> ArmVirtPkg/ArmVirtQemuKernel.dsc | 8 ++++----
> >> .../Fdt}/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf | 2 --
> >> .../Fdt}/FdtPciPcdProducerLib/FdtPciPcdProducerLib.c | 0
> >> Maintainers.txt | 6 ++++++
> >> 7 files changed, 22 insertions(+), 18 deletions(-)
> >> rename {ArmVirtPkg/Library =>
> OvmfPkg/Fdt}/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf (92%)
> >> rename {ArmVirtPkg/Library =>
> OvmfPkg/Fdt}/FdtPciPcdProducerLib/FdtPciPcdProducerLib.c (100%)
> >>
> >> diff --git a/ArmVirtPkg/ArmVirtCloudHv.dsc
> b/ArmVirtPkg/ArmVirtCloudHv.dsc
> >> index f159754bf4..2928b9adb5 100644
> >> --- a/ArmVirtPkg/ArmVirtCloudHv.dsc
> >> +++ b/ArmVirtPkg/ArmVirtCloudHv.dsc
> >> @@ -49,7 +49,7 @@
> >>
> FrameBufferBltLib|MdeModulePkg/Library/FrameBufferBltLib/FrameBuffer
> BltLib.inf
> >>
> QemuBootOrderLib|OvmfPkg/Library/QemuBootOrderLib/QemuBootOrder
> Lib.inf
> >>
> FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf
> >> -
> PciPcdProducerLib|ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProd
> ucerLib.inf
> >> +
> PciPcdProducerLib|OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLi
> b.inf
> >>
> PciSegmentLib|MdePkg/Library/BasePciSegmentLibPci/BasePciSegmentLibP
> ci.inf
> >>
> PciHostBridgeLib|ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeL
> ib.inf
> >>
> PciHostBridgeUtilityLib|ArmVirtPkg/Library/ArmVirtPciHostBridgeUtilityLib/A
> rmVirtPciHostBridgeUtilityLib.inf
> >> @@ -341,12 +341,12 @@
> >> #
> >> ArmPkg/Drivers/ArmPciCpuIo2Dxe/ArmPciCpuIo2Dxe.inf {
> >> <LibraryClasses>
> >> -
> NULL|ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
> >> + NULL|OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
> >> }
> >> MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf
> >> MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf {
> >> <LibraryClasses>
> >> -
> NULL|ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
> >> + NULL|OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
> >> }
> >> OvmfPkg/PciHotPlugInitDxe/PciHotPlugInit.inf
> >> OvmfPkg/VirtioPciDeviceDxe/VirtioPciDeviceDxe.inf
> >> @@ -360,5 +360,5 @@
> >>
> MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraph
> icsResourceTableDxe.inf
> >> ArmVirtPkg/CloudHvAcpiPlatformDxe/CloudHvAcpiPlatformDxe.inf {
> >> <LibraryClasses>
> >> -
> NULL|ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
> >> + NULL|OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
> >> }
> >> diff --git a/ArmVirtPkg/ArmVirtKvmTool.dsc
> b/ArmVirtPkg/ArmVirtKvmTool.dsc
> >> index ff70509542..3cc182545c 100644
> >> --- a/ArmVirtPkg/ArmVirtKvmTool.dsc
> >> +++ b/ArmVirtPkg/ArmVirtKvmTool.dsc
> >> @@ -57,7 +57,7 @@
> >>
> >>
> FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf
> >>
> >> -
> PciPcdProducerLib|ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProd
> ucerLib.inf
> >> +
> PciPcdProducerLib|OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLi
> b.inf
> >>
> PciSegmentLib|MdePkg/Library/BasePciSegmentLibPci/BasePciSegmentLibP
> ci.inf
> >>
> PciHostBridgeLib|ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeL
> ib.inf
> >>
> PciHostBridgeUtilityLib|ArmVirtPkg/Library/ArmVirtPciHostBridgeUtilityLib/A
> rmVirtPciHostBridgeUtilityLib.inf
> >> @@ -338,17 +338,17 @@
> >> #
> >> ArmPkg/Drivers/ArmPciCpuIo2Dxe/ArmPciCpuIo2Dxe.inf {
> >> <LibraryClasses>
> >> -
> NULL|ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
> >> + NULL|OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
> >>
> NULL|ArmVirtPkg/Library/BaseCachingPciExpressLib/BaseCachingPciExpress
> Lib.inf
> >> }
> >> MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf {
> >> <LibraryClasses>
> >> -
> NULL|ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
> >> + NULL|OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
> >>
> NULL|ArmVirtPkg/Library/BaseCachingPciExpressLib/BaseCachingPciExpress
> Lib.inf
> >> }
> >> MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf {
> >> <LibraryClasses>
> >> -
> NULL|ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
> >> + NULL|OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
> >>
> NULL|ArmVirtPkg/Library/BaseCachingPciExpressLib/BaseCachingPciExpress
> Lib.inf
> >> }
> >> OvmfPkg/VirtioPciDeviceDxe/VirtioPciDeviceDxe.inf
> >> diff --git a/ArmVirtPkg/ArmVirtQemu.dsc
> b/ArmVirtPkg/ArmVirtQemu.dsc
> >> index f4bb14903f..85fcf5f310 100644
> >> --- a/ArmVirtPkg/ArmVirtQemu.dsc
> >> +++ b/ArmVirtPkg/ArmVirtQemu.dsc
> >> @@ -77,7 +77,7 @@
> >>
> FrameBufferBltLib|MdeModulePkg/Library/FrameBufferBltLib/FrameBuffer
> BltLib.inf
> >>
> QemuBootOrderLib|OvmfPkg/Library/QemuBootOrderLib/QemuBootOrder
> Lib.inf
> >>
> FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf
> >> -
> PciPcdProducerLib|ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProd
> ucerLib.inf
> >> +
> PciPcdProducerLib|OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLi
> b.inf
> >>
> PciSegmentLib|MdePkg/Library/BasePciSegmentLibPci/BasePciSegmentLibP
> ci.inf
> >>
> PciHostBridgeLib|ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeL
> ib.inf
> >>
> PciHostBridgeUtilityLib|OvmfPkg/Library/PciHostBridgeUtilityLib/PciHostBrid
> geUtilityLib.inf
> >> @@ -487,12 +487,12 @@
> >> #
> >> ArmPkg/Drivers/ArmPciCpuIo2Dxe/ArmPciCpuIo2Dxe.inf {
> >> <LibraryClasses>
> >> -
> NULL|ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
> >> + NULL|OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
> >> }
> >> MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf
> >> MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf {
> >> <LibraryClasses>
> >> -
> NULL|ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
> >> + NULL|OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
> >> }
> >> OvmfPkg/PciHotPlugInitDxe/PciHotPlugInit.inf
> >> OvmfPkg/VirtioPciDeviceDxe/VirtioPciDeviceDxe.inf
> >> @@ -543,5 +543,5 @@
> >>
> MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraph
> icsResourceTableDxe.inf
> >> OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpiPlatformDxe.inf {
> >> <LibraryClasses>
> >> -
> NULL|ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
> >> + NULL|OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
> >> }
> >> diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc
> b/ArmVirtPkg/ArmVirtQemuKernel.dsc
> >> index eecef1a063..909968d13a 100644
> >> --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc
> >> +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc
> >> @@ -75,7 +75,7 @@
> >>
> FrameBufferBltLib|MdeModulePkg/Library/FrameBufferBltLib/FrameBuffer
> BltLib.inf
> >>
> QemuBootOrderLib|OvmfPkg/Library/QemuBootOrderLib/QemuBootOrder
> Lib.inf
> >>
> FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf
> >> -
> PciPcdProducerLib|ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProd
> ucerLib.inf
> >> +
> PciPcdProducerLib|OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLi
> b.inf
> >>
> PciSegmentLib|MdePkg/Library/BasePciSegmentLibPci/BasePciSegmentLibP
> ci.inf
> >>
> PciHostBridgeLib|ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeL
> ib.inf
> >>
> PciHostBridgeUtilityLib|OvmfPkg/Library/PciHostBridgeUtilityLib/PciHostBrid
> geUtilityLib.inf
> >> @@ -423,12 +423,12 @@
> >> #
> >> ArmPkg/Drivers/ArmPciCpuIo2Dxe/ArmPciCpuIo2Dxe.inf {
> >> <LibraryClasses>
> >> -
> NULL|ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
> >> + NULL|OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
> >> }
> >> MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf
> >> MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf {
> >> <LibraryClasses>
> >> -
> NULL|ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
> >> + NULL|OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
> >> }
> >> OvmfPkg/PciHotPlugInitDxe/PciHotPlugInit.inf
> >> OvmfPkg/VirtioPciDeviceDxe/VirtioPciDeviceDxe.inf
> >> @@ -459,5 +459,5 @@
> >>
> MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraph
> icsResourceTableDxe.inf
> >> OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpiPlatformDxe.inf {
> >> <LibraryClasses>
> >> -
> NULL|ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
> >> + NULL|OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
> >> }
> >> diff --git
> a/ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
> b/OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
> >> similarity index 92%
> >> rename from
> ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
> >> rename to OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
> >> index 1dfe779f6c..0f5156615b 100644
> >> --- a/ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
> >> +++ b/OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
> >> @@ -20,8 +20,6 @@
> >> FdtPciPcdProducerLib.c
> >>
> >> [Packages]
> >> - ArmPkg/ArmPkg.dec
> >> - ArmVirtPkg/ArmVirtPkg.dec
> >> EmbeddedPkg/EmbeddedPkg.dec
> >> MdeModulePkg/MdeModulePkg.dec
> >> MdePkg/MdePkg.dec
> >> diff --git
> a/ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.c
> b/OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.c
> >> similarity index 100%
> >> rename from
> ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.c
> >> rename to OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.c
> >> diff --git a/Maintainers.txt b/Maintainers.txt
> >> index 41f491bcae..c77b455381 100644
> >> --- a/Maintainers.txt
> >> +++ b/Maintainers.txt
> >> @@ -463,6 +463,12 @@ R: Jiewen Yao <jiewen....@intel.com> [jyao1]
> >> R: Min Xu <min.m...@intel.com> [mxu9]
> >> R: Tom Lendacky <thomas.lenda...@amd.com> [tlendacky]
> >>
> >> +OvmfPkg: FDT related modules
> >> +F: OvmfPkg/Fdt/Cc: Leif Lindholm <l...@nuviainc.com>
> >
> > I think there's an issue with this line. Looks like two lines got mashed
> together by accident.
> >
> >> +R: Leif Lindholm <l...@nuviainc.com>
> >> +R: Gerd Hoffmann <kra...@redhat.com>
> >> +R: Abner Chang <abner.ch...@hpe.com>
> >> +
> >> OvmfPkg: LsiScsi driver
> >> F: OvmfPkg/LsiScsiDxe/
> >> R: Gary Lin <g...@suse.com>
> >>
> >
> >
> >
> >
> >
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#81245): https://edk2.groups.io/g/devel/message/81245
Mute This Topic: https://groups.io/mt/85920585/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
