ArmPkg: Use PcdPciIoTranslation PCD from MdePkg

PcdPciIoTranslation PCD is relocated to MdePkg and leveraged by
both ARM and RISC-V arch. This patch removes the one from ArmPkg
and address the corresponding changes required for other modules
under ArmVirtPkg.

Signed-off-by: Abner Chang <abner.chang@hpe.com>
Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
Cc: Leif Lindholm <leif@nuviainc.com>
Cc: Sami Mujawar <sami.mujawar@arm.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Daniel Schaefer <daniel.schaefer@hpe.com>
Cc: Sunil V L <sunilvl@ventanamicro.com>
Reviewed-by: Daniel Schaefer <daniel.schaefer@hpe.com>
Reviewed-by: Sunil V L <sunilvl@ventanamicro.com>
Acked-by: Gerd Hoffmann <kraxel@redhat.com>

diff --git a/ArmPkg/ArmPkg.dec b/ArmPkg/ArmPkg.dec
index 6ed51edd0340605639d4b34f77bdb59dca1827be..12584fb3190dba658a694c4df2a3bbe3467d1069 100644 (file)
--- a/ArmPkg/ArmPkg.dec
+++ b/ArmPkg/ArmPkg.dec
@@ -337,7 +337,7 @@
   #   UINT64 Mmio32CpuBase; // mapping target in 64-bit cpu-physical space\r
   #   UINT64 Mmio64CpuBase; // mapping target in 64-bit cpu-physical space\r
   #\r
-  #   PcdPciIoTranslation     = IoCpuBase     - PcdPciIoBase;\r
+  #   gEfiMdePkgTokenSpaceGuid.PcdPciIoTranslation = IoCpuBase - PcdPciIoBase;\r
   #   PcdPciMmio32Translation = Mmio32CpuBase - (UINT64)PcdPciMmio32Base;\r
   #   PcdPciMmio64Translation = Mmio64CpuBase - PcdPciMmio64Base;\r
   #\r
@@ -356,7 +356,7 @@
   #   UINT64 TranslatedMmio64Address;   // output parameter\r
   #\r
   #   TranslatedIoAddress     = UntranslatedIoAddress +\r
-  #                             PcdPciIoTranslation;\r
+  #                             gEfiMdePkgTokenSpaceGuid.PcdPciIoTranslation;\r
   #   TranslatedMmio32Address = (UINT64)UntranslatedMmio32Address +\r
   #                             PcdPciMmio32Translation;\r
   #   TranslatedMmio64Address = UntranslatedMmio64Address +\r
@@ -369,7 +369,6 @@
   #\r
   gArmTokenSpaceGuid.PcdPciIoBase|0x0|UINT64|0x00000050\r
   gArmTokenSpaceGuid.PcdPciIoSize|0x0|UINT64|0x00000051\r
-  gArmTokenSpaceGuid.PcdPciIoTranslation|0x0|UINT64|0x00000052\r
   gArmTokenSpaceGuid.PcdPciMmio32Base|0x0|UINT32|0x00000053\r
   gArmTokenSpaceGuid.PcdPciMmio32Size|0x0|UINT32|0x00000054\r
   gArmTokenSpaceGuid.PcdPciMmio32Translation|0x0|UINT64|0x00000055\r

diff --git a/ArmPkg/Drivers/ArmPciCpuIo2Dxe/ArmPciCpuIo2Dxe.inf b/ArmPkg/Drivers/ArmPciCpuIo2Dxe/ArmPciCpuIo2Dxe.inf
index 2bc4571d06ef2a85b152d541657892f4433b202d..9339c2b532fb83476a5710006f7a70137c16e8fc 100644 (file)
--- a/ArmPkg/Drivers/ArmPciCpuIo2Dxe/ArmPciCpuIo2Dxe.inf
+++ b/ArmPkg/Drivers/ArmPciCpuIo2Dxe/ArmPciCpuIo2Dxe.inf
@@ -38,7 +38,7 @@
   UefiBootServicesTableLib\r
 \r
 [Pcd]\r
-  gArmTokenSpaceGuid.PcdPciIoTranslation\r
+  gEfiMdePkgTokenSpaceGuid.PcdPciIoTranslation\r
 \r
 [Protocols]\r
   gEfiCpuIo2ProtocolGuid                         ## PRODUCES\r

diff --git a/ArmVirtPkg/ArmVirtCloudHv.dsc b/ArmVirtPkg/ArmVirtCloudHv.dsc
index ffc6b8ed7ccb68d4de950a34599381cd84a0645e..a6ceef6faf38bd4b2f571cc36dcc52ff05c1af5f 100644 (file)
--- a/ArmVirtPkg/ArmVirtCloudHv.dsc
+++ b/ArmVirtPkg/ArmVirtCloudHv.dsc
@@ -193,7 +193,7 @@
   # PCD and PcdPciDisableBusEnumeration above have not been assigned yet\r
   gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0xFFFFFFFFFFFFFFFF\r
 \r
-  gArmTokenSpaceGuid.PcdPciIoTranslation|0\r
+  gEfiMdePkgTokenSpaceGuid.PcdPciIoTranslation|0\r
 \r
   gEfiSecurityPkgTokenSpaceGuid.PcdTpmBaseAddress|0x0\r
 \r

diff --git a/ArmVirtPkg/ArmVirtKvmTool.dsc b/ArmVirtPkg/ArmVirtKvmTool.dsc
index 745eae347b565903d9c998b52f4d88897d481b20..ff7050954271cdd931588f9b025cdefaa32d3c3a 100644 (file)
--- a/ArmVirtPkg/ArmVirtKvmTool.dsc
+++ b/ArmVirtPkg/ArmVirtKvmTool.dsc
@@ -184,7 +184,7 @@
   # PCD and PcdPciDisableBusEnumeration above have not been assigned yet\r
   gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0xFFFFFFFFFFFFFFFF\r
 \r
-  gArmTokenSpaceGuid.PcdPciIoTranslation|0x0\r
+  gEfiMdePkgTokenSpaceGuid.PcdPciIoTranslation|0x0\r
 \r
   #\r
   # Set video resolution for boot options and for text setup.\r

diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc
index 69e240240871e2aab94ee32745d32600d71dd494..f7e5ea8f744c895785c3a40bcf41a1530aa2549a 100644 (file)
--- a/ArmVirtPkg/ArmVirtQemu.dsc
+++ b/ArmVirtPkg/ArmVirtQemu.dsc
@@ -249,7 +249,7 @@
   # PCD and PcdPciDisableBusEnumeration above have not been assigned yet\r
   gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0xFFFFFFFFFFFFFFFF\r
 \r
-  gArmTokenSpaceGuid.PcdPciIoTranslation|0x0\r
+  gEfiMdePkgTokenSpaceGuid.PcdPciIoTranslation|0x0\r
 \r
   #\r
   # Set video resolution for boot options and for text setup.\r

diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc
index 6ffeabbd347271fe701110ccae58c63b893d5dfc..146b5731fe04490111c64aaa1421c5808f93e1c3 100644 (file)
--- a/ArmVirtPkg/ArmVirtQemuKernel.dsc
+++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc
@@ -228,7 +228,7 @@
   # PCD and PcdPciDisableBusEnumeration above have not been assigned yet\r
   gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0xFFFFFFFFFFFFFFFF\r
 \r
-  gArmTokenSpaceGuid.PcdPciIoTranslation|0x0\r
+  gEfiMdePkgTokenSpaceGuid.PcdPciIoTranslation|0x0\r
 \r
   #\r
   # Set video resolution for boot options and for text setup.\r

diff --git a/ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf b/ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf
index 1549f9d884fbed4ed4211ab48f4951aeecc351ef..f149693fa21a2cf5b0c6d0258247dfbe12eab17b 100644 (file)
--- a/ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf
+++ b/ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf
@@ -48,7 +48,7 @@
   gArmTokenSpaceGuid.PcdPciMmio64Translation\r
 \r
 [Pcd]\r
-  gArmTokenSpaceGuid.PcdPciIoTranslation\r
+  gEfiMdePkgTokenSpaceGuid.PcdPciIoTranslation\r
   gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress\r
 \r
 [Depex]\r

diff --git a/ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf b/ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
index bb055a5beb51a4795f540274151482755489c0da..1dfe779f6cf4d1c34e42ae562eae723afd252750 100644 (file)
--- a/ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
+++ b/ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
@@ -36,7 +36,7 @@
   gFdtClientProtocolGuid                                      ## CONSUMES\r
 \r
 [Pcd]\r
-  gArmTokenSpaceGuid.PcdPciIoTranslation                      ## PRODUCES\r
+  gEfiMdePkgTokenSpaceGuid.PcdPciIoTranslation                ## PRODUCES\r
   gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress           ## PRODUCES\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdPciDisableBusEnumeration  ## PRODUCES\r
 \r