Re: [edk2-devel] [PATCH v8 20/37] ArmVirtPkg: Enable CpuMmio2Dxe

["Laszlo Ersek" <lersek@redhat.com>]

On 1/26/24 07:29, Chao Li wrote:
> CpuMmio2Dxe is supports MMIO, enable it.
>
> Build-tested only (with "ArmVirtQemu.dsc").
>
> BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=4584
>
> Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
> Cc: Laszlo Ersek <lersek@redhat.com>
> Cc: Leif Lindholm <quic_llindhol@quicinc.com>
> Cc: Sami Mujawar <sami.mujawar@arm.com>
> Cc: Gerd Hoffmann <kraxel@redhat.com>
> Signed-off-by: Chao Li <lichao@loongson.cn>
> ---
>  ArmVirtPkg/ArmVirtCloudHv.dsc        | 2 +-
>  ArmVirtPkg/ArmVirtCloudHv.fdf        | 2 +-
>  ArmVirtPkg/ArmVirtKvmTool.dsc        | 2 +-
>  ArmVirtPkg/ArmVirtKvmTool.fdf        | 2 +-
>  ArmVirtPkg/ArmVirtQemu.dsc           | 2 +-
>  ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc | 2 +-
>  ArmVirtPkg/ArmVirtQemuKernel.dsc     | 2 +-
>  7 files changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/ArmVirtPkg/ArmVirtCloudHv.dsc b/ArmVirtPkg/ArmVirtCloudHv.dsc
> index 76c0d28544..5cb2a609b1 100644
> --- a/ArmVirtPkg/ArmVirtCloudHv.dsc
> +++ b/ArmVirtPkg/ArmVirtCloudHv.dsc
> @@ -341,7 +341,7 @@
>    #
>    # PCI support
>    #
> -  ArmPkg/Drivers/ArmPciCpuIo2Dxe/ArmPciCpuIo2Dxe.inf {
> +  UefiCpuPkg/CpuMmio2Dxe/CpuMmio2Dxe.inf {
>      <LibraryClasses>
>        NULL|OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
>    }
> diff --git a/ArmVirtPkg/ArmVirtCloudHv.fdf b/ArmVirtPkg/ArmVirtCloudHv.fdf
> index 56d1ea6e8c..8554efc294 100644
> --- a/ArmVirtPkg/ArmVirtCloudHv.fdf
> +++ b/ArmVirtPkg/ArmVirtCloudHv.fdf
> @@ -201,7 +201,7 @@ READ_LOCK_STATUS   = TRUE
>    #
>    # PCI support
>    #
> -  INF ArmPkg/Drivers/ArmPciCpuIo2Dxe/ArmPciCpuIo2Dxe.inf
> +  INF UefiCpuPkg/CpuMmio2Dxe/CpuMmio2Dxe.inf
>    INF MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf
>    INF MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf
>    INF OvmfPkg/PciHotPlugInitDxe/PciHotPlugInit.inf
> diff --git a/ArmVirtPkg/ArmVirtKvmTool.dsc b/ArmVirtPkg/ArmVirtKvmTool.dsc
> index cac4fe06d3..20da331966 100644
> --- a/ArmVirtPkg/ArmVirtKvmTool.dsc
> +++ b/ArmVirtPkg/ArmVirtKvmTool.dsc
> @@ -372,7 +372,7 @@
>    #
>    # PCI support
>    #
> -  ArmPkg/Drivers/ArmPciCpuIo2Dxe/ArmPciCpuIo2Dxe.inf {
> +  UefiCpuPkg/CpuMmio2Dxe/CpuMmio2Dxe.inf {
>      <LibraryClasses>
>        NULL|OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
>        NULL|OvmfPkg/Library/BaseCachingPciExpressLib/BaseCachingPciExpressLib.inf
> diff --git a/ArmVirtPkg/ArmVirtKvmTool.fdf b/ArmVirtPkg/ArmVirtKvmTool.fdf
> index 82aff47673..cdf756c112 100644
> --- a/ArmVirtPkg/ArmVirtKvmTool.fdf
> +++ b/ArmVirtPkg/ArmVirtKvmTool.fdf
> @@ -195,7 +195,7 @@ READ_LOCK_STATUS   = TRUE
>    #
>    # PCI support
>    #
> -  INF ArmPkg/Drivers/ArmPciCpuIo2Dxe/ArmPciCpuIo2Dxe.inf
> +  INF UefiCpuPkg/CpuMmio2Dxe/CpuMmio2Dxe.inf
>    INF MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf
>    INF MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf
>    INF OvmfPkg/VirtioPciDeviceDxe/VirtioPciDeviceDxe.inf
> diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc
> index cf306cac08..dbd2396c78 100644
> --- a/ArmVirtPkg/ArmVirtQemu.dsc
> +++ b/ArmVirtPkg/ArmVirtQemu.dsc
> @@ -526,7 +526,7 @@
>    #
>    # PCI support
>    #
> -  ArmPkg/Drivers/ArmPciCpuIo2Dxe/ArmPciCpuIo2Dxe.inf {
> +  UefiCpuPkg/CpuMmio2Dxe/CpuMmio2Dxe.inf {
>      <LibraryClasses>
>        NULL|OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
>    }
> diff --git a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
> index 9b3e37d5c9..c5d097ffb9 100644
> --- a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
> +++ b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
> @@ -153,7 +153,7 @@ READ_LOCK_STATUS   = TRUE
>    #
>    # PCI support
>    #
> -  INF ArmPkg/Drivers/ArmPciCpuIo2Dxe/ArmPciCpuIo2Dxe.inf
> +  INF UefiCpuPkg/CpuMmio2Dxe/CpuMmio2Dxe.inf
>    INF MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf
>    INF MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf
>    INF OvmfPkg/PciHotPlugInitDxe/PciHotPlugInit.inf
> diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc
> index c0d079e28d..6a6ecfc12a 100644
> --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc
> +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc
> @@ -431,7 +431,7 @@
>    #
>    # PCI support
>    #
> -  ArmPkg/Drivers/ArmPciCpuIo2Dxe/ArmPciCpuIo2Dxe.inf {
> +  UefiCpuPkg/CpuMmio2Dxe/CpuMmio2Dxe.inf {
>      <LibraryClasses>
>        NULL|OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
>    }

I have verified this patch as follows:

* diffed "UefiCpuPkg/CpuMmio2Dxe/CpuMmio2Dxe.inf" against
"ArmPkg/Drivers/ArmPciCpuIo2Dxe/ArmPciCpuIo2Dxe.inf" -- good:

>| --- ArmPkg/Drivers/ArmPciCpuIo2Dxe/ArmPciCpuIo2Dxe.inf  2023-11-21 17:30:08.878750682 +0100
>| +++ UefiCpuPkg/CpuMmio2Dxe/CpuMmio2Dxe.inf      2024-02-01 22:56:42.146986301 +0100
>| @@ -3,30 +3,31 @@
>|  #
>|  # Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>
>|  # Copyright (c) 2016, Linaro Ltd. All rights reserved.<BR>
>| +# Copyright (c) 2024 Loongson Technology Corporation Limited. All rights reserved.<BR>
>|  #
>|  # SPDX-License-Identifier: BSD-2-Clause-Patent
>|  #
>|  ##
>|
>|  [Defines]
>| -  INF_VERSION                    = 0x00010005
>| -  BASE_NAME                      = ArmPciCpuIo2Dxe
>| -  FILE_GUID                      = 168D1A6E-F4A5-448A-9E95-795661BB3067
>| +  INF_VERSION                    = 1.29
>| +  BASE_NAME                      = CpuMmio2Dxe
>| +  MODULE_UNI_FILE                = CpuMmio2Dxe.uni
>| +  FILE_GUID                      = FBC36D76-CF22-2584-DBD8-85FF765BAEF1
>|    MODULE_TYPE                    = DXE_DRIVER
>|    VERSION_STRING                 = 1.0
>| -  ENTRY_POINT                    = ArmPciCpuIo2Initialize
>| +  ENTRY_POINT                    = CpuMmio2Initialize
>|
>|  #
>|  # The following information is for reference only and not required by the build tools.
>|  #
>| -#  VALID_ARCHITECTURES           = ARM AARCH64
>| +#  VALID_ARCHITECTURES           = ARM AARCH64 LOONGARCH64 RISCV64
>|  #
>|
>|  [Sources]
>| -  ArmPciCpuIo2Dxe.c
>| +  CpuMmio2Dxe.c
>|
>|  [Packages]
>| -  ArmPkg/ArmPkg.dec
>|    MdePkg/MdePkg.dec
>|
>|  [LibraryClasses]

* diffed "UefiCpuPkg/CpuMmio2Dxe/CpuMmio2Dxe.c" against
"ArmPkg/Drivers/ArmPciCpuIo2Dxe/ArmPciCpuIo2Dxe.c" -- good:

>| --- ArmPkg/Drivers/ArmPciCpuIo2Dxe/ArmPciCpuIo2Dxe.c    2023-11-21 17:30:08.878750682 +0100
>| +++ UefiCpuPkg/CpuMmio2Dxe/CpuMmio2Dxe.c        2024-02-01 22:56:42.146986301 +0100
>| @@ -3,6 +3,7 @@
>|
>|  Copyright (c) 2009 - 2012, Intel Corporation. All rights reserved.<BR>
>|  Copyright (c) 2016, Linaro Ltd. All rights reserved.<BR>
>| +Copyright (c) 2024 Loongson Technology Corporation Limited. All rights reserved.<BR>
>|
>|  SPDX-License-Identifier: BSD-2-Clause-Patent
>|
>| @@ -513,7 +514,7 @@
>|  //
>|  // CPU I/O 2 Protocol instance
>|  //
>| -STATIC EFI_CPU_IO2_PROTOCOL  mCpuIo2 = {
>| +STATIC EFI_CPU_IO2_PROTOCOL  mCpuMmio2 = {
>|    {
>|      CpuMemoryServiceRead,
>|      CpuMemoryServiceWrite
>| @@ -536,7 +537,7 @@
>|  **/
>|  EFI_STATUS
>|  EFIAPI
>| -ArmPciCpuIo2Initialize (
>| +CpuMmio2Initialize (
>|    IN EFI_HANDLE        ImageHandle,
>|    IN EFI_SYSTEM_TABLE  *SystemTable
>|    )
>| @@ -547,7 +548,7 @@
>|    Status = gBS->InstallMultipleProtocolInterfaces (
>|                    &mHandle,
>|                    &gEfiCpuIo2ProtocolGuid,
>| -                  &mCpuIo2,
>| +                  &mCpuMmio2,
>|                    NULL
>|                    );
>|    ASSERT_EFI_ERROR (Status);

Therefore, no changes in functionality are expected.

- Furthermore, dug a bit down in git history, to see where the NULL
class resolution for FdtPciPcdProducerLib comes from. It is commit
53ee81bb686c ("ArmVirtPkg/ArmVirtQemu: switch to generic
PciHostBridgeDxe", 2016-09-02). Good.

Therefore:

Reviewed-by: Laszlo Ersek <lersek@redhat.com>



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#114970): https://edk2.groups.io/g/devel/message/114970
Mute This Topic: https://groups.io/mt/103971664/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-