[edk2-devel] [PATCH V2 8/9] ArmVirtPkg/FdtPciHostBridgeLib: Relocate FdtPciHostBridgeLib to OvmfPkg/Fdt

Daniel Schaefer daniel.schaefer at hpe.com
Tue Sep 28 23:25:35 UTC 2021 

Looks good. Just one minor typo in the comment.

Reviewed-By: Daniel Schaefer <daniel.schaefer at hpe.com>

On 9/28/21 16:31, Abner Chang wrote:
> Relocate FdtPciHostBridgeLib to OvmfPkg/Fdt, this library is
> leverage by both ARM and RISC-V archs. Also use
> PcdPciMmio32Translation and PcdPciMmio64Translation
> PCDs provided by MdePkg instead of ArmPkg.
> 
> Signed-off-by: Abner Chang <abner.chang at hpe.com>
> Cc: Ard Biesheuvel <ardb+tianocore at kernel.org>
> Cc: Leif Lindholm <leif at nuviainc.com>
> Cc: Sami Mujawar <sami.mujawar at arm.com>
> Cc: Jiewen Yao <jiewen.yao at intel.com>
> Cc: Jordan Justen <jordan.l.justen at intel.com>
> Cc: Gerd Hoffmann <kraxel at redhat.com>
> Cc: Daniel Schaefer <daniel.schaefer at hpe.com>
> Cc: Sunil V L <sunilvl at ventanamicro.com>
> ---
>  ArmPkg/ArmPkg.dec                                      | 10 ++++------
>  ArmVirtPkg/ArmVirtCloudHv.dsc                          |  2 +-
>  ArmVirtPkg/ArmVirtKvmTool.dsc                          |  2 +-
>  ArmVirtPkg/ArmVirtQemu.dsc                             |  2 +-
>  ArmVirtPkg/ArmVirtQemuKernel.dsc                       |  2 +-
>  .../Fdt}/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf   |  8 +++-----
>  .../Fdt}/FdtPciHostBridgeLib/FdtPciHostBridgeLib.c     |  0
>  7 files changed, 11 insertions(+), 15 deletions(-)
>  rename {ArmVirtPkg/Library => OvmfPkg/Fdt}/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf (81%)
>  rename {ArmVirtPkg/Library => OvmfPkg/Fdt}/FdtPciHostBridgeLib/FdtPciHostBridgeLib.c (100%)
> 
> diff --git a/ArmPkg/ArmPkg.dec b/ArmPkg/ArmPkg.dec
> index 12584fb319..8a512b7035 100644
> --- a/ArmPkg/ArmPkg.dec
> +++ b/ArmPkg/ArmPkg.dec
> @@ -338,8 +338,8 @@
>    #   UINT64 Mmio64CpuBase; // mapping target in 64-bit cpu-physical space
>    #
>    #   gEfiMdePkgTokenSpaceGuid.PcdPciIoTranslation = IoCpuBase - PcdPciIoBase;
> -  #   PcdPciMmio32Translation = Mmio32CpuBase - (UINT64)PcdPciMmio32Base;
> -  #   PcdPciMmio64Translation = Mmio64CpuBase - PcdPciMmio64Base;
> +  #   gEfiMdePkgTokenSpaceGuid.PcdPciMmio32Translation = Mmio32CpuBase - (UINT64)PcdPciMmio32Base;
> +  #   gEfiMdePkgTokenSpaceGuid.PcdPciMmio64Translation = Mmio64CpuBase - PcdPciMmio64Base;
>    #
>    # because (a) the target address space (ie. the cpu-physical space) is
>    # 64-bit, and (b) the translation values are meant as offsets for *modular*
> @@ -358,9 +358,9 @@
>    #   TranslatedIoAddress     = UntranslatedIoAddress +
>    #                             gEfiMdePkgTokenSpaceGuid.PcdPciIoTranslation;
>    #   TranslatedMmio32Address = (UINT64)UntranslatedMmio32Address +
> -  #                             PcdPciMmio32Translation;
> +  #                             gEfiMdePkgTokenSpaceGuid..PcdPciMmio32Translation;

Should be one period instead of two.

>    #   TranslatedMmio64Address = UntranslatedMmio64Address +
> -  #                             PcdPciMmio64Translation;
> +  #                             gEfiMdePkgTokenSpaceGuid.PcdPciMmio64Translation;
>    #
>    #  The modular arithmetic performed in UINT64 ensures that the translation
>    #  works correctly regardless of the relation between IoCpuBase and
> @@ -371,10 +371,8 @@
>    gArmTokenSpaceGuid.PcdPciIoSize|0x0|UINT64|0x00000051
>    gArmTokenSpaceGuid.PcdPciMmio32Base|0x0|UINT32|0x00000053
>    gArmTokenSpaceGuid.PcdPciMmio32Size|0x0|UINT32|0x00000054
> -  gArmTokenSpaceGuid.PcdPciMmio32Translation|0x0|UINT64|0x00000055
>    gArmTokenSpaceGuid.PcdPciMmio64Base|0x0|UINT64|0x00000056
>    gArmTokenSpaceGuid.PcdPciMmio64Size|0x0|UINT64|0x00000057
> -  gArmTokenSpaceGuid.PcdPciMmio64Translation|0x0|UINT64|0x00000058
>  
>    #
>    # Inclusive range of allowed PCI buses.
> diff --git a/ArmVirtPkg/ArmVirtCloudHv.dsc b/ArmVirtPkg/ArmVirtCloudHv.dsc
> index 4470fa3b14..0f26c10aab 100644
> --- a/ArmVirtPkg/ArmVirtCloudHv.dsc
> +++ b/ArmVirtPkg/ArmVirtCloudHv.dsc
> @@ -51,7 +51,7 @@
>    FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf
>    PciPcdProducerLib|OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
>    PciSegmentLib|MdePkg/Library/BasePciSegmentLibPci/BasePciSegmentLibPci.inf
> -  PciHostBridgeLib|ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf
> +  PciHostBridgeLib|OvmfPkg/Fdt/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf
>    PciHostBridgeUtilityLib|ArmVirtPkg/Library/ArmVirtPciHostBridgeUtilityLib/ArmVirtPciHostBridgeUtilityLib.inf
>  
>    TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf
> diff --git a/ArmVirtPkg/ArmVirtKvmTool.dsc b/ArmVirtPkg/ArmVirtKvmTool.dsc
> index 97fc98d778..0c5da4427e 100644
> --- a/ArmVirtPkg/ArmVirtKvmTool.dsc
> +++ b/ArmVirtPkg/ArmVirtKvmTool.dsc
> @@ -59,7 +59,7 @@
>  
>    PciPcdProducerLib|OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
>    PciSegmentLib|MdePkg/Library/BasePciSegmentLibPci/BasePciSegmentLibPci.inf
> -  PciHostBridgeLib|ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf
> +  PciHostBridgeLib|OvmfPkg/Fdt/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf
>    PciHostBridgeUtilityLib|ArmVirtPkg/Library/ArmVirtPciHostBridgeUtilityLib/ArmVirtPciHostBridgeUtilityLib.inf
>  
>    TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf
> diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc
> index 6c949fd559..4624b6ec36 100644
> --- a/ArmVirtPkg/ArmVirtQemu.dsc
> +++ b/ArmVirtPkg/ArmVirtQemu.dsc
> @@ -79,7 +79,7 @@
>    FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf
>    PciPcdProducerLib|OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
>    PciSegmentLib|MdePkg/Library/BasePciSegmentLibPci/BasePciSegmentLibPci.inf
> -  PciHostBridgeLib|ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf
> +  PciHostBridgeLib|OvmfPkg/Fdt/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf
>    PciHostBridgeUtilityLib|OvmfPkg/Library/PciHostBridgeUtilityLib/PciHostBridgeUtilityLib.inf
>  
>  !if $(TPM2_ENABLE) == TRUE
> diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc
> index 64035a948d..426e0ff1fd 100644
> --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc
> +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc
> @@ -77,7 +77,7 @@
>    FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf
>    PciPcdProducerLib|OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
>    PciSegmentLib|MdePkg/Library/BasePciSegmentLibPci/BasePciSegmentLibPci.inf
> -  PciHostBridgeLib|ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf
> +  PciHostBridgeLib|OvmfPkg/Fdt/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf
>    PciHostBridgeUtilityLib|OvmfPkg/Library/PciHostBridgeUtilityLib/PciHostBridgeUtilityLib.inf
>    TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf
>  
> diff --git a/ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf b/OvmfPkg/Fdt/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf
> similarity index 81%
> rename from ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf
> rename to OvmfPkg/Fdt/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf
> index f149693fa2..e610e3d03f 100644
> --- a/ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf
> +++ b/OvmfPkg/Fdt/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf
> @@ -20,15 +20,13 @@
>  # The following information is for reference only and not required by the build
>  # tools.
>  #
> -#  VALID_ARCHITECTURES           = AARCH64 ARM
> +#  VALID_ARCHITECTURES           = AARCH64 ARM RISCV64
>  #
>  
>  [Sources]
>    FdtPciHostBridgeLib.c
>  
>  [Packages]
> -  ArmPkg/ArmPkg.dec
> -  ArmVirtPkg/ArmVirtPkg.dec
>    EmbeddedPkg/EmbeddedPkg.dec
>    MdeModulePkg/MdeModulePkg.dec
>    MdePkg/MdePkg.dec
> @@ -44,8 +42,8 @@
>    PciPcdProducerLib
>  
>  [FixedPcd]
> -  gArmTokenSpaceGuid.PcdPciMmio32Translation
> -  gArmTokenSpaceGuid.PcdPciMmio64Translation
> +  gEfiMdePkgTokenSpaceGuid.PcdPciMmio32Translation
> +  gEfiMdePkgTokenSpaceGuid.PcdPciMmio64Translation
>  
>  [Pcd]
>    gEfiMdePkgTokenSpaceGuid.PcdPciIoTranslation
> diff --git a/ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.c b/OvmfPkg/Fdt/FdtPciHostBridgeLib/FdtPciHostBridgeLib.c
> similarity index 100%
> rename from ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.c
> rename to OvmfPkg/Fdt/FdtPciHostBridgeLib/FdtPciHostBridgeLib.c
> 


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#81239): https://edk2.groups.io/g/devel/message/81239
Mute This Topic: https://groups.io/mt/85920590/1813853
Group Owner: devel+owner at edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [edk2-devel-archive at redhat.com]
-=-=-=-=-=-=-=-=-=-=-=-

More information about the edk2-devel-archive mailing list