Hi Ard, Leif, Sami, Gred,

Can you please help to review this patch?


Thanks,
Chao
On 2024/1/5 17:45, Chao Li wrote:
> Move the PcdTerminalTypeGuidBuffer and PcdUninstallMemAttrProtocol into
> OvmfPkg so other ARCh can easily use it.
>
> BZ:https://bugzilla.tianocore.org/show_bug.cgi?id=4584
>
> Cc: Ard Biesheuvel<ardb+tianocore@kernel.org>
> Cc: Leif Lindholm<quic_llindhol@quicinc.com>
> Cc: Sami Mujawar<sami.mujawar@arm.com>
> Cc: Gerd Hoffmann<kraxel@redhat.com>
> Cc: Jiewen Yao<jiewen.yao@intel.com>
> Signed-off-by: Chao Li<lichao@loongson.cn>
> ---
>   ArmVirtPkg/ArmVirtPkg.dec                           | 13 -------------
>   ArmVirtPkg/ArmVirtQemu.dsc                          |  2 +-
>   ArmVirtPkg/ArmVirtQemuKernel.dsc                    |  2 +-
>   .../PlatformBootManagerLib.inf                      |  4 ++--
>   OvmfPkg/OvmfPkg.dec                                 | 13 +++++++++++++
>   5 files changed, 17 insertions(+), 17 deletions(-)
>
> diff --git a/ArmVirtPkg/ArmVirtPkg.dec b/ArmVirtPkg/ArmVirtPkg.dec
> index 05d2d36c1d..315db4e8ea 100644
> --- a/ArmVirtPkg/ArmVirtPkg.dec
> +++ b/ArmVirtPkg/ArmVirtPkg.dec
> @@ -42,21 +42,8 @@
>     gArmVirtTokenSpaceGuid.PcdTpm2SupportEnabled|FALSE|BOOLEAN|0x00000004
>   
>   [PcdsFixedAtBuild, PcdsPatchableInModule]
> -  #
> -  # Binary representation of the GUID that determines the terminal type. The
> -  # size must be exactly 16 bytes. The default value corresponds to
> -  # EFI_VT_100_GUID.
> -  #
> -  gArmVirtTokenSpaceGuid.PcdTerminalTypeGuidBuffer|{0x65, 0x60, 0xA6, 0xDF, 0x19, 0xB4, 0xD3, 0x11, 0x9A, 0x2D, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D}|VOID*|0x00000007
> -
>     ##
>     # This is the physical address of Rsdp which is the core struct of Acpi.
>     # Cloud Hypervisor has no other way to pass Rsdp address to the guest except use a PCD.
>     #
>     gArmVirtTokenSpaceGuid.PcdCloudHvAcpiRsdpBaseAddress|0x0|UINT64|0x00000005
> -
> -  ##
> -  # Whether the EFI memory attributes protocol should be uninstalled before
> -  # invoking the OS loader. This may be needed to work around problematic
> -  # builds of shim that use the protocol incorrectly.
> -  gArmVirtTokenSpaceGuid.PcdUninstallMemAttrProtocol|FALSE|BOOLEAN|0x00000006
> diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc
> index dbd2396c78..147180f645 100644
> --- a/ArmVirtPkg/ArmVirtQemu.dsc
> +++ b/ArmVirtPkg/ArmVirtQemu.dsc
> @@ -182,7 +182,7 @@
>   !if $(TTY_TERMINAL) == TRUE
>     gEfiMdePkgTokenSpaceGuid.PcdDefaultTerminalType|4
>     # Set terminal type to TtyTerm, the value encoded is EFI_TTY_TERM_GUID
> -  gArmVirtTokenSpaceGuid.PcdTerminalTypeGuidBuffer|{0x80, 0x6d, 0x91, 0x7d, 0xb1, 0x5b, 0x8c, 0x45, 0xa4, 0x8f, 0xe2, 0x5f, 0xdd, 0x51, 0xef, 0x94}
> +  gUefiOvmfPkgTokenSpaceGuid.PcdTerminalTypeGuidBuffer|{0x80, 0x6d, 0x91, 0x7d, 0xb1, 0x5b, 0x8c, 0x45, 0xa4, 0x8f, 0xe2, 0x5f, 0xdd, 0x51, 0xef, 0x94}
>   !else
>     gEfiMdePkgTokenSpaceGuid.PcdDefaultTerminalType|1
>   !endif
> diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc
> index 6a6ecfc12a..c22a422353 100644
> --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc
> +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc
> @@ -147,7 +147,7 @@
>   !if $(TTY_TERMINAL) == TRUE
>     gEfiMdePkgTokenSpaceGuid.PcdDefaultTerminalType|4
>     # Set terminal type to TtyTerm, the value encoded is EFI_TTY_TERM_GUID
> -  gArmVirtTokenSpaceGuid.PcdTerminalTypeGuidBuffer|{0x80, 0x6d, 0x91, 0x7d, 0xb1, 0x5b, 0x8c, 0x45, 0xa4, 0x8f, 0xe2, 0x5f, 0xdd, 0x51, 0xef, 0x94}
> +  gUefiOvmfPkgTokenSpaceGuid.PcdTerminalTypeGuidBuffer|{0x80, 0x6d, 0x91, 0x7d, 0xb1, 0x5b, 0x8c, 0x45, 0xa4, 0x8f, 0xe2, 0x5f, 0xdd, 0x51, 0xef, 0x94}
>   !else
>     gEfiMdePkgTokenSpaceGuid.PcdDefaultTerminalType|1
>   !endif
> diff --git a/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf b/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
> index 70e4ebf94a..1ddcd107d2 100644
> --- a/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
> +++ b/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
> @@ -56,14 +56,14 @@
>     UefiRuntimeServicesTableLib
>   
>   [FixedPcd]
> -  gArmVirtTokenSpaceGuid.PcdUninstallMemAttrProtocol
> +  gUefiOvmfPkgTokenSpaceGuid.PcdUninstallMemAttrProtocol
>     gEfiMdePkgTokenSpaceGuid.PcdUartDefaultBaudRate
>     gEfiMdePkgTokenSpaceGuid.PcdUartDefaultDataBits
>     gEfiMdePkgTokenSpaceGuid.PcdUartDefaultParity
>     gEfiMdePkgTokenSpaceGuid.PcdUartDefaultStopBits
>   
>   [Pcd]
> -  gArmVirtTokenSpaceGuid.PcdTerminalTypeGuidBuffer
> +  gUefiOvmfPkgTokenSpaceGuid.PcdTerminalTypeGuidBuffer
>     gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut
>   
>   [Guids]
> diff --git a/OvmfPkg/OvmfPkg.dec b/OvmfPkg/OvmfPkg.dec
> index 7bc2bf1674..a03c30995b 100644
> --- a/OvmfPkg/OvmfPkg.dec
> +++ b/OvmfPkg/OvmfPkg.dec
> @@ -401,6 +401,19 @@
>     #
>     gUefiOvmfPkgTokenSpaceGuid.PcdDeviceTreeAllocationPadding|256|UINT32|0x6f
>   
> +  #
> +  # Binary representation of the GUID that determines the terminal type. The
> +  # size must be exactly 16 bytes. The default value corresponds to
> +  # EFI_VT_100_GUID.
> +  #
> +  gUefiOvmfPkgTokenSpaceGuid.PcdTerminalTypeGuidBuffer|{0x65, 0x60, 0xA6, 0xDF, 0x19, 0xB4, 0xD3, 0x11, 0x9A, 0x2D, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D}|VOID*|0x66
> +
> +  ##
> +  # Whether the EFI memory attributes protocol should be uninstalled before
> +  # invoking the OS loader. This may be needed to work around problematic
> +  # builds of shim that use the protocol incorrectly.
> +  gUefiOvmfPkgTokenSpaceGuid.PcdUninstallMemAttrProtocol|FALSE|BOOLEAN|0x67
> +
>   [PcdsFeatureFlag]
>     gUefiOvmfPkgTokenSpaceGuid.PcdQemuBootOrderPciTranslation|TRUE|BOOLEAN|0x1c
>     gUefiOvmfPkgTokenSpaceGuid.PcdQemuBootOrderMmioTranslation|FALSE|BOOLEAN|0x1d


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