Re: [PATCH v1 2/8] MdePkg/MdePkg.dec: Move PcdCpuRngSupportedAlgorithm to MdePkg

["Sami Mujawar" <sami.mujawar@arm.com>]

Hi Pierre,

Please see my response inline marked [SAMI].

With that fixed,

Reviewed-by: Sami Mujawar <sami.mujawar@arm.com>

Regards,

Sami Mujawar

On 09/05/2023 08:40 am, pierre.gondois@arm.com wrote:
> From: Pierre Gondois <pierre.gondois@arm.com>
>
> In order to use PcdCpuRngSupportedAlgorithm in the MdePkg in a
> following patch and to avoid making the MdePkg dependent on another
> package, move PcdCpuRngSupportedAlgorithm to the MdePkg.
>
> As the Pcf is only used for AARCH64, place it in an AARCH64
> specific sections.
>
> Signed-off-by: Pierre Gondois <pierre.gondois@arm.com>
> ---
>   MdePkg/MdePkg.dec                                   | 5 +++++
>   SecurityPkg/RandomNumberGenerator/RngDxe/RngDxe.inf | 4 ++--
>   SecurityPkg/SecurityPkg.dec                         | 2 --
>   3 files changed, 7 insertions(+), 4 deletions(-)
>
> diff --git a/MdePkg/MdePkg.dec b/MdePkg/MdePkg.dec
> index d6c4179b2a48..0ecfad5795e4 100644
> --- a/MdePkg/MdePkg.dec
> +++ b/MdePkg/MdePkg.dec
> @@ -2357,6 +2357,11 @@ [PcdsFixedAtBuild,PcdsPatchableInModule]
>     # @Prompt IPMI KCS Interface I/O Base Address
>     gEfiMdePkgTokenSpaceGuid.PcdIpmiKcsIoBaseAddress|0xca2|UINT16|0x00000031
>   
> +[PcdsFixedAtBuild.AARCH64, PcdsPatchableInModule.AARCH64]
> +  ## GUID identifying the Rng algorithm implemented by CPU instruction.
> +  # @Prompt CPU Rng algorithm's GUID.
> +  gEfiMdePkgTokenSpaceGuid.PcdCpuRngSupportedAlgorithm|{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}|VOID*|0x00000032

[SAMI] Apparently the token value 0x00000032 is already used when 
rebased with latest edk2 code and results in the following build error:

The TokenValue [0x00000032] of PCD 
[gEfiMdePkgTokenSpaceGuid.PcdCpuRngSupportedAlgorithm] is conflict with: 
[gEfiMdePkgTokenSpaceGuid.PcdIpmiSsifSmbusSlaveAddr]

I believe changing this to 0x00000037 should fix the issue.

[/SAMI]

> +
>   [PcdsFixedAtBuild, PcdsPatchableInModule, PcdsDynamic, PcdsDynamicEx]
>     ## This value is used to set the base address of PCI express hierarchy.
>     # @Prompt PCI Express Base Address.
> diff --git a/SecurityPkg/RandomNumberGenerator/RngDxe/RngDxe.inf b/SecurityPkg/RandomNumberGenerator/RngDxe/RngDxe.inf
> index c8e0ee4ae5d9..d6c2d30195bf 100644
> --- a/SecurityPkg/RandomNumberGenerator/RngDxe/RngDxe.inf
> +++ b/SecurityPkg/RandomNumberGenerator/RngDxe/RngDxe.inf
> @@ -79,8 +79,8 @@ [Guids]
>   [Protocols]
>     gEfiRngProtocolGuid                ## PRODUCES
>   
> -[Pcd]
> -  gEfiSecurityPkgTokenSpaceGuid.PcdCpuRngSupportedAlgorithm      ## CONSUMES
> +[Pcd.AARCH64]
> +  gEfiMdePkgTokenSpaceGuid.PcdCpuRngSupportedAlgorithm      ## CONSUMES
>   
>   [Depex]
>     TRUE
> diff --git a/SecurityPkg/SecurityPkg.dec b/SecurityPkg/SecurityPkg.dec
> index 0a8042d63fe1..6bb02d58bdf0 100644
> --- a/SecurityPkg/SecurityPkg.dec
> +++ b/SecurityPkg/SecurityPkg.dec
> @@ -325,8 +325,6 @@ [PcdsFixedAtBuild, PcdsPatchableInModule]
>     gEfiSecurityPkgTokenSpaceGuid.PcdStatusCodeFvVerificationPass|0x0303100A|UINT32|0x00010030
>     gEfiSecurityPkgTokenSpaceGuid.PcdStatusCodeFvVerificationFail|0x0303100B|UINT32|0x00010031
>   
> -  gEfiSecurityPkgTokenSpaceGuid.PcdCpuRngSupportedAlgorithm|{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}|VOID*|0x00010032
> -
>   [PcdsFixedAtBuild, PcdsPatchableInModule, PcdsDynamic, PcdsDynamicEx]
>     ## Image verification policy for OptionRom. Only following values are valid:<BR><BR>
>     #  NOTE: Do NOT use 0x5 and 0x2 since it violates the UEFI specification and has been removed.<BR>