devel@edk2.groups.io

[edk2-platforms][PATCH V3 4/9] Silicon/Styx: Use PcdPciMmio(32)64Translation PCD from MdePkg

Abner Chang

#82120

Compliant with BZ: #3665
https://bugzilla.tianocore.org/show_bug.cgi?id=3665

PcdPciMmio(32)64Translation 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 ArmPkg.

Signed-off-by: Abner Chang <abner.chang@...>
Cc: Ard Biesheuvel <ardb+tianocore@...>
Cc: Leif Lindholm <leif@...>
Cc: Daniel Schaefer <daniel.schaefer@...>
---
 .../AmdStyxPciHostBridgeLib/AmdStyxPciHostBridgeLib.inf       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Silicon/AMD/Styx/Library/AmdStyxPciHostBridgeLib/AmdStyxPciHostBridgeLib.inf b/Silicon/AMD/Styx/Library/AmdStyxPciHostBridgeLib/AmdStyxPciHostBridgeLib.inf
index 31c973cd2a..76a3b5aee2 100644
--- a/Silicon/AMD/Styx/Library/AmdStyxPciHostBridgeLib/AmdStyxPciHostBridgeLib.inf
+++ b/Silicon/AMD/Styx/Library/AmdStyxPciHostBridgeLib/AmdStyxPciHostBridgeLib.inf
@@ -43,7 +43,7 @@
   gArmTokenSpaceGuid.PcdPciIoSize
   gArmTokenSpaceGuid.PcdPciMmio32Base
   gArmTokenSpaceGuid.PcdPciMmio32Size
-  gArmTokenSpaceGuid.PcdPciMmio32Translation
+  gEfiMdePkgTokenSpaceGuid.PcdPciMmio32Translation
   gArmTokenSpaceGuid.PcdPciMmio64Base
   gArmTokenSpaceGuid.PcdPciMmio64Size
-  gArmTokenSpaceGuid.PcdPciMmio64Translation
+  gEfiMdePkgTokenSpaceGuid.PcdPciMmio64Translation
-- 
2.17.1

[edk2-platforms][PATCH V3 7/9] Silicon/SabaQemu: Use PcdPciMmio(32)64Translation PCD from MdePkg

Abner Chang

#82119

Compliant with BZ: #3665
https://bugzilla.tianocore.org/show_bug.cgi?id=3665

PcdPciMmio(32)64Translation 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 ArmPkg.

Signed-off-by: Abner Chang <abner.chang@...>
Cc: Ard Biesheuvel <ardb+tianocore@...>
Cc: Leif Lindholm <leif@...>
Cc: Graeme Gregory <graeme@...>
Cc: Radoslaw Biernacki <rad@...>
Cc: Daniel Schaefer <daniel.schaefer@...>
---
 Silicon/Qemu/SbsaQemu/AcpiTables/AcpiTables.inf               | 4 ++--
 .../SbsaQemuPciHostBridgeLib/SbsaQemuPciHostBridgeLib.c       | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Silicon/Qemu/SbsaQemu/AcpiTables/AcpiTables.inf b/Silicon/Qemu/SbsaQemu/AcpiTables/AcpiTables.inf
index 0ad9cc7ce4..176d8fab83 100644
--- a/Silicon/Qemu/SbsaQemu/AcpiTables/AcpiTables.inf
+++ b/Silicon/Qemu/SbsaQemu/AcpiTables/AcpiTables.inf
@@ -56,12 +56,12 @@
 
   gArmTokenSpaceGuid.PcdPciMmio32Base
   gArmTokenSpaceGuid.PcdPciMmio32Size
-  gArmTokenSpaceGuid.PcdPciMmio32Translation
+  gEfiMdePkgTokenSpaceGuid.PcdPciMmio32Translation
   gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdPciMmio32Limit
 
   gArmTokenSpaceGuid.PcdPciMmio64Base
   gArmTokenSpaceGuid.PcdPciMmio64Size
-  gArmTokenSpaceGuid.PcdPciMmio64Translation
+  gEfiMdePkgTokenSpaceGuid.PcdPciMmio64Translation
   gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdPciMmio64Limit
 
   gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress
diff --git a/Silicon/Qemu/SbsaQemu/Library/SbsaQemuPciHostBridgeLib/SbsaQemuPciHostBridgeLib.c b/Silicon/Qemu/SbsaQemu/Library/SbsaQemuPciHostBridgeLib/SbsaQemuPciHostBridgeLib.c
index 5021b096f7..9739c7500d 100644
--- a/Silicon/Qemu/SbsaQemu/Library/SbsaQemuPciHostBridgeLib/SbsaQemuPciHostBridgeLib.c
+++ b/Silicon/Qemu/SbsaQemu/Library/SbsaQemuPciHostBridgeLib/SbsaQemuPciHostBridgeLib.c
@@ -96,7 +96,7 @@ STATIC PCI_ROOT_BRIDGE mRootBridge = {
 
   /* PCI_ROOT_BRIDGE_APERTURE Mem; MMIO aperture below 4GB which can be used by
      the root bridge
-     (gArmTokenSpaceGuid.PcdPciMmio32Translation as 0x0) */
+     (gEfiMdePkgTokenSpaceGuid.PcdPciMmio32Translation as 0x0) */
   {
     FixedPcdGet32 (PcdPciMmio32Base),
     FixedPcdGet32 (PcdPciMmio32Base) + FixedPcdGet32 (PcdPciMmio32Size) - 1,
@@ -104,7 +104,7 @@ STATIC PCI_ROOT_BRIDGE mRootBridge = {
 
   /* PCI_ROOT_BRIDGE_APERTURE MemAbove4G; MMIO aperture above 4GB which can be
      used by the root bridge.
-     (gArmTokenSpaceGuid.PcdPciMmio64Translation as 0x0) */
+     (gEfiMdePkgTokenSpaceGuid.PcdPciMmio64Translation as 0x0) */
   {
     FixedPcdGet64 (PcdPciMmio64Base),
     FixedPcdGet64 (PcdPciMmio64Base) + FixedPcdGet64 (PcdPciMmio64Size) - 1
-- 
2.17.1

[edk2-platforms][PATCH V3 6/9] Platform/SabaQemu: Use PcdPciMmio(32)64Translation PCD from MdePkg

Abner Chang

#82118

Compliant with BZ: #3665
https://bugzilla.tianocore.org/show_bug.cgi?id=3665

PcdPciMmio(32)64Translation 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 ArmPkg.

Signed-off-by: Abner Chang <abner.chang@...>
Cc: Ard Biesheuvel <ardb+tianocore@...>
Cc: Leif Lindholm <leif@...>
Cc: Graeme Gregory <graeme@...>
Cc: Radoslaw Biernacki <rad@...>
Cc: Daniel Schaefer <daniel.schaefer@...>
---
 Platform/Qemu/SbsaQemu/SbsaQemu.dsc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Platform/Qemu/SbsaQemu/SbsaQemu.dsc b/Platform/Qemu/SbsaQemu/SbsaQemu.dsc
index d404e08a67..1d1a25196e 100644
--- a/Platform/Qemu/SbsaQemu/SbsaQemu.dsc
+++ b/Platform/Qemu/SbsaQemu/SbsaQemu.dsc
@@ -487,8 +487,8 @@ DEFINE NETWORK_HTTP_BOOT_ENABLE       = FALSE
   gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdPciExpressBarLimit|0xFFFFFFFF
 
   gEfiMdePkgTokenSpaceGuid.PcdPciIoTranslation|0x7fff0000
-  gArmTokenSpaceGuid.PcdPciMmio32Translation|0x0
-  gArmTokenSpaceGuid.PcdPciMmio64Translation|0x0
+  gEfiMdePkgTokenSpaceGuid.PcdPciMmio32Translation|0x0
+  gEfiMdePkgTokenSpaceGuid.PcdPciMmio64Translation|0x0
   ## If TRUE, OvmfPkg/AcpiPlatformDxe will not wait for PCI
   #  enumeration to complete before installing ACPI tables.
   gEfiMdeModulePkgTokenSpaceGuid.PcdPciDisableBusEnumeration|FALSE
-- 
2.17.1

[edk2-platforms][PATCH V3 3/9] Platform/Overdrive1000Board: Use PcdPciMmio(32)64Translation PCD from MdePkg

Abner Chang

#82117

Compliant with BZ: #3665
https://bugzilla.tianocore.org/show_bug.cgi?id=3665

PcdPciMmio(32)64Translation 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 ArmPkg.

Signed-off-by: Abner Chang <abner.chang@...>
Cc: Ard Biesheuvel <ardb+tianocore@...>
Cc: Leif Lindholm <leif@...>
Cc: Daniel Schaefer <daniel.schaefer@...>
---
 Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc b/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc
index 0f61665cbb..57b9e9f381 100644
--- a/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc
+++ b/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc
@@ -392,11 +392,11 @@ DEFINE NUM_CORES    = 4
 
   gArmTokenSpaceGuid.PcdPciMmio32Base|0x40000000
   gArmTokenSpaceGuid.PcdPciMmio32Size|0x80000000
-  gArmTokenSpaceGuid.PcdPciMmio32Translation|0x0
+  gEfiMdePkgTokenSpaceGuid.PcdPciMmio32Translation|0x0
 
   gArmTokenSpaceGuid.PcdPciMmio64Base|0x100000000
   gArmTokenSpaceGuid.PcdPciMmio64Size|0x7F00000000
-  gArmTokenSpaceGuid.PcdPciMmio64Translation|0x0
+  gEfiMdePkgTokenSpaceGuid.PcdPciMmio64Translation|0x0
 
   ## Use PCI emulation for ATA PassThru
   # gEfiMdeModulePkgTokenSpaceGuid.PcdAtaPassThruPciEmulation|TRUE
-- 
2.17.1

[edk2-platforms][PATCH V3 0/9] Use PcdPciMmio(32)64Translation PCDs from MdePkg

Abner Chang

#82116

In V3: Fix the commit message in each patch.
       ArmVirtPkg->ArmPkg
In V2: Fix the invalid email address.

This patch set fixes the build error caused by referring to
PcdPciMmio(32)64Translation under ArmPkg. It should use the ones from
MdePkg because of the PCD relocation (BZ:#3665).

https://bugzilla.tianocore.org/show_bug.cgi?id=3665

BZ:#3665 is to migrate some modules from ArmVirtPkg
to under OvmfPkg for the upcoming RiscVVirtPkg that can leverage
those modules without the dependency with Arm*Pkg.
Refer to below message of the pacthes of edk2 portion.
https://edk2.groups.io/g/devel/message/81306

Below PCDs are moved to under MdePkg and leverage by RiscVVirtPkg.
- PcdPciMmio32Translation
- PcdPciMmio64Translation

Signed-off-by: Abner Chang <abner.chang@...>
Cc: Ard Biesheuvel <ardb+tianocore@...>
Cc: Leif Lindholm <leif@...>
Cc: Daniel Schaefer <daniel.schaefer@...>
Cc: Thomas Abraham <thomas.abraham@...>
Cc: Sami Mujawar <sami.mujawar@...>
Cc: Graeme Gregory <graeme@...>
Cc: Radoslaw Biernacki <rad@...>
Cc: Pierre Gondois <pierre.gondois@...>
Cc: Peng Xie <xiepeng@...>
Cc: Ling Jia <jialing@...>
Cc: Yiqi Shu <shuyiqi@...>

Abner Chang (9):
  Platform/OverdriveBoard: Use PcdPciMmio(32)64Translation PCD from
    MdePkg
  Platform/CelloBoard: Use PcdPciMmio(32)64Translation PCD from MdePkg
  Platform/Overdrive1000Board: Use PcdPciMmio(32)64Translation PCD from
    MdePkg
  Silicon/Styx: Use PcdPciMmio(32)64Translation PCD from MdePkg
  Platform/ARM: Use PcdPciMmio(32)64Translation PCD from MdePkg
  Platform/SabaQemu: Use PcdPciMmio(32)64Translation PCD from MdePkg
  Silicon/SabaQemu: Use PcdPciMmio(32)64Translation PCD from MdePkg
  Platform/DurianPkg: Use PcdPciMmio(32)64Translation PCD from MdePkg
  Silicon/FT2000-4Pkg: Use PcdPciMmio(32)64Translation PCD from MdePkg

 Platform/ARM/SgiPkg/SgiPlatform.dsc.inc                       | 4 ++--
 Platform/AMD/OverdriveBoard/OverdriveBoard.dsc                | 4 ++--
 Platform/LeMaker/CelloBoard/CelloBoard.dsc                    | 4 ++--
 Platform/Phytium/DurianPkg/DurianPkg.dsc                      | 2 +-
 Platform/Qemu/SbsaQemu/SbsaQemu.dsc                           | 4 ++--
 Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc   | 4 ++--
 .../Library/JunoPciHostBridgeLib/JunoPciHostBridgeLib.inf     | 4 ++--
 .../ARM/SgiPkg/Library/PciHostBridgeLib/PciHostBridgeLib.inf  | 2 +-
 .../AmdStyxPciHostBridgeLib/AmdStyxPciHostBridgeLib.inf       | 4 ++--
 .../Phytium/FT2000-4Pkg/Library/PlatformLib/PlatformLib.inf   | 2 +-
 Silicon/Qemu/SbsaQemu/AcpiTables/AcpiTables.inf               | 4 ++--
 .../SbsaQemuPciHostBridgeLib/SbsaQemuPciHostBridgeLib.c       | 4 ++--
 12 files changed, 21 insertions(+), 21 deletions(-)

-- 
2.17.1

[edk2-platforms][PATCH V3 2/9] Platform/CelloBoard: Use PcdPciMmio(32)64Translation PCD from MdePkg

Abner Chang

#82115

Compliant with BZ: #3665
https://bugzilla.tianocore.org/show_bug.cgi?id=3665

PcdPciMmio(32)64Translation 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 ArmPkg.

Signed-off-by: Abner Chang <abner.chang@...>
Cc: Ard Biesheuvel <ardb+tianocore@...>
Cc: Leif Lindholm <leif@...>
Cc: Daniel Schaefer <daniel.schaefer@...>
---
 Platform/LeMaker/CelloBoard/CelloBoard.dsc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Platform/LeMaker/CelloBoard/CelloBoard.dsc b/Platform/LeMaker/CelloBoard/CelloBoard.dsc
index d826e34fdd..11d989cf34 100644
--- a/Platform/LeMaker/CelloBoard/CelloBoard.dsc
+++ b/Platform/LeMaker/CelloBoard/CelloBoard.dsc
@@ -393,11 +393,11 @@ DEFINE NUM_CORES    = 4
 
   gArmTokenSpaceGuid.PcdPciMmio32Base|0x40000000
   gArmTokenSpaceGuid.PcdPciMmio32Size|0x80000000
-  gArmTokenSpaceGuid.PcdPciMmio32Translation|0x0
+  gEfiMdePkgTokenSpaceGuid.PcdPciMmio32Translation|0x0
 
   gArmTokenSpaceGuid.PcdPciMmio64Base|0x100000000
   gArmTokenSpaceGuid.PcdPciMmio64Size|0x7F00000000
-  gArmTokenSpaceGuid.PcdPciMmio64Translation|0x0
+  gEfiMdePkgTokenSpaceGuid.PcdPciMmio64Translation|0x0
 
   ## ACPI (no tables < 4GB)
   gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiExposedTableVersions|0x20
-- 
2.17.1

Re: [edk2-platforms][PATCH 1/9] Platform/OverdriveBoard: Use PcdPciMmio(32)64Translation PCD from MdePkg

Abner Chang

#82114

sigh... typo. Should be ArmPkg, will send V3.

Abner

Show quoted text

From: devel@edk2.groups.io <devel@edk2.groups.io> on behalf of Ard Biesheuvel <ardb@...>
Sent: Friday, October 15, 2021 3:59 PM
To: Chang, Abner (HPS SW/FW Technologist) <abner.chang@...>
Cc: edk2-devel-groups-io <devel@edk2.groups.io>; Ard Biesheuvel <ardb+tianocore@...>; Leif Lindholm <leif@...>; Schaefer, Daniel <daniel.schaefer@...>
Subject: Re: [edk2-devel] [edk2-platforms][PATCH 1/9] Platform/OverdriveBoard: Use PcdPciMmio(32)64Translation PCD from MdePkg

On Fri, 15 Oct 2021 at 09:58, Abner Chang <abner.chang@...> wrote:
>
> Compliant with BZ: #3665
> https://bugzilla.tianocore.org/show_bug.cgi?id=3665
>
> PcdPciMmio(32)64Translation 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.
>

ArmVirtPkg??

> Signed-off-by: Abner Chang <abner.chang@...>
> Cc: Ard Biesheuvel <ardb+tianocore@...>
> Cc: Leif Lindholm <leif@...>
> Cc: Daniel Schaefer <daniel.schaefer@...>
> ---
> Platform/AMD/OverdriveBoard/OverdriveBoard.dsc | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc b/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc
> index 91b8c7792e..af20739120 100644
> --- a/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc
> +++ b/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc
> @@ -403,11 +403,11 @@ DEFINE X64EMU_ENABLE = FALSE
>
>    gArmTokenSpaceGuid.PcdPciMmio32Base|0x40000000
>    gArmTokenSpaceGuid.PcdPciMmio32Size|0x80000000
> - gArmTokenSpaceGuid.PcdPciMmio32Translation|0x0
> + gEfiMdePkgTokenSpaceGuid.PcdPciMmio32Translation|0x0
>
>    gArmTokenSpaceGuid.PcdPciMmio64Base|0x100000000
>    gArmTokenSpaceGuid.PcdPciMmio64Size|0x7F00000000
> - gArmTokenSpaceGuid.PcdPciMmio64Translation|0x0
> + gEfiMdePkgTokenSpaceGuid.PcdPciMmio64Translation|0x0
>
>    ## Use PCI emulation for ATA PassThru
>    # gEfiMdeModulePkgTokenSpaceGuid.PcdAtaPassThruPciEmulation|TRUE
> --
> 2.17.1
>

[edk2-platforms][PATCH V2 8/9] Platform/DurianPkg: Use PcdPciMmio(32)64Translation PCD from MdePkg

Abner Chang

#82113

Compliant with BZ: #3665
https://bugzilla.tianocore.org/show_bug.cgi?id=3665

PcdPciMmio(32)64Translation 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@...>
Cc: Leif Lindholm <leif@...>
Cc: Peng Xie <xiepeng@...>
Cc: Ling Jia <jialing@...>
Cc: Yiqi Shu <shuyiqi@...>
Cc: Daniel Schaefer <daniel.schaefer@...>
---
 Platform/Phytium/DurianPkg/DurianPkg.dsc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Platform/Phytium/DurianPkg/DurianPkg.dsc b/Platform/Phytium/DurianPkg/DurianPkg.dsc
index 7df7e0f1d5..c1519070d6 100644
--- a/Platform/Phytium/DurianPkg/DurianPkg.dsc
+++ b/Platform/Phytium/DurianPkg/DurianPkg.dsc
@@ -114,7 +114,7 @@
   gEfiMdePkgTokenSpaceGuid.PcdPciIoTranslation|0x50000000
   gArmTokenSpaceGuid.PcdPciMmio32Base|0x58000000
   gArmTokenSpaceGuid.PcdPciMmio32Size|0x28000000
-  gArmTokenSpaceGuid.PcdPciMmio32Translation|0x0
+  gEfiMdePkgTokenSpaceGuid.PcdPciMmio32Translation|0x0
   gArmTokenSpaceGuid.PcdPciMmio64Base|0x1000000000
   gArmTokenSpaceGuid.PcdPciMmio64Size|0x1000000000
   gEfiMdeModulePkgTokenSpaceGuid.PcdPciDisableBusEnumeration|FALSE
-- 
2.17.1

[edk2-platforms][PATCH V2 9/9] Silicon/FT2000-4Pkg: Use PcdPciMmio(32)64Translation PCD from MdePkg

Abner Chang

#82112

Compliant with BZ: #3665
https://bugzilla.tianocore.org/show_bug.cgi?id=3665

PcdPciMmio(32)64Translation 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@...>
Cc: Leif Lindholm <leif@...>
Cc: Peng Xie <xiepeng@...>
Cc: Ling Jia <jialing@...>
Cc: Yiqi Shu <shuyiqi@...>
Cc: Daniel Schaefer <daniel.schaefer@...>
---
 Silicon/Phytium/FT2000-4Pkg/Library/PlatformLib/PlatformLib.inf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Silicon/Phytium/FT2000-4Pkg/Library/PlatformLib/PlatformLib.inf b/Silicon/Phytium/FT2000-4Pkg/Library/PlatformLib/PlatformLib.inf
index 6d5951c62d..11134b8fc4 100644
--- a/Silicon/Phytium/FT2000-4Pkg/Library/PlatformLib/PlatformLib.inf
+++ b/Silicon/Phytium/FT2000-4Pkg/Library/PlatformLib/PlatformLib.inf
@@ -47,7 +47,7 @@
   gEfiMdePkgTokenSpaceGuid.PcdPciIoTranslation
   gArmTokenSpaceGuid.PcdPciMmio32Base
   gArmTokenSpaceGuid.PcdPciMmio32Size
-  gArmTokenSpaceGuid.PcdPciMmio32Translation
+  gEfiMdePkgTokenSpaceGuid.PcdPciMmio32Translation
   gArmTokenSpaceGuid.PcdPciMmio64Base
   gArmTokenSpaceGuid.PcdPciMmio64Size
 
-- 
2.17.1

[edk2-platforms][PATCH V2 7/9] Silicon/SabaQemu: Use PcdPciMmio(32)64Translation PCD from MdePkg

Abner Chang

#82111

Compliant with BZ: #3665
https://bugzilla.tianocore.org/show_bug.cgi?id=3665

PcdPciMmio(32)64Translation 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@...>
Cc: Ard Biesheuvel <ardb+tianocore@...>
Cc: Leif Lindholm <leif@...>
Cc: Graeme Gregory <graeme@...>
Cc: Radoslaw Biernacki <rad@...>
Cc: Daniel Schaefer <daniel.schaefer@...>
---
 Silicon/Qemu/SbsaQemu/AcpiTables/AcpiTables.inf               | 4 ++--
 .../SbsaQemuPciHostBridgeLib/SbsaQemuPciHostBridgeLib.c       | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Silicon/Qemu/SbsaQemu/AcpiTables/AcpiTables.inf b/Silicon/Qemu/SbsaQemu/AcpiTables/AcpiTables.inf
index 0ad9cc7ce4..176d8fab83 100644
--- a/Silicon/Qemu/SbsaQemu/AcpiTables/AcpiTables.inf
+++ b/Silicon/Qemu/SbsaQemu/AcpiTables/AcpiTables.inf
@@ -56,12 +56,12 @@
 
   gArmTokenSpaceGuid.PcdPciMmio32Base
   gArmTokenSpaceGuid.PcdPciMmio32Size
-  gArmTokenSpaceGuid.PcdPciMmio32Translation
+  gEfiMdePkgTokenSpaceGuid.PcdPciMmio32Translation
   gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdPciMmio32Limit
 
   gArmTokenSpaceGuid.PcdPciMmio64Base
   gArmTokenSpaceGuid.PcdPciMmio64Size
-  gArmTokenSpaceGuid.PcdPciMmio64Translation
+  gEfiMdePkgTokenSpaceGuid.PcdPciMmio64Translation
   gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdPciMmio64Limit
 
   gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress
diff --git a/Silicon/Qemu/SbsaQemu/Library/SbsaQemuPciHostBridgeLib/SbsaQemuPciHostBridgeLib.c b/Silicon/Qemu/SbsaQemu/Library/SbsaQemuPciHostBridgeLib/SbsaQemuPciHostBridgeLib.c
index 5021b096f7..9739c7500d 100644
--- a/Silicon/Qemu/SbsaQemu/Library/SbsaQemuPciHostBridgeLib/SbsaQemuPciHostBridgeLib.c
+++ b/Silicon/Qemu/SbsaQemu/Library/SbsaQemuPciHostBridgeLib/SbsaQemuPciHostBridgeLib.c
@@ -96,7 +96,7 @@ STATIC PCI_ROOT_BRIDGE mRootBridge = {
 
   /* PCI_ROOT_BRIDGE_APERTURE Mem; MMIO aperture below 4GB which can be used by
      the root bridge
-     (gArmTokenSpaceGuid.PcdPciMmio32Translation as 0x0) */
+     (gEfiMdePkgTokenSpaceGuid.PcdPciMmio32Translation as 0x0) */
   {
     FixedPcdGet32 (PcdPciMmio32Base),
     FixedPcdGet32 (PcdPciMmio32Base) + FixedPcdGet32 (PcdPciMmio32Size) - 1,
@@ -104,7 +104,7 @@ STATIC PCI_ROOT_BRIDGE mRootBridge = {
 
   /* PCI_ROOT_BRIDGE_APERTURE MemAbove4G; MMIO aperture above 4GB which can be
      used by the root bridge.
-     (gArmTokenSpaceGuid.PcdPciMmio64Translation as 0x0) */
+     (gEfiMdePkgTokenSpaceGuid.PcdPciMmio64Translation as 0x0) */
   {
     FixedPcdGet64 (PcdPciMmio64Base),
     FixedPcdGet64 (PcdPciMmio64Base) + FixedPcdGet64 (PcdPciMmio64Size) - 1
-- 
2.17.1

[edk2-platforms][PATCH V2 6/9] Platform/SabaQemu: Use PcdPciMmio(32)64Translation PCD from MdePkg

Abner Chang

#82110

Compliant with BZ: #3665
https://bugzilla.tianocore.org/show_bug.cgi?id=3665

PcdPciMmio(32)64Translation 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@...>
Cc: Ard Biesheuvel <ardb+tianocore@...>
Cc: Leif Lindholm <leif@...>
Cc: Graeme Gregory <graeme@...>
Cc: Radoslaw Biernacki <rad@...>
Cc: Daniel Schaefer <daniel.schaefer@...>
---
 Platform/Qemu/SbsaQemu/SbsaQemu.dsc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Platform/Qemu/SbsaQemu/SbsaQemu.dsc b/Platform/Qemu/SbsaQemu/SbsaQemu.dsc
index d404e08a67..1d1a25196e 100644
--- a/Platform/Qemu/SbsaQemu/SbsaQemu.dsc
+++ b/Platform/Qemu/SbsaQemu/SbsaQemu.dsc
@@ -487,8 +487,8 @@ DEFINE NETWORK_HTTP_BOOT_ENABLE       = FALSE
   gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdPciExpressBarLimit|0xFFFFFFFF
 
   gEfiMdePkgTokenSpaceGuid.PcdPciIoTranslation|0x7fff0000
-  gArmTokenSpaceGuid.PcdPciMmio32Translation|0x0
-  gArmTokenSpaceGuid.PcdPciMmio64Translation|0x0
+  gEfiMdePkgTokenSpaceGuid.PcdPciMmio32Translation|0x0
+  gEfiMdePkgTokenSpaceGuid.PcdPciMmio64Translation|0x0
   ## If TRUE, OvmfPkg/AcpiPlatformDxe will not wait for PCI
   #  enumeration to complete before installing ACPI tables.
   gEfiMdeModulePkgTokenSpaceGuid.PcdPciDisableBusEnumeration|FALSE
-- 
2.17.1

[edk2-platforms][PATCH V2 4/9] Silicon/Styx: Use PcdPciMmio(32)64Translation PCD from MdePkg

Abner Chang

#82109

Compliant with BZ: #3665
https://bugzilla.tianocore.org/show_bug.cgi?id=3665

PcdPciMmio(32)64Translation 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@...>
Cc: Ard Biesheuvel <ardb+tianocore@...>
Cc: Leif Lindholm <leif@...>
Cc: Daniel Schaefer <daniel.schaefer@...>
---
 .../AmdStyxPciHostBridgeLib/AmdStyxPciHostBridgeLib.inf       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Silicon/AMD/Styx/Library/AmdStyxPciHostBridgeLib/AmdStyxPciHostBridgeLib.inf b/Silicon/AMD/Styx/Library/AmdStyxPciHostBridgeLib/AmdStyxPciHostBridgeLib.inf
index 31c973cd2a..76a3b5aee2 100644
--- a/Silicon/AMD/Styx/Library/AmdStyxPciHostBridgeLib/AmdStyxPciHostBridgeLib.inf
+++ b/Silicon/AMD/Styx/Library/AmdStyxPciHostBridgeLib/AmdStyxPciHostBridgeLib.inf
@@ -43,7 +43,7 @@
   gArmTokenSpaceGuid.PcdPciIoSize
   gArmTokenSpaceGuid.PcdPciMmio32Base
   gArmTokenSpaceGuid.PcdPciMmio32Size
-  gArmTokenSpaceGuid.PcdPciMmio32Translation
+  gEfiMdePkgTokenSpaceGuid.PcdPciMmio32Translation
   gArmTokenSpaceGuid.PcdPciMmio64Base
   gArmTokenSpaceGuid.PcdPciMmio64Size
-  gArmTokenSpaceGuid.PcdPciMmio64Translation
+  gEfiMdePkgTokenSpaceGuid.PcdPciMmio64Translation
-- 
2.17.1

[edk2-platforms][PATCH V2 5/9] Platform/ARM: Use PcdPciMmio(32)64Translation PCD from MdePkg

Abner Chang

#82108

Compliant with BZ: #3665
https://bugzilla.tianocore.org/show_bug.cgi?id=3665

PcdPciMmio(32)64Translation 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@...>
Cc: Ard Biesheuvel <ardb+tianocore@...>
Cc: Thomas Abraham <thomas.abraham@...>
Cc: Sami Mujawar <sami.mujawar@...>
Cc: Daniel Schaefer <daniel.schaefer@...>
---
 Platform/ARM/SgiPkg/SgiPlatform.dsc.inc                       | 4 ++--
 .../Library/JunoPciHostBridgeLib/JunoPciHostBridgeLib.inf     | 4 ++--
 .../ARM/SgiPkg/Library/PciHostBridgeLib/PciHostBridgeLib.inf  | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Platform/ARM/SgiPkg/SgiPlatform.dsc.inc b/Platform/ARM/SgiPkg/SgiPlatform.dsc.inc
index 6679939d3b..4fe3ccf9a5 100644
--- a/Platform/ARM/SgiPkg/SgiPlatform.dsc.inc
+++ b/Platform/ARM/SgiPkg/SgiPlatform.dsc.inc
@@ -152,8 +152,8 @@
   gArmTokenSpaceGuid.PcdPciIoBase|0x0
   gArmTokenSpaceGuid.PcdPciIoSize|0x00800000
   gEfiMdePkgTokenSpaceGuid.PcdPciIoTranslation|0x77800000
-  gArmTokenSpaceGuid.PcdPciMmio32Translation|0x0
-  gArmTokenSpaceGuid.PcdPciMmio64Translation|0x0
+  gEfiMdePkgTokenSpaceGuid.PcdPciMmio32Translation|0x0
+  gEfiMdePkgTokenSpaceGuid.PcdPciMmio64Translation|0x0
   gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize|24
 
   ## PL011 - Serial Terminal
diff --git a/Platform/ARM/JunoPkg/Library/JunoPciHostBridgeLib/JunoPciHostBridgeLib.inf b/Platform/ARM/JunoPkg/Library/JunoPciHostBridgeLib/JunoPciHostBridgeLib.inf
index fb513d7b3d..f448803fda 100644
--- a/Platform/ARM/JunoPkg/Library/JunoPciHostBridgeLib/JunoPciHostBridgeLib.inf
+++ b/Platform/ARM/JunoPkg/Library/JunoPciHostBridgeLib/JunoPciHostBridgeLib.inf
@@ -55,10 +55,10 @@
   gEfiMdePkgTokenSpaceGuid.PcdPciIoTranslation
   gArmTokenSpaceGuid.PcdPciMmio32Base
   gArmTokenSpaceGuid.PcdPciMmio32Size
-  gArmTokenSpaceGuid.PcdPciMmio32Translation
+  gEfiMdePkgTokenSpaceGuid.PcdPciMmio32Translation
   gArmTokenSpaceGuid.PcdPciMmio64Base
   gArmTokenSpaceGuid.PcdPciMmio64Size
-  gArmTokenSpaceGuid.PcdPciMmio64Translation
+  gEfiMdePkgTokenSpaceGuid.PcdPciMmio64Translation
 
   gArmJunoTokenSpaceGuid.PcdPcieControlBaseAddress
   gArmJunoTokenSpaceGuid.PcdPcieRootPortBaseAddress
diff --git a/Platform/ARM/SgiPkg/Library/PciHostBridgeLib/PciHostBridgeLib.inf b/Platform/ARM/SgiPkg/Library/PciHostBridgeLib/PciHostBridgeLib.inf
index a9fdd874d0..0f53d67bc0 100644
--- a/Platform/ARM/SgiPkg/Library/PciHostBridgeLib/PciHostBridgeLib.inf
+++ b/Platform/ARM/SgiPkg/Library/PciHostBridgeLib/PciHostBridgeLib.inf
@@ -46,7 +46,7 @@
   gArmTokenSpaceGuid.PcdPciIoSize
   gArmTokenSpaceGuid.PcdPciMmio32Base
   gArmTokenSpaceGuid.PcdPciMmio32Size
-  gArmTokenSpaceGuid.PcdPciMmio32Translation
+  gEfiMdePkgTokenSpaceGuid.PcdPciMmio32Translation
   gArmTokenSpaceGuid.PcdPciMmio64Base
   gArmTokenSpaceGuid.PcdPciMmio64Size
 
-- 
2.17.1

[edk2-platforms][PATCH V2 3/9] Platform/Overdrive1000Board: Use PcdPciMmio(32)64Translation PCD from MdePkg

Abner Chang

#82107

Compliant with BZ: #3665
https://bugzilla.tianocore.org/show_bug.cgi?id=3665

PcdPciMmio(32)64Translation 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@...>
Cc: Ard Biesheuvel <ardb+tianocore@...>
Cc: Leif Lindholm <leif@...>
Cc: Daniel Schaefer <daniel.schaefer@...>
---
 Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc b/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc
index 0f61665cbb..57b9e9f381 100644
--- a/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc
+++ b/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc
@@ -392,11 +392,11 @@ DEFINE NUM_CORES    = 4
 
   gArmTokenSpaceGuid.PcdPciMmio32Base|0x40000000
   gArmTokenSpaceGuid.PcdPciMmio32Size|0x80000000
-  gArmTokenSpaceGuid.PcdPciMmio32Translation|0x0
+  gEfiMdePkgTokenSpaceGuid.PcdPciMmio32Translation|0x0
 
   gArmTokenSpaceGuid.PcdPciMmio64Base|0x100000000
   gArmTokenSpaceGuid.PcdPciMmio64Size|0x7F00000000
-  gArmTokenSpaceGuid.PcdPciMmio64Translation|0x0
+  gEfiMdePkgTokenSpaceGuid.PcdPciMmio64Translation|0x0
 
   ## Use PCI emulation for ATA PassThru
   # gEfiMdeModulePkgTokenSpaceGuid.PcdAtaPassThruPciEmulation|TRUE
-- 
2.17.1

[edk2-platforms][PATCH V2 1/9] Platform/OverdriveBoard: Use PcdPciMmio(32)64Translation PCD from MdePkg

Abner Chang

#82106

Compliant with BZ: #3665
https://bugzilla.tianocore.org/show_bug.cgi?id=3665

PcdPciMmio(32)64Translation 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@...>
Cc: Ard Biesheuvel <ardb+tianocore@...>
Cc: Leif Lindholm <leif@...>
Cc: Daniel Schaefer <daniel.schaefer@...>
---
 Platform/AMD/OverdriveBoard/OverdriveBoard.dsc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc b/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc
index 91b8c7792e..af20739120 100644
--- a/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc
+++ b/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc
@@ -403,11 +403,11 @@ DEFINE X64EMU_ENABLE  = FALSE
 
   gArmTokenSpaceGuid.PcdPciMmio32Base|0x40000000
   gArmTokenSpaceGuid.PcdPciMmio32Size|0x80000000
-  gArmTokenSpaceGuid.PcdPciMmio32Translation|0x0
+  gEfiMdePkgTokenSpaceGuid.PcdPciMmio32Translation|0x0
 
   gArmTokenSpaceGuid.PcdPciMmio64Base|0x100000000
   gArmTokenSpaceGuid.PcdPciMmio64Size|0x7F00000000
-  gArmTokenSpaceGuid.PcdPciMmio64Translation|0x0
+  gEfiMdePkgTokenSpaceGuid.PcdPciMmio64Translation|0x0
 
   ## Use PCI emulation for ATA PassThru
   # gEfiMdeModulePkgTokenSpaceGuid.PcdAtaPassThruPciEmulation|TRUE
-- 
2.17.1

[edk2-platforms][PATCH V2 2/9] Platform/CelloBoard: Use PcdPciMmio(32)64Translation PCD from MdePkg

Abner Chang

#82105

Compliant with BZ: #3665
https://bugzilla.tianocore.org/show_bug.cgi?id=3665

PcdPciMmio(32)64Translation 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@...>
Cc: Ard Biesheuvel <ardb+tianocore@...>
Cc: Leif Lindholm <leif@...>
Cc: Daniel Schaefer <daniel.schaefer@...>
---
 Platform/LeMaker/CelloBoard/CelloBoard.dsc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Platform/LeMaker/CelloBoard/CelloBoard.dsc b/Platform/LeMaker/CelloBoard/CelloBoard.dsc
index d826e34fdd..11d989cf34 100644
--- a/Platform/LeMaker/CelloBoard/CelloBoard.dsc
+++ b/Platform/LeMaker/CelloBoard/CelloBoard.dsc
@@ -393,11 +393,11 @@ DEFINE NUM_CORES    = 4
 
   gArmTokenSpaceGuid.PcdPciMmio32Base|0x40000000
   gArmTokenSpaceGuid.PcdPciMmio32Size|0x80000000
-  gArmTokenSpaceGuid.PcdPciMmio32Translation|0x0
+  gEfiMdePkgTokenSpaceGuid.PcdPciMmio32Translation|0x0
 
   gArmTokenSpaceGuid.PcdPciMmio64Base|0x100000000
   gArmTokenSpaceGuid.PcdPciMmio64Size|0x7F00000000
-  gArmTokenSpaceGuid.PcdPciMmio64Translation|0x0
+  gEfiMdePkgTokenSpaceGuid.PcdPciMmio64Translation|0x0
 
   ## ACPI (no tables < 4GB)
   gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiExposedTableVersions|0x20
-- 
2.17.1

[edk2-platforms][PATCH V2 0/9] Use PcdPciMmio(32)64Translation PCDs from MdePkg

Abner Chang

#82104

In V2: Fix the invalid email address.

This patch set fixes the build error caused by referring to
PcdPciMmio(32)64Translation under ArmPkg. It should use the ones from
MdePkg because of the PCD relocation (BZ:#3665).

https://bugzilla.tianocore.org/show_bug.cgi?id=3665

BZ:#3665 is to migrate some modules from ArmVirtPkg
to under OvmfPkg for the upcoming RiscVVirtPkg that can leverage
those modules without the dependency with Arm*Pkg.
Refer to below message of the pacthes of edk2 portion.
https://edk2.groups.io/g/devel/message/81306

Below PCDs are moved to under MdePkg and leverage by RiscVVirtPkg.
This change also remove the dependency on ArmPkg of OvmfPkg.
- PcdPciMmio32Translation
- PcdPciMmio64Translation

Signed-off-by: Abner Chang <abner.chang@...>
Cc: Ard Biesheuvel <ardb+tianocore@...>
Cc: Leif Lindholm <leif@...>
Cc: Daniel Schaefer <daniel.schaefer@...>
Cc: Thomas Abraham <thomas.abraham@...>
Cc: Sami Mujawar <sami.mujawar@...>
Cc: Graeme Gregory <graeme@...>
Cc: Radoslaw Biernacki <rad@...>
Cc: Peng Xie <xiepeng@...>
Cc: Ling Jia <jialing@...>
Cc: Yiqi Shu <shuyiqi@...>

Abner Chang (9):
  Platform/OverdriveBoard: Use PcdPciMmio(32)64Translation PCD from
    MdePkg
  Platform/CelloBoard: Use PcdPciMmio(32)64Translation PCD from MdePkg
  Platform/Overdrive1000Board: Use PcdPciMmio(32)64Translation PCD from
    MdePkg
  Silicon/Styx: Use PcdPciMmio(32)64Translation PCD from MdePkg
  Platform/ARM: Use PcdPciMmio(32)64Translation PCD from MdePkg
  Platform/SabaQemu: Use PcdPciMmio(32)64Translation PCD from MdePkg
  Silicon/SabaQemu: Use PcdPciMmio(32)64Translation PCD from MdePkg
  Platform/DurianPkg: Use PcdPciMmio(32)64Translation PCD from MdePkg
  Silicon/FT2000-4Pkg: Use PcdPciMmio(32)64Translation PCD from MdePkg

 Platform/ARM/SgiPkg/SgiPlatform.dsc.inc                       | 4 ++--
 Platform/AMD/OverdriveBoard/OverdriveBoard.dsc                | 4 ++--
 Platform/LeMaker/CelloBoard/CelloBoard.dsc                    | 4 ++--
 Platform/Phytium/DurianPkg/DurianPkg.dsc                      | 2 +-
 Platform/Qemu/SbsaQemu/SbsaQemu.dsc                           | 4 ++--
 Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc   | 4 ++--
 .../Library/JunoPciHostBridgeLib/JunoPciHostBridgeLib.inf     | 4 ++--
 .../ARM/SgiPkg/Library/PciHostBridgeLib/PciHostBridgeLib.inf  | 2 +-
 .../AmdStyxPciHostBridgeLib/AmdStyxPciHostBridgeLib.inf       | 4 ++--
 .../Phytium/FT2000-4Pkg/Library/PlatformLib/PlatformLib.inf   | 2 +-
 Silicon/Qemu/SbsaQemu/AcpiTables/AcpiTables.inf               | 4 ++--
 .../SbsaQemuPciHostBridgeLib/SbsaQemuPciHostBridgeLib.c       | 4 ++--
 12 files changed, 21 insertions(+), 21 deletions(-)

-- 
2.17.1

Re: [edk2-platforms][PATCH 1/9] Platform/OverdriveBoard: Use PcdPciMmio(32)64Translation PCD from MdePkg

Ard Biesheuvel

#82103

On Fri, 15 Oct 2021 at 09:58, Abner Chang <abner.chang@...> wrote:

Compliant with BZ: #3665
https://bugzilla.tianocore.org/show_bug.cgi?id=3665

PcdPciMmio(32)64Translation 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.
ArmVirtPkg??

Signed-off-by: Abner Chang <abner.chang@...>
Cc: Ard Biesheuvel <ardb+tianocore@...>
Cc: Leif Lindholm <leif@...>
Cc: Daniel Schaefer <daniel.schaefer@...>
---
 Platform/AMD/OverdriveBoard/OverdriveBoard.dsc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc b/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc
index 91b8c7792e..af20739120 100644
--- a/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc
+++ b/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc
@@ -403,11 +403,11 @@ DEFINE X64EMU_ENABLE  = FALSE

   gArmTokenSpaceGuid.PcdPciMmio32Base|0x40000000
   gArmTokenSpaceGuid.PcdPciMmio32Size|0x80000000
-  gArmTokenSpaceGuid.PcdPciMmio32Translation|0x0
+  gEfiMdePkgTokenSpaceGuid.PcdPciMmio32Translation|0x0

   gArmTokenSpaceGuid.PcdPciMmio64Base|0x100000000
   gArmTokenSpaceGuid.PcdPciMmio64Size|0x7F00000000
-  gArmTokenSpaceGuid.PcdPciMmio64Translation|0x0
+  gEfiMdePkgTokenSpaceGuid.PcdPciMmio64Translation|0x0

   ## Use PCI emulation for ATA PassThru
   # gEfiMdeModulePkgTokenSpaceGuid.PcdAtaPassThruPciEmulation|TRUE
--
2.17.1

[edk2-platforms][PATCH 4/9] Silicon/Styx: Use PcdPciMmio(32)64Translation PCD from MdePkg

Abner Chang

#82102

Compliant with BZ: #3665
https://bugzilla.tianocore.org/show_bug.cgi?id=3665

PcdPciMmio(32)64Translation 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@...>
Cc: Ard Biesheuvel <ardb+tianocore@...>
Cc: Leif Lindholm <leif@...>
Cc: Daniel Schaefer <daniel.schaefer@...>
---
 .../AmdStyxPciHostBridgeLib/AmdStyxPciHostBridgeLib.inf       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Silicon/AMD/Styx/Library/AmdStyxPciHostBridgeLib/AmdStyxPciHostBridgeLib.inf b/Silicon/AMD/Styx/Library/AmdStyxPciHostBridgeLib/AmdStyxPciHostBridgeLib.inf
index 31c973cd2a..76a3b5aee2 100644
--- a/Silicon/AMD/Styx/Library/AmdStyxPciHostBridgeLib/AmdStyxPciHostBridgeLib.inf
+++ b/Silicon/AMD/Styx/Library/AmdStyxPciHostBridgeLib/AmdStyxPciHostBridgeLib.inf
@@ -43,7 +43,7 @@
   gArmTokenSpaceGuid.PcdPciIoSize
   gArmTokenSpaceGuid.PcdPciMmio32Base
   gArmTokenSpaceGuid.PcdPciMmio32Size
-  gArmTokenSpaceGuid.PcdPciMmio32Translation
+  gEfiMdePkgTokenSpaceGuid.PcdPciMmio32Translation
   gArmTokenSpaceGuid.PcdPciMmio64Base
   gArmTokenSpaceGuid.PcdPciMmio64Size
-  gArmTokenSpaceGuid.PcdPciMmio64Translation
+  gEfiMdePkgTokenSpaceGuid.PcdPciMmio64Translation
-- 
2.17.1

[edk2-platforms][PATCH 5/9] Platform/ARM: Use PcdPciMmio(32)64Translation PCD from MdePkg

Abner Chang

#82101

Compliant with BZ: #3665
https://bugzilla.tianocore.org/show_bug.cgi?id=3665

PcdPciMmio(32)64Translation 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@...>
Cc: Ard Biesheuvel <ardb+tianocore@...>
Cc: Thomas Abraham <thomas.abraham@...>
Cc: Sami Mujawar <sami.mujawar@...>
Cc: Daniel Schaefer <daniel.schaefer@...>
---
 Platform/ARM/SgiPkg/SgiPlatform.dsc.inc                       | 4 ++--
 .../Library/JunoPciHostBridgeLib/JunoPciHostBridgeLib.inf     | 4 ++--
 .../ARM/SgiPkg/Library/PciHostBridgeLib/PciHostBridgeLib.inf  | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Platform/ARM/SgiPkg/SgiPlatform.dsc.inc b/Platform/ARM/SgiPkg/SgiPlatform.dsc.inc
index 6679939d3b..4fe3ccf9a5 100644
--- a/Platform/ARM/SgiPkg/SgiPlatform.dsc.inc
+++ b/Platform/ARM/SgiPkg/SgiPlatform.dsc.inc
@@ -152,8 +152,8 @@
   gArmTokenSpaceGuid.PcdPciIoBase|0x0
   gArmTokenSpaceGuid.PcdPciIoSize|0x00800000
   gEfiMdePkgTokenSpaceGuid.PcdPciIoTranslation|0x77800000
-  gArmTokenSpaceGuid.PcdPciMmio32Translation|0x0
-  gArmTokenSpaceGuid.PcdPciMmio64Translation|0x0
+  gEfiMdePkgTokenSpaceGuid.PcdPciMmio32Translation|0x0
+  gEfiMdePkgTokenSpaceGuid.PcdPciMmio64Translation|0x0
   gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize|24
 
   ## PL011 - Serial Terminal
diff --git a/Platform/ARM/JunoPkg/Library/JunoPciHostBridgeLib/JunoPciHostBridgeLib.inf b/Platform/ARM/JunoPkg/Library/JunoPciHostBridgeLib/JunoPciHostBridgeLib.inf
index fb513d7b3d..f448803fda 100644
--- a/Platform/ARM/JunoPkg/Library/JunoPciHostBridgeLib/JunoPciHostBridgeLib.inf
+++ b/Platform/ARM/JunoPkg/Library/JunoPciHostBridgeLib/JunoPciHostBridgeLib.inf
@@ -55,10 +55,10 @@
   gEfiMdePkgTokenSpaceGuid.PcdPciIoTranslation
   gArmTokenSpaceGuid.PcdPciMmio32Base
   gArmTokenSpaceGuid.PcdPciMmio32Size
-  gArmTokenSpaceGuid.PcdPciMmio32Translation
+  gEfiMdePkgTokenSpaceGuid.PcdPciMmio32Translation
   gArmTokenSpaceGuid.PcdPciMmio64Base
   gArmTokenSpaceGuid.PcdPciMmio64Size
-  gArmTokenSpaceGuid.PcdPciMmio64Translation
+  gEfiMdePkgTokenSpaceGuid.PcdPciMmio64Translation
 
   gArmJunoTokenSpaceGuid.PcdPcieControlBaseAddress
   gArmJunoTokenSpaceGuid.PcdPcieRootPortBaseAddress
diff --git a/Platform/ARM/SgiPkg/Library/PciHostBridgeLib/PciHostBridgeLib.inf b/Platform/ARM/SgiPkg/Library/PciHostBridgeLib/PciHostBridgeLib.inf
index a9fdd874d0..0f53d67bc0 100644
--- a/Platform/ARM/SgiPkg/Library/PciHostBridgeLib/PciHostBridgeLib.inf
+++ b/Platform/ARM/SgiPkg/Library/PciHostBridgeLib/PciHostBridgeLib.inf
@@ -46,7 +46,7 @@
   gArmTokenSpaceGuid.PcdPciIoSize
   gArmTokenSpaceGuid.PcdPciMmio32Base
   gArmTokenSpaceGuid.PcdPciMmio32Size
-  gArmTokenSpaceGuid.PcdPciMmio32Translation
+  gEfiMdePkgTokenSpaceGuid.PcdPciMmio32Translation
   gArmTokenSpaceGuid.PcdPciMmio64Base
   gArmTokenSpaceGuid.PcdPciMmio64Size
 
-- 
2.17.1