From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.145.1634232076044096511 for ; Thu, 14 Oct 2021 10:21:16 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: pierre.gondois@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id A3B7911D4; Thu, 14 Oct 2021 10:21:15 -0700 (PDT) Received: from [192.168.1.16] (unknown [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 317D13F66F; Thu, 14 Oct 2021 10:21:14 -0700 (PDT) Message-ID: Date: Thu, 14 Oct 2021 18:21:12 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.2.0 Subject: Re: [edk2-devel] [edk2-platforms][PATCH 05/15] Platform/ARM: Use PcdPciIoTranslation PCD from MdePkg To: devel@edk2.groups.io, abner.chang@hpe.com Cc: Ard Biesheuvel , Thomas Abraham , Sami Mujawar , Daniel Schaefer References: <20211004093001.4576-1-abner.chang@hpe.com> <20211004093001.4576-6-abner.chang@hpe.com> From: "PierreGondois" In-Reply-To: <20211004093001.4576-6-abner.chang@hpe.com> Content-Language: en-US Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable 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:=C2=A0 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=3D3665 > > 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 > Cc: Ard Biesheuvel > Cc: Thomas Abraham > Cc: Sami Mujawar > Cc: Daniel Schaefer > --- > 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/Sgi= Pkg/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
> # > # 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/Ar= mJuno.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
> # > # SPDX-License-Identifier: BSD-2-Clause-Patent > # > @@ -178,7 +179,7 @@ > gArmTokenSpaceGuid.PcdPciMmio64Size|0x100000000 > =20 > gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0x40000000 > - gArmTokenSpaceGuid.PcdPciIoTranslation|0x5f800000 > + gEfiMdePkgTokenSpaceGuid.PcdPciIoTranslation|0x5f800000 > gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize|24 > =20 > # List of Device Paths that support BootMonFs > diff --git a/Platform/ARM/JunoPkg/Library/JunoPciHostBridgeLib/JunoPciH= ostBridgeLib.inf b/Platform/ARM/JunoPkg/Library/JunoPciHostBridgeLib/Juno= PciHostBridgeLib.inf > index 8b4a6e2fad..fb513d7b3d 100644 > --- a/Platform/ARM/JunoPkg/Library/JunoPciHostBridgeLib/JunoPciHostBrid= geLib.inf > +++ b/Platform/ARM/JunoPkg/Library/JunoPciHostBridgeLib/JunoPciHostBrid= geLib.inf > @@ -2,6 +2,7 @@ > # PCI Host Bridge Library instance for ARM Juno > # > # Copyright (c) 2017, Linaro Ltd. All rights reserved.
> +# (C) Copyright 2021 Hewlett Packard Enterprise Development LP
> # > # 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