ArmPkg, ArmVirtPkg, MdePkg: move Arm GIC Pcds to MdePkg

In order to keep clean dependencies for UefiPayloadPkg, move the gic Pcds to MdePkg. Since this is very much a breaking change, update all the in-tree users with the new TokenSpaceId. Continuous-integration-options: PatchCheck.ignore-multi-package Signed-off-by: Leif Lindholm <[email protected]>
tianocore · Jan 16, 2025 · 0a3c65b · 0a3c65b
1 parent ab57010
commit 0a3c65b
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 29 deletions.
diff --git a/ArmPkg/ArmPkg.dec b/ArmPkg/ArmPkg.dec
@@ -326,14 +326,6 @@
   gArmTokenSpaceGuid.PcdGenericWatchdogRefreshBase|0x2A450000|UINT64|0x00000008
   gArmTokenSpaceGuid.PcdGenericWatchdogEl2IntrNum|93|UINT32|0x00000009
 
-  #
-  # ARM Generic Interrupt Controller
-  #
-  gArmTokenSpaceGuid.PcdGicDistributorBase|0|UINT64|0x0000000C
-  # Base address for the GIC Redistributor region that contains the boot CPU
-  gArmTokenSpaceGuid.PcdGicRedistributorsBase|0|UINT64|0x0000000E
-  gArmTokenSpaceGuid.PcdGicInterruptInterfaceBase|0|UINT64|0x0000000D
-
   #
   # Bases, sizes and translation offsets of IO and MMIO spaces, respectively.
   # Note that "IO" is just another MMIO range that simulates IO space; there

diff --git a/ArmPkg/Drivers/ArmGic/ArmGicDxe.inf b/ArmPkg/Drivers/ArmGic/ArmGicDxe.inf
@@ -48,9 +48,9 @@
   gEfiCpuArchProtocolGuid         ## CONSUMES ## NOTIFY
 
 [Pcd.common]
-  gArmTokenSpaceGuid.PcdGicDistributorBase
-  gArmTokenSpaceGuid.PcdGicRedistributorsBase
-  gArmTokenSpaceGuid.PcdGicInterruptInterfaceBase
+  gEfiMdePkgTokenSpaceGuid.PcdGicDistributorBase
+  gEfiMdePkgTokenSpaceGuid.PcdGicRedistributorsBase
+  gEfiMdePkgTokenSpaceGuid.PcdGicInterruptInterfaceBase
 
 [Depex]
   TRUE
diff --git a/ArmVirtPkg/ArmVirtCloudHv.dsc b/ArmVirtPkg/ArmVirtCloudHv.dsc
@@ -183,9 +183,9 @@
   #
   # ARM General Interrupt Controller
   #
-  gArmTokenSpaceGuid.PcdGicDistributorBase|0x0
-  gArmTokenSpaceGuid.PcdGicRedistributorsBase|0x0
-  gArmTokenSpaceGuid.PcdGicInterruptInterfaceBase|0x0
+  gEfiMdePkgTokenSpaceGuid.PcdGicDistributorBase|0x0
+  gEfiMdePkgTokenSpaceGuid.PcdGicRedistributorsBase|0x0
+  gEfiMdePkgTokenSpaceGuid.PcdGicInterruptInterfaceBase|0x0
 
   ## PL031 RealTimeClock
   gArmPlatformTokenSpaceGuid.PcdPL031RtcBase|0x0

diff --git a/ArmVirtPkg/ArmVirtKvmTool.dsc b/ArmVirtPkg/ArmVirtKvmTool.dsc
@@ -192,9 +192,9 @@
   #
   # ARM General Interrupt Controller
   #
-  gArmTokenSpaceGuid.PcdGicDistributorBase|0x0
-  gArmTokenSpaceGuid.PcdGicRedistributorsBase|0x0
-  gArmTokenSpaceGuid.PcdGicInterruptInterfaceBase|0x0
+  gEfiMdePkgTokenSpaceGuid.PcdGicDistributorBase|0x0
+  gEfiMdePkgTokenSpaceGuid.PcdGicRedistributorsBase|0x0
+  gEfiMdePkgTokenSpaceGuid.PcdGicInterruptInterfaceBase|0x0
 
   #
   # PCI settings

diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc
@@ -267,9 +267,9 @@
   #
   # ARM General Interrupt Controller
   #
-  gArmTokenSpaceGuid.PcdGicDistributorBase|0x0
-  gArmTokenSpaceGuid.PcdGicRedistributorsBase|0x0
-  gArmTokenSpaceGuid.PcdGicInterruptInterfaceBase|0x0
+  gEfiMdePkgTokenSpaceGuid.PcdGicDistributorBase|0x0
+  gEfiMdePkgTokenSpaceGuid.PcdGicRedistributorsBase|0x0
+  gEfiMdePkgTokenSpaceGuid.PcdGicInterruptInterfaceBase|0x0
 
   ## PL031 RealTimeClock
   gArmPlatformTokenSpaceGuid.PcdPL031RtcBase|0x0

diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc
@@ -230,9 +230,9 @@
   #
   # ARM General Interrupt Controller
   #
-  gArmTokenSpaceGuid.PcdGicDistributorBase|0x0
-  gArmTokenSpaceGuid.PcdGicRedistributorsBase|0x0
-  gArmTokenSpaceGuid.PcdGicInterruptInterfaceBase|0x0
+  gEfiMdePkgTokenSpaceGuid.PcdGicDistributorBase|0x0
+  gEfiMdePkgTokenSpaceGuid.PcdGicRedistributorsBase|0x0
+  gEfiMdePkgTokenSpaceGuid.PcdGicInterruptInterfaceBase|0x0
 
   ## PL031 RealTimeClock
   gArmPlatformTokenSpaceGuid.PcdPL031RtcBase|0x0

diff --git a/ArmVirtPkg/ArmVirtXen.dsc b/ArmVirtPkg/ArmVirtXen.dsc
@@ -126,9 +126,9 @@
   #
   # ARM General Interrupt Controller
   #
-  gArmTokenSpaceGuid.PcdGicDistributorBase|0x0
-  gArmTokenSpaceGuid.PcdGicRedistributorsBase|0x0
-  gArmTokenSpaceGuid.PcdGicInterruptInterfaceBase|0x0
+  gEfiMdePkgTokenSpaceGuid.PcdGicDistributorBase|0x0
+  gEfiMdePkgTokenSpaceGuid.PcdGicRedistributorsBase|0x0
+  gEfiMdePkgTokenSpaceGuid.PcdGicInterruptInterfaceBase|0x0
 
   gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|3
 

diff --git a/ArmVirtPkg/Library/ArmVirtGicArchLib/ArmVirtGicArchLib.inf b/ArmVirtPkg/Library/ArmVirtGicArchLib/ArmVirtGicArchLib.inf
@@ -37,9 +37,9 @@
   gFdtClientProtocolGuid                                ## CONSUMES
 
 [Pcd]
-  gArmTokenSpaceGuid.PcdGicDistributorBase
-  gArmTokenSpaceGuid.PcdGicRedistributorsBase
-  gArmTokenSpaceGuid.PcdGicInterruptInterfaceBase
+  gEfiMdePkgTokenSpaceGuid.PcdGicDistributorBase
+  gEfiMdePkgTokenSpaceGuid.PcdGicRedistributorsBase
+  gEfiMdePkgTokenSpaceGuid.PcdGicInterruptInterfaceBase
 
 [Depex]
   gFdtClientProtocolGuid
diff --git a/MdePkg/MdePkg.dec b/MdePkg/MdePkg.dec
@@ -2483,6 +2483,15 @@
   # @Prompt Time-out for a request, internal
   gEfiMdePkgTokenSpaceGuid.PcdIpmiSerialRequestRetryInterval|60000|UINT32|0x00000055
 
+[PcdsFixedAtBuild.common.AARCH64, PcdsFixedAtBuild.common.ARM, PcdsDynamic.common.AARCH64, PcdsDynamic.common.ARM]
+  #
+  # ARM Generic Interrupt Controller
+  #
+  gEfiMdePkgTokenSpaceGuid.PcdGicDistributorBase|0|UINT64|0x00000056
+  # Base address for the GIC Redistributor region that contains the boot CPU
+  gEfiMdePkgTokenSpaceGuid.PcdGicRedistributorsBase|0|UINT64|0x00000057
+  gEfiMdePkgTokenSpaceGuid.PcdGicInterruptInterfaceBase|0|UINT64|0x00000058
+
 [PcdsFixedAtBuild.AARCH64, PcdsPatchableInModule.AARCH64]
   ## GUID identifying the Rng algorithm implemented by CPU instruction.
   # @Prompt CPU Rng algorithm's GUID.