Hi Abner,
This patch:
https://edk2.groups.io/g/devel/message/81310
renames:
gArmTokenSpaceGuid.PcdPciMmio32Translation
to:
gEfiMdePkgTokenSpaceGuid.PcdPciMmio32Translation
but gArmTokenSpaceGuid.PcdPciMmio32Translation is still used in ARM
platforms,
e.g.: SgiPkg/SgiPlatform.dsc.inc:155:
gArmTokenSpaceGuid.PcdPciMmio32Translation|0x0
The RdN2 platform which uses this .dsc.inc file can be built with:
build -a AARCH64 -t GCC5 -p Platform/ARM/SgiPkg/RdN2/RdN2.dsc
Regards,
Pierre
On 10/4/21 10:29, Abner Chang via groups.io wrote:
> Complaint with BZ: #3665
>
https://bugzilla.tianocore.org/show_bug.cgi?id=3665
>
> PcdPciIoTranslation PCD is relocated to MdePkg that leveraged by
> both ARM and RISC-V arch. This patch uses the one from MdePkg
> instead the one under ArmVirtPkg.
>
> Signed-off-by: Abner Chang <abner.chang@hpe.com>
> Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
> Cc: Thomas Abraham <thomas.abraham@arm.com>
> Cc: Sami Mujawar <sami.mujawar@arm.com>
> Cc: Daniel Schaefer <daniel.schaefer@hpe.com>
> ---
> Platform/ARM/SgiPkg/SgiPlatform.dsc.inc | 3 ++-
> Platform/ARM/JunoPkg/ArmJuno.dsc | 3 ++-
> .../Library/JunoPciHostBridgeLib/JunoPciHostBridgeLib.inf | 3 ++-
> 3 files changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/Platform/ARM/SgiPkg/SgiPlatform.dsc.inc b/Platform/ARM/SgiPkg/SgiPlatform.dsc.inc
> index 7e37732fb9..6679939d3b 100644
> --- a/Platform/ARM/SgiPkg/SgiPlatform.dsc.inc
> +++ b/Platform/ARM/SgiPkg/SgiPlatform.dsc.inc
> @@ -1,5 +1,6 @@
> #
> # Copyright (c) 2018-2021, ARM Limited. All rights reserved.
> +# (C) Copyright 2021 Hewlett Packard Enterprise Development LP<BR>
> #
> # SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> @@ -150,7 +151,7 @@
> gArmTokenSpaceGuid.PcdPciBusMax|255
> gArmTokenSpaceGuid.PcdPciIoBase|0x0
> gArmTokenSpaceGuid.PcdPciIoSize|0x00800000
> - gArmTokenSpaceGuid.PcdPciIoTranslation|0x77800000
> + gEfiMdePkgTokenSpaceGuid.PcdPciIoTranslation|0x77800000
> gArmTokenSpaceGuid.PcdPciMmio32Translation|0x0
> gArmTokenSpaceGuid.PcdPciMmio64Translation|0x0
> gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize|24
> diff --git a/Platform/ARM/JunoPkg/ArmJuno.dsc b/Platform/ARM/JunoPkg/ArmJuno.dsc
> index fdfc8cd9e2..3b7a63b643 100644
> --- a/Platform/ARM/JunoPkg/ArmJuno.dsc
> +++ b/Platform/ARM/JunoPkg/ArmJuno.dsc
> @@ -1,5 +1,6 @@
> #
> # Copyright (c) 2013-2018, ARM Limited. All rights reserved.
> +# (C) Copyright 2021 Hewlett Packard Enterprise Development LP<BR>
> #
> # SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> @@ -178,7 +179,7 @@
> gArmTokenSpaceGuid.PcdPciMmio64Size|0x100000000
>
> gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0x40000000
> - gArmTokenSpaceGuid.PcdPciIoTranslation|0x5f800000
> + gEfiMdePkgTokenSpaceGuid.PcdPciIoTranslation|0x5f800000
> gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize|24
>
> # List of Device Paths that support BootMonFs
> diff --git a/Platform/ARM/JunoPkg/Library/JunoPciHostBridgeLib/JunoPciHostBridgeLib.inf b/Platform/ARM/JunoPkg/Library/JunoPciHostBridgeLib/JunoPciHostBridgeLib.inf
> index 8b4a6e2fad..fb513d7b3d 100644
> --- a/Platform/ARM/JunoPkg/Library/JunoPciHostBridgeLib/JunoPciHostBridgeLib.inf
> +++ b/Platform/ARM/JunoPkg/Library/JunoPciHostBridgeLib/JunoPciHostBridgeLib.inf
> @@ -2,6 +2,7 @@
> # PCI Host Bridge Library instance for ARM Juno
> #
> # Copyright (c) 2017, Linaro Ltd. All rights reserved.<BR>
> +# (C) Copyright 2021 Hewlett Packard Enterprise Development LP<BR>
> #
> # SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> @@ -51,7 +52,7 @@
> gArmTokenSpaceGuid.PcdPciBusMax
> gArmTokenSpaceGuid.PcdPciIoBase
> gArmTokenSpaceGuid.PcdPciIoSize
> - gArmTokenSpaceGuid.PcdPciIoTranslation
> + gEfiMdePkgTokenSpaceGuid.PcdPciIoTranslation
> gArmTokenSpaceGuid.PcdPciMmio32Base
> gArmTokenSpaceGuid.PcdPciMmio32Size
> gArmTokenSpaceGuid.PcdPciMmio32Translation