ArmPkg/ArmGic: Incorporate v3 code from ArmGicLib

Move the remaining code in ArmGicLib into ArmGicDxe, its only user, and
drop the dependency on ArmGicLib. Note that ArmGicDxe has an undeclared
dependency on ArmLib, so declare that instead.

Signed-off-by: Ard Biesheuvel <ardb@kernel.org>

ArmPkg/Drivers/ArmGic/ArmGicDxe.h

@@ -93,4 +93,50 @@ ArmGicGetMaxNumInterrupts (
   IN  UINTN  GicDistributorBase
   );
 
+UINT32
+EFIAPI
+ArmGicV3GetControlSystemRegisterEnable (
+  VOID
+  );
+
+VOID
+EFIAPI
+ArmGicV3SetControlSystemRegisterEnable (
+  IN UINT32  ControlSystemRegisterEnable
+  );
+
+VOID
+EFIAPI
+ArmGicV3EnableInterruptInterface (
+  VOID
+  );
+
+VOID
+EFIAPI
+ArmGicV3DisableInterruptInterface (
+  VOID
+  );
+
+UINTN
+EFIAPI
+ArmGicV3AcknowledgeInterrupt (
+  VOID
+  );
+
+VOID
+EFIAPI
+ArmGicV3EndOfInterrupt (
+  IN UINTN  Source
+  );
+
+VOID
+ArmGicV3SetBinaryPointer (
+  IN UINTN  BinaryPoint
+  );
+
+VOID
+ArmGicV3SetPriorityMask (
+  IN UINTN  Priority
+  );
+
 #endif // ARM_GIC_DXE_H_

ArmPkg/Drivers/ArmGic/ArmGicDxe.inf

@@ -24,13 +24,19 @@
   GicV2/ArmGicV2Dxe.c
   GicV3/ArmGicV3Dxe.c
 
+[Sources.ARM]
+  GicV3/Arm/ArmGicV3.S     | GCC
+
+[Sources.AARCH64]
+  GicV3/AArch64/ArmGicV3.S
+
 [Packages]
   MdePkg/MdePkg.dec
   EmbeddedPkg/EmbeddedPkg.dec
   ArmPkg/ArmPkg.dec
 
 [LibraryClasses]
-  ArmGicLib
+  ArmLib
   BaseLib
   UefiLib
   UefiBootServicesTableLib

ArmPkg/Include/Library/ArmGicLib.h

@@ -122,50 +122,4 @@
 
 #define ARM_GICD_IROUTER_IRM  BIT31
 
-UINT32
-EFIAPI
-ArmGicV3GetControlSystemRegisterEnable (
-  VOID
-  );
-
-VOID
-EFIAPI
-ArmGicV3SetControlSystemRegisterEnable (
-  IN UINT32  ControlSystemRegisterEnable
-  );
-
-VOID
-EFIAPI
-ArmGicV3EnableInterruptInterface (
-  VOID
-  );
-
-VOID
-EFIAPI
-ArmGicV3DisableInterruptInterface (
-  VOID
-  );
-
-UINTN
-EFIAPI
-ArmGicV3AcknowledgeInterrupt (
-  VOID
-  );
-
-VOID
-EFIAPI
-ArmGicV3EndOfInterrupt (
-  IN UINTN  Source
-  );
-
-VOID
-ArmGicV3SetBinaryPointer (
-  IN UINTN  BinaryPoint
-  );
-
-VOID
-ArmGicV3SetPriorityMask (
-  IN UINTN  Priority
-  );
-
 #endif // ARMGIC_H_