ArmPkg: Renamed library 'PL390GicLib' into 'ArmGicLib'

This library is the interface for the ARM Generic Interrupt Controller
Architecture Specification.
ARM Platform can use any GIC controller (not necessary PL390 GIC).




git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12411 6f19259b-4bc3-4df7-8a09-765794883524

21 files changed, 292 insertions, 327 deletions

diff --git a/ArmPkg/ArmPkg.dsc b/ArmPkg/ArmPkg.dsc
index e3c1d6f757..0193621219 100644
--- a/ArmPkg/ArmPkg.dsc
+++ b/ArmPkg/ArmPkg.dsc
@@ -120,6 +120,7 @@
   ArmPkg/Drivers/CpuDxe/CpuDxe.inf
   ArmPkg/Drivers/CpuPei/CpuPei.inf
   ArmPkg/Drivers/PL390Gic/PL390GicDxe.inf
-  ArmPkg/Drivers/PL390Gic/PL390GicNonSec.inf
-  ArmPkg/Drivers/PL390Gic/PL390GicSec.inf
+  ArmPkg/Drivers/PL390Gic/PL390GicLib.inf
+  ArmPkg/Drivers/PL390Gic/PL390GicSecLib.inf
+
   ArmPkg/Filesystem/SemihostFs/SemihostFs.inf
diff --git a/ArmPkg/Drivers/PL390Gic/PL390Gic.c b/ArmPkg/Drivers/PL390Gic/PL390Gic.c
new file mode 100644
index 0000000000..9da5cc4b59
--- /dev/null
+++ b/ArmPkg/Drivers/PL390Gic/PL390Gic.c
@@ -0,0 +1,71 @@
+/** @file

+*

+*  Copyright (c) 2011, ARM Limited. All rights reserved.

+*  

+*  This program and the accompanying materials                          

+*  are licensed and made available under the terms and conditions of the BSD License         

+*  which accompanies this distribution.  The full text of the license may be found at        

+*  http://opensource.org/licenses/bsd-license.php                                            

+*

+*  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     

+*  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             

+*

+**/

+

+#include <Uefi.h>

+#include <Library/IoLib.h>

+#include <Library/ArmGicLib.h>

+

+VOID

+EFIAPI

+ArmGicSendSgiTo (

+  IN  INTN          GicDistributorBase,

+  IN  INTN          TargetListFilter,

+  IN  INTN          CPUTargetList

+  )

+{

+  MmioWrite32 (GicDistributorBase + ARM_GIC_ICDSGIR, ((TargetListFilter & 0x3) << 24) | ((CPUTargetList & 0xFF) << 16));

+}

+

+UINT32

+EFIAPI

+ArmGicAcknowledgeSgiFrom (

+  IN  INTN          GicInterruptInterfaceBase,

+  IN  INTN          CoreId

+  )

+{

+  INTN            InterruptId;

+

+  InterruptId = MmioRead32 (GicInterruptInterfaceBase + ARM_GIC_ICCIAR);

+

+  // Check if the Interrupt ID is valid, The read from Interrupt Ack register returns CPU ID and Interrupt ID

+  if (((CoreId & 0x7) << 10) == (InterruptId & 0x1C00)) {

+    // Got SGI number 0 hence signal End of Interrupt by writing to ICCEOIR

+    MmioWrite32 (GicInterruptInterfaceBase + ARM_GIC_ICCEIOR, InterruptId);

+    return 1;

+  } else {

+    return 0;

+  }

+}

+

+UINT32

+EFIAPI

+ArmGicAcknowledgeSgi2From (

+  IN  INTN          GicInterruptInterfaceBase,

+  IN  INTN          CoreId,

+  IN  INTN          SgiId

+  )

+{

+  INTN            InterruptId;

+

+  InterruptId = MmioRead32(GicInterruptInterfaceBase + ARM_GIC_ICCIAR);

+

+  // Check if the Interrupt ID is valid, The read from Interrupt Ack register returns CPU ID and Interrupt ID

+  if((((CoreId & 0x7) << 10) | (SgiId & 0x3FF)) == (InterruptId & 0x1FFF)) {

+    // Got SGI number 0 hence signal End of Interrupt by writing to ICCEOIR

+    MmioWrite32 (GicInterruptInterfaceBase + ARM_GIC_ICCEIOR, InterruptId);

+    return 1;

+  } else {

+    return 0;

+  }

+}

diff --git a/ArmPkg/Drivers/PL390Gic/PL390GicDxe.c b/ArmPkg/Drivers/PL390Gic/PL390GicDxe.c
index 02853a2f31..d352dcaee0 100644
--- a/ArmPkg/Drivers/PL390Gic/PL390GicDxe.c
+++ b/ArmPkg/Drivers/PL390Gic/PL390GicDxe.c
@@ -29,25 +29,24 @@ Abstract:
 #include <Library/UefiLib.h>
 #include <Library/PcdLib.h>
 #include <Library/IoLib.h>
+#include <Library/ArmGicLib.h>
 
 #include <Protocol/Cpu.h>
 #include <Protocol/HardwareInterrupt.h>
 
-#include <Drivers/PL390Gic.h>
-
 // number of 32-bit registers needed to represent those interrupts as a bit
 // (used for enable set, enable clear, pending set, pending clear, and active regs)
-#define GIC_NUM_REG_PER_INT_BITS   (PcdGet32(PcdGicNumInterrupts) / 32)
+#define ARM_GIC_NUM_REG_PER_INT_BITS   (PcdGet32(PcdGicNumInterrupts) / 32)
 
 // number of 32-bit registers needed to represent those interrupts as two bits
 // (used for configuration reg)
-#define GIC_NUM_REG_PER_INT_CFG    (PcdGet32(PcdGicNumInterrupts) / 16)
+#define ARM_GIC_NUM_REG_PER_INT_CFG    (PcdGet32(PcdGicNumInterrupts) / 16)
 
 // number of 32-bit registers needed to represent interrupts as 8-bit priority field
 // (used for priority regs)
-#define GIC_NUM_REG_PER_INT_BYTES  (PcdGet32(PcdGicNumInterrupts) / 4)
+#define ARM_GIC_NUM_REG_PER_INT_BYTES  (PcdGet32(PcdGicNumInterrupts) / 4)
 
-#define GIC_DEFAULT_PRIORITY  0x80
+#define ARM_GIC_DEFAULT_PRIORITY  0x80
 
 extern EFI_HARDWARE_INTERRUPT_PROTOCOL gHardwareInterruptProtocol;
 
@@ -130,7 +129,7 @@ EnableInterruptSource (
   RegShift = Source % 32;
 
   // write set-enable register
-  MmioWrite32 (PcdGet32(PcdGicDistributorBase) + GIC_ICDISER + (4*RegOffset), 1 << RegShift);
+  MmioWrite32 (PcdGet32(PcdGicDistributorBase) + ARM_GIC_ICDISER + (4*RegOffset), 1 << RegShift);
   
   return EFI_SUCCESS;
 }
@@ -165,7 +164,7 @@ DisableInterruptSource (
   RegShift = Source % 32;
 
   // Write set-enable register
-  MmioWrite32 (PcdGet32(PcdGicDistributorBase) + GIC_ICDICER + (4*RegOffset), 1 << RegShift);
+  MmioWrite32 (PcdGet32(PcdGicDistributorBase) + ARM_GIC_ICDICER + (4*RegOffset), 1 << RegShift);
   
   return EFI_SUCCESS;
 }
@@ -201,7 +200,7 @@ GetInterruptSourceState (
   RegOffset = Source / 32;
   RegShift = Source % 32;
     
-  if ((MmioRead32 (PcdGet32(PcdGicDistributorBase) + GIC_ICDISER + (4*RegOffset)) & (1<<RegShift)) == 0) {
+  if ((MmioRead32 (PcdGet32(PcdGicDistributorBase) + ARM_GIC_ICDISER + (4*RegOffset)) & (1<<RegShift)) == 0) {
     *InterruptState = FALSE;
   } else {
     *InterruptState = TRUE;
@@ -233,7 +232,7 @@ EndOfInterrupt (
     return EFI_UNSUPPORTED;
   }
 
-  MmioWrite32 (PcdGet32(PcdGicInterruptInterfaceBase) + GIC_ICCEIOR, Source);
+  MmioWrite32 (PcdGet32(PcdGicInterruptInterfaceBase) + ARM_GIC_ICCEIOR, Source);
   return EFI_SUCCESS;
 }
 
@@ -258,9 +257,10 @@ IrqInterruptHandler (
   UINT32                      GicInterrupt;
   HARDWARE_INTERRUPT_HANDLER  InterruptHandler;
 
-  GicInterrupt = MmioRead32 (PcdGet32(PcdGicInterruptInterfaceBase) + GIC_ICCIAR);
+  GicInterrupt = MmioRead32 (PcdGet32(PcdGicInterruptInterfaceBase) + ARM_GIC_ICCIAR);
+  //TODO: Comment me
   if (GicInterrupt >= PcdGet32(PcdGicNumInterrupts)) {
-    MmioWrite32 (PcdGet32(PcdGicInterruptInterfaceBase) + GIC_ICCEIOR, GicInterrupt);
+    MmioWrite32 (PcdGet32(PcdGicInterruptInterfaceBase) + ARM_GIC_ICCEIOR, GicInterrupt);
     return;
   }
   
@@ -323,11 +323,11 @@ ExitBootServicesEvent (
   }
 
   // Disable Gic Interface
-  MmioWrite32 (PcdGet32(PcdGicInterruptInterfaceBase) + GIC_ICCICR, 0x0);
-  MmioWrite32 (PcdGet32(PcdGicInterruptInterfaceBase) + GIC_ICCPMR, 0x0);
+  MmioWrite32 (PcdGet32(PcdGicInterruptInterfaceBase) + ARM_GIC_ICCICR, 0x0);
+  MmioWrite32 (PcdGet32(PcdGicInterruptInterfaceBase) + ARM_GIC_ICCPMR, 0x0);
 
   // Disable Gic Distributor
-  MmioWrite32 (PcdGet32(PcdGicDistributorBase) + GIC_ICDDCR, 0x0);
+  MmioWrite32 (PcdGet32(PcdGicDistributorBase) + ARM_GIC_ICDDCR, 0x0);
 }
 
 /**
@@ -363,28 +363,28 @@ InterruptDxeInitialize (
     RegOffset = Index / 4;
     RegShift = (Index % 4) * 8;
     MmioAndThenOr32 (
-      PcdGet32(PcdGicDistributorBase) + GIC_ICDIPR + (4*RegOffset),
+      PcdGet32(PcdGicDistributorBase) + ARM_GIC_ICDIPR + (4*RegOffset),
       ~(0xff << RegShift), 
-      GIC_DEFAULT_PRIORITY << RegShift
+      ARM_GIC_DEFAULT_PRIORITY << RegShift
       );
   }
 
   // Configure interrupts for cpu 0
-  for (Index = 0; Index < GIC_NUM_REG_PER_INT_BYTES; Index++) {
-    MmioWrite32 (PcdGet32(PcdGicDistributorBase) + GIC_ICDIPTR + (Index*4), 0x01010101);
+  for (Index = 0; Index < ARM_GIC_NUM_REG_PER_INT_BYTES; Index++) {
+    MmioWrite32 (PcdGet32(PcdGicDistributorBase) + ARM_GIC_ICDIPTR + (Index*4), 0x01010101);
   }
 
   // Set binary point reg to 0x7 (no preemption)
-  MmioWrite32 (PcdGet32(PcdGicInterruptInterfaceBase) + GIC_ICCBPR, 0x7);
+  MmioWrite32 (PcdGet32(PcdGicInterruptInterfaceBase) + ARM_GIC_ICCBPR, 0x7);
 
   // Set priority mask reg to 0xff to allow all priorities through
-  MmioWrite32 (PcdGet32(PcdGicInterruptInterfaceBase) + GIC_ICCPMR, 0xff);
+  MmioWrite32 (PcdGet32(PcdGicInterruptInterfaceBase) + ARM_GIC_ICCPMR, 0xff);
   
   // Enable gic cpu interface
-  MmioWrite32 (PcdGet32(PcdGicInterruptInterfaceBase) + GIC_ICCICR, 0x1);
+  MmioWrite32 (PcdGet32(PcdGicInterruptInterfaceBase) + ARM_GIC_ICCICR, 0x1);
 
   // Enable gic distributor
-  MmioWrite32 (PcdGet32(PcdGicDistributorBase) + GIC_ICDDCR, 0x1);
+  MmioWrite32 (PcdGet32(PcdGicDistributorBase) + ARM_GIC_ICDDCR, 0x1);
   
   ZeroMem (&gRegisteredInterruptHandlers, sizeof (gRegisteredInterruptHandlers));
   
diff --git a/ArmPkg/Drivers/PL390Gic/PL390GicDxe.inf b/ArmPkg/Drivers/PL390Gic/PL390GicDxe.inf
index 3baa902a63..48ae8ba82d 100644
--- a/ArmPkg/Drivers/PL390Gic/PL390GicDxe.inf
+++ b/ArmPkg/Drivers/PL390Gic/PL390GicDxe.inf
@@ -24,7 +24,6 @@
 [Sources.common]
   PL390GicDxe.c
 
-
 [Packages]
   MdePkg/MdePkg.dec
   EmbeddedPkg/EmbeddedPkg.dec
@@ -39,9 +38,6 @@
   UefiDriverEntryPoint
   IoLib
 
-[Guids]
-  
-
 [Protocols]
   gHardwareInterruptProtocolGuid
   gEfiCpuArchProtocolGuid
diff --git a/ArmPkg/Drivers/PL390Gic/PL390GicNonSec.inf b/ArmPkg/Drivers/PL390Gic/PL390GicLib.inf
index f5ffd7febb..cae5c2b24c 100644
--- a/ArmPkg/Drivers/PL390Gic/PL390GicNonSec.inf
+++ b/ArmPkg/Drivers/PL390Gic/PL390GicLib.inf
@@ -13,17 +13,16 @@
 

 [Defines]

   INF_VERSION                    = 0x00010005

-  BASE_NAME                      = PL390GicNonSec

+  BASE_NAME                      = PL390GicLib

   FILE_GUID                      = 03d05ee4-cdeb-458c-9dfc-993f09bdf405

   MODULE_TYPE                    = SEC

   VERSION_STRING                 = 1.0

-  LIBRARY_CLASS                  = PL390GicNonSecLib

+  LIBRARY_CLASS                  = ArmGicLib

 

 [Sources]

+  PL390Gic.c

   PL390GicNonSec.c

 

 [Packages]

   ArmPkg/ArmPkg.dec

   MdePkg/MdePkg.dec

-

-[FixedPcd]

diff --git a/ArmPkg/Drivers/PL390Gic/PL390GicNonSec.c b/ArmPkg/Drivers/PL390Gic/PL390GicNonSec.c
index c2089fe846..09ef00b85f 100644
--- a/ArmPkg/Drivers/PL390Gic/PL390GicNonSec.c
+++ b/ArmPkg/Drivers/PL390Gic/PL390GicNonSec.c
@@ -14,12 +14,12 @@
 

 #include <Uefi.h>

 #include <Library/IoLib.h>

-#include <Drivers/PL390Gic.h>

+#include <Library/ArmGicLib.h>

 

 

 VOID

 EFIAPI

-PL390GicEnableInterruptInterface (

+ArmGicEnableInterruptInterface (

   IN  INTN          GicInterruptInterfaceBase

   )

 {  

@@ -27,12 +27,12 @@ PL390GicEnableInterruptInterface (
   * Enable the CPU interface in Non-Secure world

   * Note: The ICCICR register is banked when Security extensions are implemented

   */

-  MmioWrite32 (GicInterruptInterfaceBase + GIC_ICCICR,0x00000001);

+  MmioWrite32 (GicInterruptInterfaceBase + ARM_GIC_ICCICR,0x00000001);

 }

 

 VOID

 EFIAPI

-PL390GicEnableDistributor (

+ArmGicEnableDistributor (

   IN  INTN          GicDistributorBase

   )

 {

@@ -40,59 +40,5 @@ PL390GicEnableDistributor (
    * Enable GIC distributor in Non-Secure world.

    * Note: The ICDDCR register is banked when Security extensions are implemented

    */

-  MmioWrite32 (GicDistributorBase + GIC_ICDDCR, 0x00000001);

-}

-

-VOID

-EFIAPI

-PL390GicSendSgiTo (

-  IN  INTN          GicDistributorBase,

-  IN  INTN          TargetListFilter,

-  IN  INTN          CPUTargetList

-  )

-{

-  MmioWrite32 (GicDistributorBase + GIC_ICDSGIR, ((TargetListFilter & 0x3) << 24) | ((CPUTargetList & 0xFF) << 16));

-}

-

-UINT32

-EFIAPI

-PL390GicAcknowledgeSgiFrom (

-  IN  INTN          GicInterruptInterfaceBase,

-  IN  INTN          CoreId

-  )

-{

-  INTN            InterruptId;

-

-  InterruptId = MmioRead32 (GicInterruptInterfaceBase + GIC_ICCIAR);

-

-  // Check if the Interrupt ID is valid, The read from Interrupt Ack register returns CPU ID and Interrupt ID

-  if (((CoreId & 0x7) << 10) == (InterruptId & 0x1C00)) {

-    // Got SGI number 0 hence signal End of Interrupt by writing to ICCEOIR

-    MmioWrite32 (GicInterruptInterfaceBase + GIC_ICCEIOR, InterruptId);

-    return 1;

-  } else {

-    return 0;

-  }

-}

-

-UINT32

-EFIAPI

-PL390GicAcknowledgeSgi2From (

-  IN  INTN          GicInterruptInterfaceBase,

-  IN  INTN          CoreId,

-  IN  INTN          SgiId

-  )

-{

-  INTN            InterruptId;

-

-  InterruptId = MmioRead32(GicInterruptInterfaceBase + GIC_ICCIAR);

-

-  // Check if the Interrupt ID is valid, The read from Interrupt Ack register returns CPU ID and Interrupt ID

-  if((((CoreId & 0x7) << 10) | (SgiId & 0x3FF)) == (InterruptId & 0x1FFF)) {

-    // Got SGI number 0 hence signal End of Interrupt by writing to ICCEOIR

-    MmioWrite32 (GicInterruptInterfaceBase + GIC_ICCEIOR, InterruptId);

-    return 1;

-  } else {

-    return 0;

-  }

+  MmioWrite32 (GicDistributorBase + ARM_GIC_ICDDCR, 0x00000001);

 }

diff --git a/ArmPkg/Drivers/PL390Gic/PL390GicSec.c b/ArmPkg/Drivers/PL390Gic/PL390GicSec.c
index bf4c010b70..244f9ecf2a 100644
--- a/ArmPkg/Drivers/PL390Gic/PL390GicSec.c
+++ b/ArmPkg/Drivers/PL390Gic/PL390GicSec.c
@@ -14,7 +14,7 @@
 

 #include <Uefi.h>

 #include <Library/IoLib.h>

-#include <Drivers/PL390Gic.h>

+#include <Library/ArmGicLib.h>

 

 /*

  * This function configures the all interrupts to be Non-secure.

@@ -22,114 +22,59 @@
  */

 VOID

 EFIAPI

-PL390GicSetupNonSecure (

+ArmGicSetupNonSecure (

   IN  INTN          GicDistributorBase,

   IN  INTN          GicInterruptInterfaceBase

   )

 {

-  UINTN CachedPriorityMask = MmioRead32(GicInterruptInterfaceBase + GIC_ICCPMR);

+  UINTN CachedPriorityMask = MmioRead32(GicInterruptInterfaceBase + ARM_GIC_ICCPMR);

 

   // Set priority Mask so that no interrupts get through to CPU

-  MmioWrite32(GicInterruptInterfaceBase + GIC_ICCPMR, 0);

+  MmioWrite32(GicInterruptInterfaceBase + ARM_GIC_ICCPMR, 0);

 

   // Check if there are any pending interrupts

-  while(0 != (MmioRead32(GicDistributorBase + GIC_ICDICPR) & 0xF)) {

+  //TODO: could be extended to take Peripheral interrupts into consideration, but at the moment only SGI's are taken into consideration.

+  while(0 != (MmioRead32(GicDistributorBase + ARM_GIC_ICDICPR) & 0xF)) {

     // Some of the SGI's are still pending, read Ack register and send End of Interrupt Signal

-    UINTN InterruptId = MmioRead32(GicInterruptInterfaceBase + GIC_ICCIAR);

+    UINTN InterruptId = MmioRead32(GicInterruptInterfaceBase + ARM_GIC_ICCIAR);

 

     // Write to End of interrupt signal

-    MmioWrite32(GicInterruptInterfaceBase + GIC_ICCEIOR, InterruptId);

+    MmioWrite32(GicInterruptInterfaceBase + ARM_GIC_ICCEIOR, InterruptId);

   }

 

   // Ensure all GIC interrupts are Non-Secure

-  MmioWrite32(GicDistributorBase + GIC_ICDISR, 0xffffffff);     // IRQs  0-31 are Non-Secure : Private Peripheral Interrupt[31:16] & Software Generated Interrupt[15:0]

-  MmioWrite32(GicDistributorBase + GIC_ICDISR + 4, 0xffffffff); // IRQs 32-63 are Non-Secure : Shared Peripheral Interrupt

-  MmioWrite32(GicDistributorBase + GIC_ICDISR + 8, 0xffffffff); // And another 32 in case we're on the testchip : Shared Peripheral Interrupt (2)

+  MmioWrite32(GicDistributorBase + ARM_GIC_ICDISR, 0xffffffff);     // IRQs  0-31 are Non-Secure : Private Peripheral Interrupt[31:16] & Software Generated Interrupt[15:0]

+  MmioWrite32(GicDistributorBase + ARM_GIC_ICDISR + 4, 0xffffffff); // IRQs 32-63 are Non-Secure : Shared Peripheral Interrupt

+  MmioWrite32(GicDistributorBase + ARM_GIC_ICDISR + 8, 0xffffffff); // And another 32 in case we're on the testchip : Shared Peripheral Interrupt (2)

 

   // Ensure all interrupts can get through the priority mask

-  MmioWrite32(GicInterruptInterfaceBase + GIC_ICCPMR, CachedPriorityMask);

+  MmioWrite32(GicInterruptInterfaceBase + ARM_GIC_ICCPMR, CachedPriorityMask);

 }

 

 VOID

 EFIAPI

-PL390GicEnableInterruptInterface (

+ArmGicEnableInterruptInterface (

   IN  INTN          GicInterruptInterfaceBase

   )

 {

-  MmioWrite32(GicInterruptInterfaceBase + GIC_ICCPMR, 0x000000FF);  /* Set Priority Mask to allow interrupts */

+  MmioWrite32(GicInterruptInterfaceBase + ARM_GIC_ICCPMR, 0x000000FF);  /* Set Priority Mask to allow interrupts */

 

   /*

    * Enable CPU interface in Secure world

      * Enable CPU inteface in Non-secure World

    * Signal Secure Interrupts to CPU using FIQ line *

    */

-  MmioWrite32(GicInterruptInterfaceBase + GIC_ICCICR,

-      GIC_ICCICR_ENABLE_SECURE(1) |

-      GIC_ICCICR_ENABLE_NS(1) |

-      GIC_ICCICR_ACK_CTL(0) |

-      GIC_ICCICR_SIGNAL_SECURE_TO_FIQ(1) |

-      GIC_ICCICR_USE_SBPR(0));

+  MmioWrite32(GicInterruptInterfaceBase + ARM_GIC_ICCICR,

+      ARM_GIC_ICCICR_ENABLE_SECURE |

+      ARM_GIC_ICCICR_ENABLE_NS |

+      ARM_GIC_ICCICR_SIGNAL_SECURE_TO_FIQ);

 }

 

 VOID

 EFIAPI

-PL390GicEnableDistributor (

+ArmGicEnableDistributor (

   IN  INTN          GicDistributorBase

   )

 {

-  MmioWrite32(GicDistributorBase + GIC_ICDDCR, 1);               // turn on the GIC distributor

-}

-

-VOID

-EFIAPI

-PL390GicSendSgiTo (

-  IN  INTN          GicDistributorBase,

-  IN  INTN          TargetListFilter,

-  IN  INTN          CPUTargetList

-  )

-{

-  MmioWrite32(GicDistributorBase + GIC_ICDSGIR, ((TargetListFilter & 0x3) << 24) | ((CPUTargetList & 0xFF) << 16));

-}

-

-UINT32

-EFIAPI

-PL390GicAcknowledgeSgiFrom (

-  IN  INTN          GicInterruptInterfaceBase,

-  IN  INTN          CoreId

-  )

-{

-  INTN            InterruptId;

-

-  InterruptId = MmioRead32(GicInterruptInterfaceBase + GIC_ICCIAR);

-

-  // Check if the Interrupt ID is valid, The read from Interrupt Ack register returns CPU ID and Interrupt ID

-  if (((CoreId & 0x7) << 10) == (InterruptId & 0x1C00)) {

-    // Got SGI number 0 hence signal End of Interrupt by writing to ICCEOIR

-    MmioWrite32(GicInterruptInterfaceBase + GIC_ICCEIOR, InterruptId);

-    return 1;

-  } else {

-    return 0;

-  }

-}

-

-UINT32

-EFIAPI

-PL390GicAcknowledgeSgi2From (

-  IN  INTN          GicInterruptInterfaceBase,

-  IN  INTN          CoreId,

-  IN  INTN          SgiId

-  )

-{

-  INTN            InterruptId;

-

-  InterruptId = MmioRead32(GicInterruptInterfaceBase + GIC_ICCIAR);

-

-  // Check if the Interrupt ID is valid, The read from Interrupt Ack register returns CPU ID and Interrupt ID

-  if((((CoreId & 0x7) << 10) | (SgiId & 0x3FF)) == (InterruptId & 0x1FFF)) {

-    // Got SGI number 0 hence signal End of Interrupt by writing to ICCEOIR

-    MmioWrite32(GicInterruptInterfaceBase + GIC_ICCEIOR, InterruptId);

-    return 1;

-  } else {

-    return 0;

-  }

+  MmioWrite32(GicDistributorBase + ARM_GIC_ICDDCR, 1);               // turn on the GIC distributor

 }

diff --git a/ArmPkg/Drivers/PL390Gic/PL390GicSec.inf b/ArmPkg/Drivers/PL390Gic/PL390GicSecLib.inf
index 9cbdb6e8b3..fdec5c68d3 100644
--- a/ArmPkg/Drivers/PL390Gic/PL390GicSec.inf
+++ b/ArmPkg/Drivers/PL390Gic/PL390GicSecLib.inf
@@ -13,17 +13,16 @@
 

 [Defines]

   INF_VERSION                    = 0x00010005

-  BASE_NAME                      = PL390GicSec

+  BASE_NAME                      = PL390GicSecLib

   FILE_GUID                      = 85f3cf80-b5f4-11df-9855-0002a5d5c51b

   MODULE_TYPE                    = SEC

   VERSION_STRING                 = 1.0

-  LIBRARY_CLASS                  = PL390GicSecLib

+  LIBRARY_CLASS                  = ArmGicSecLib

 

 [Sources]

+  PL390Gic.c

   PL390GicSec.c

 

 [Packages]

   ArmPkg/ArmPkg.dec

   MdePkg/MdePkg.dec

-

-[FixedPcd]

diff --git a/ArmPkg/Include/Drivers/PL390Gic.h b/ArmPkg/Include/Drivers/PL390Gic.h
deleted file mode 100644
index 823e6c0200..0000000000
--- a/ArmPkg/Include/Drivers/PL390Gic.h
+++ /dev/null
@@ -1,120 +0,0 @@
-/** @file

-*

-*  Copyright (c) 2011, ARM Limited. All rights reserved.

-*  

-*  This program and the accompanying materials                          

-*  are licensed and made available under the terms and conditions of the BSD License         

-*  which accompanies this distribution.  The full text of the license may be found at        

-*  http://opensource.org/licenses/bsd-license.php                                            

-*

-*  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     

-*  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             

-*

-**/

-

-#ifndef __PL390GIC_H

-#define __PL390GIC_H

-

-//

-// GIC definitions

-//

-

-// Distributor

-#define GIC_ICDDCR          0x000 // Distributor Control Register

-#define GIC_ICDICTR         0x004 // Interrupt Controller Type Register

-#define GIC_ICDIIDR         0x008 // Implementer Identification Register

-

-// each reg base below repeats for VE_NUM_GIC_REG_PER_INT_BITS (see GIC spec)

-#define GIC_ICDISR          0x080 // Interrupt Security Registers

-#define GIC_ICDISER         0x100 // Interrupt Set-Enable Registers

-#define GIC_ICDICER         0x180 // Interrupt Clear-Enable Registers

-#define GIC_ICDSPR          0x200 // Interrupt Set-Pending Registers

-#define GIC_ICDICPR         0x280 // Interrupt Clear-Pending Registers

-#define GIC_ICDABR          0x300 // Active Bit Registers

-

-// each reg base below repeats for VE_NUM_GIC_REG_PER_INT_BYTES

-#define GIC_ICDIPR          0x400 // Interrupt Priority Registers

-

-// each reg base below repeats for VE_NUM_GIC_INTERRUPTS

-#define GIC_ICDIPTR         0x800 // Interrupt Processor Target Registers

-#define GIC_ICDICFR         0xC00 // Interrupt Configuration Registers

-

-// just one of these

-#define GIC_ICDSGIR         0xF00 // Software Generated Interrupt Register

-

-// Cpu interface

-#define GIC_ICCICR          0x00  // CPU Interface Control Register

-#define GIC_ICCPMR          0x04  // Interrupt Priority Mask Register

-#define GIC_ICCBPR          0x08  // Binary Point Register

-#define GIC_ICCIAR          0x0C  // Interrupt Acknowledge Register

-#define GIC_ICCEIOR         0x10  // End Of Interrupt Register

-#define GIC_ICCRPR          0x14  // Running Priority Register

-#define GIC_ICCPIR          0x18  // Highest Pending Interrupt Register

-#define GIC_ICCABPR         0x1C  // Aliased Binary Point Register

-#define GIC_ICCIDR          0xFC  // Identification Register

-

-#define GIC_ICDSGIR_FILTER_TARGETLIST       0x0

-#define GIC_ICDSGIR_FILTER_EVERYONEELSE     0x1

-#define GIC_ICDSGIR_FILTER_ITSELF           0x2

-

-//Bit-masks to configure the CPU Interface Control register

-#define GIC_ICCICR_ENABLE_SECURE(a)       ((a << 0) & 0x01)

-#define GIC_ICCICR_ENABLE_NS(a)           ((a << 1) & 0x02)

-#define GIC_ICCICR_ACK_CTL(a)             ((a << 2) & 0x04)

-#define GIC_ICCICR_SIGNAL_SECURE_TO_FIQ(a)((a << 3) & 0x08)

-#define GIC_ICCICR_USE_SBPR(a)            ((a << 4) & 0x10)

-

-

-//

-// GIC SEC interfaces

-//

-VOID

-EFIAPI

-PL390GicSetupNonSecure (

-  IN  INTN          GicDistributorBase,

-  IN  INTN          GicInterruptInterfaceBase

-  );

-

-VOID

-EFIAPI

-PL390GicEnableInterruptInterface (

-  IN  INTN          GicInterruptInterfaceBase

-  );

-

-VOID

-EFIAPI

-PL390GicEnableDistributor (

-  IN  INTN          GicDistributorBase

-  );

-

-VOID

-EFIAPI

-PL390GicSendSgiTo (

-  IN  INTN          GicDistributorBase,

-  IN  INTN          TargetListFilter,

-  IN  INTN          CPUTargetList

-  );

-

-UINT32

-EFIAPI

-PL390GicAcknowledgeSgiFrom (

-  IN  INTN          GicInterruptInterfaceBase,

-  IN  INTN          CoreId

-  );

-

-UINT32

-EFIAPI

-PL390GicAcknowledgeSgi2From (

-  IN  INTN          GicInterruptInterfaceBase,

-  IN  INTN          CoreId,

-  IN  INTN          SgiId

-  );

-

-UINTN

-EFIAPI

-PL390GicSetPriorityMask (

-  IN  INTN          GicInterruptInterfaceBase,

-  IN  INTN          PriorityMask

-  );

-

-#endif

diff --git a/ArmPkg/Include/Library/ArmGicLib.h b/ArmPkg/Include/Library/ArmGicLib.h
new file mode 100644
index 0000000000..78bba23ba7
--- /dev/null
+++ b/ArmPkg/Include/Library/ArmGicLib.h
@@ -0,0 +1,126 @@
+/** @file

+*

+*  Copyright (c) 2011, ARM Limited. All rights reserved.

+*  

+*  This program and the accompanying materials                          

+*  are licensed and made available under the terms and conditions of the BSD License         

+*  which accompanies this distribution.  The full text of the license may be found at        

+*  http://opensource.org/licenses/bsd-license.php                                            

+*

+*  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     

+*  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             

+*

+**/

+

+#ifndef __PL390GIC_H

+#define __PL390GIC_H

+

+//

+// GIC definitions

+//

+

+//

+// GIC Distributor

+//

+#define ARM_GIC_ICDDCR          0x000 // Distributor Control Register

+#define ARM_GIC_ICDICTR         0x004 // Interrupt Controller Type Register

+#define ARM_GIC_ICDIIDR         0x008 // Implementer Identification Register

+

+// Each reg base below repeats for VE_NUM_ARM_GIC_REG_PER_INT_BITS (see GIC spec)

+#define ARM_GIC_ICDISR          0x080 // Interrupt Security Registers

+#define ARM_GIC_ICDISER         0x100 // Interrupt Set-Enable Registers

+#define ARM_GIC_ICDICER         0x180 // Interrupt Clear-Enable Registers

+#define ARM_GIC_ICDSPR          0x200 // Interrupt Set-Pending Registers

+#define ARM_GIC_ICDICPR         0x280 // Interrupt Clear-Pending Registers

+#define ARM_GIC_ICDABR          0x300 // Active Bit Registers

+

+// Each reg base below repeats for VE_NUM_ARM_GIC_REG_PER_INT_BYTES

+#define ARM_GIC_ICDIPR          0x400 // Interrupt Priority Registers

+

+// Each reg base below repeats for VE_NUM_ARM_GIC_INTERRUPTS

+#define ARM_GIC_ICDIPTR         0x800 // Interrupt Processor Target Registers

+#define ARM_GIC_ICDICFR         0xC00 // Interrupt Configuration Registers

+

+#define ARM_GIC_ICDPPISR        0xD00 // PPI Status register

+

+// just one of these

+#define ARM_GIC_ICDSGIR         0xF00 // Software Generated Interrupt Register

+

+//

+// GIC Cpu interface

+//

+#define ARM_GIC_ICCICR          0x00  // CPU Interface Control Register

+#define ARM_GIC_ICCPMR          0x04  // Interrupt Priority Mask Register

+#define ARM_GIC_ICCBPR          0x08  // Binary Point Register

+#define ARM_GIC_ICCIAR          0x0C  // Interrupt Acknowledge Register

+#define ARM_GIC_ICCEIOR         0x10  // End Of Interrupt Register

+#define ARM_GIC_ICCRPR          0x14  // Running Priority Register

+#define ARM_GIC_ICCPIR          0x18  // Highest Pending Interrupt Register

+#define ARM_GIC_ICCABPR         0x1C  // Aliased Binary Point Register

+#define ARM_GIC_ICCIDR          0xFC  // Identification Register

+

+#define ARM_GIC_ICDSGIR_FILTER_TARGETLIST       0x0

+#define ARM_GIC_ICDSGIR_FILTER_EVERYONEELSE     0x1

+#define ARM_GIC_ICDSGIR_FILTER_ITSELF           0x2

+

+// Bit-masks to configure the CPU Interface Control register

+#define ARM_GIC_ICCICR_ENABLE_SECURE            0x01

+#define ARM_GIC_ICCICR_ENABLE_NS                0x02

+#define ARM_GIC_ICCICR_ACK_CTL                  0x04

+#define ARM_GIC_ICCICR_SIGNAL_SECURE_TO_FIQ     0x08

+#define ARM_GIC_ICCICR_USE_SBPR                 0x10

+

+

+//

+// GIC SEC interfaces

+//

+VOID

+EFIAPI

+ArmGicSetupNonSecure (

+  IN  INTN          GicDistributorBase,

+  IN  INTN          GicInterruptInterfaceBase

+  );

+

+VOID

+EFIAPI

+ArmGicEnableInterruptInterface (

+  IN  INTN          GicInterruptInterfaceBase

+  );

+

+VOID

+EFIAPI

+ArmGicEnableDistributor (

+  IN  INTN          GicDistributorBase

+  );

+

+VOID

+EFIAPI

+ArmGicSendSgiTo (

+  IN  INTN          GicDistributorBase,

+  IN  INTN          TargetListFilter,

+  IN  INTN          CPUTargetList

+  );

+

+UINT32

+EFIAPI

+ArmGicAcknowledgeSgiFrom (

+  IN  INTN          GicInterruptInterfaceBase,

+  IN  INTN          CoreId

+  );

+

+UINT32

+EFIAPI

+ArmGicAcknowledgeSgi2From (

+  IN  INTN          GicInterruptInterfaceBase,

+  IN  INTN          CoreId,

+  IN  INTN          SgiId

+  );

+

+UINTN

+EFIAPI

+ArmGicSetPriorityMask (

+  IN  INTN          GicInterruptInterfaceBase,

+  IN  INTN          PriorityMask

+  );

+

+#endif

diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A8.dsc b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A8.dsc
index a82e13f4a9..12f2cbb11c 100644
--- a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A8.dsc
+++ b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A8.dsc
@@ -136,7 +136,7 @@
   # L2 Cache Driver

   L2X0CacheLib|ArmPlatformPkg/Library/L2X0CacheLibNull/L2X0CacheLibNull.inf

   # ARM PL390 General Interrupt Driver in Secure and Non-secure

-  PL390GicSecLib|ArmPkg/Drivers/PL390Gic/PL390GicSec.inf

+  ArmGicSecLib|ArmPkg/Drivers/PL390Gic/PL390GicSec.inf

 

 !if $(EDK2_SKIP_PEICORE) == 1

   PrePiLib|EmbeddedPkg/Library/PrePiLib/PrePiLib.inf

@@ -441,13 +441,14 @@
 !if $(EDK2_SKIP_PEICORE) == 1

   ArmPlatformPkg/PrePi/PeiUniCore.inf {

     <LibraryClasses>

+      ArmGicSecLib|ArmPkg/Drivers/PL390Gic/PL390GicLib.inf

       ArmLib|ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.inf

       ArmPlatformLib|ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbLib.inf

   }

 !else

   ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf {

     <LibraryClasses>

-      PL390GicSecLib|ArmPkg/Drivers/PL390Gic/PL390GicNonSec.inf

+      ArmGicSecLib|ArmPkg/Drivers/PL390Gic/PL390GicLib.inf

   }

   MdeModulePkg/Core/Pei/PeiMain.inf

   MdeModulePkg/Universal/PCD/Pei/Pcd.inf  {

diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A9x2.dsc b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A9x2.dsc
index 5283b45164..1852552cd4 100644
--- a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A9x2.dsc
+++ b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A9x2.dsc
@@ -115,7 +115,8 @@
   # ARM PL011 UART Driver

   PL011UartLib|ArmPlatformPkg/Drivers/PL011Uart/PL011Uart.inf

   # ARM PL390 General Interrupt Driver in Secure and Non-secure

-  PL390GicNonSecLib|ArmPkg/Drivers/PL390Gic/PL390GicNonSec.inf

+  ArmGicSecLib|ArmPkg/Drivers/PL390Gic/PL390GicSecLib.inf

+  ArmGicLib|ArmPkg/Drivers/PL390Gic/PL390GicLib.inf

 

   BdsLib|ArmPkg/Library/BdsLib/BdsLib.inf

   

@@ -138,8 +139,6 @@
   

   # L2 Cache Driver

   L2X0CacheLib|ArmPlatformPkg/Library/L2X0CacheLibNull/L2X0CacheLibNull.inf

-  # ARM PL390 General Interrupt Driver in Secure

-  PL390GicSecLib|ArmPkg/Drivers/PL390Gic/PL390GicSec.inf

 

 !if $(EDK2_SKIP_PEICORE) == 1

   PrePiLib|EmbeddedPkg/Library/PrePiLib/PrePiLib.inf

@@ -451,13 +450,14 @@
 !if $(EDK2_SKIP_PEICORE) == 1

   ArmPlatformPkg/PrePi/PeiMPCore.inf {

     <LibraryClasses>

+      ArmGicSecLib|ArmPkg/Drivers/PL390Gic/PL390GicLib.inf

       ArmLib|ArmPkg/Library/ArmLib/ArmV7/ArmV7MPCoreLib.inf

       ArmPlatformLib|ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbLib.inf

   }

 !else

   ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf {

     <LibraryClasses>

-      PL390GicSecLib|ArmPkg/Drivers/PL390Gic/PL390GicNonSec.inf

+      ArmGicSecLib|ArmPkg/Drivers/PL390Gic/PL390GicLib.inf

   }

   MdeModulePkg/Core/Pei/PeiMain.inf

   MdeModulePkg/Universal/PCD/Pei/Pcd.inf  {

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc
index ed1c616e22..d4be10b022 100644
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc
@@ -147,8 +147,8 @@
   #DebugAgentLib|EmbeddedPkg/Library/GdbDebugAgent/GdbDebugAgent.inf
   
   # ARM PL390 General Interrupt Driver in Secure and Non-secure
-  PL390GicSecLib|ArmPkg/Drivers/PL390Gic/PL390GicSec.inf
-  PL390GicNonSecLib|ArmPkg/Drivers/PL390Gic/PL390GicNonSec.inf
+  ArmGicSecLib|ArmPkg/Drivers/PL390Gic/PL390GicSecLib.inf
+  ArmGicLib|ArmPkg/Drivers/PL390Gic/PL390GicLib.inf
   
 !if $(EDK2_SKIP_PEICORE) == 1
   PrePiLib|EmbeddedPkg/Library/PrePiLib/PrePiLib.inf
@@ -496,13 +496,14 @@
 !if $(EDK2_SKIP_PEICORE) == 1
   ArmPlatformPkg/PrePi/PeiMPCore.inf {
     <LibraryClasses>
+      ArmGicSecLib|ArmPkg/Drivers/PL390Gic/PL390GicLib.inf
       ArmLib|ArmPkg/Library/ArmLib/ArmV7/ArmV7MPCoreLib.inf
       ArmPlatformLib|ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA9x4/ArmVExpressLib.inf
   }
 !else
   ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf {
     <LibraryClasses>
-      PL390GicSecLib|ArmPkg/Drivers/PL390Gic/PL390GicNonSec.inf
+      ArmGicSecLib|ArmPkg/Drivers/PL390Gic/PL390GicLib.inf
   }
   MdeModulePkg/Core/Pei/PeiMain.inf
   MdeModulePkg/Universal/PCD/Pei/Pcd.inf  {
diff --git a/ArmPlatformPkg/Library/DebugSecExtraActionLib/DebugSecExtraActionLib.c b/ArmPlatformPkg/Library/DebugSecExtraActionLib/DebugSecExtraActionLib.c
index 469a545c0e..b9812142ed 100755
--- a/ArmPlatformPkg/Library/DebugSecExtraActionLib/DebugSecExtraActionLib.c
+++ b/ArmPlatformPkg/Library/DebugSecExtraActionLib/DebugSecExtraActionLib.c
@@ -14,12 +14,12 @@
 

 #include <PiPei.h>

 

+#include <Library/ArmGicLib.h>

 #include <Library/DebugLib.h>

 #include <Library/PcdLib.h>

 #include <Library/PrintLib.h>

 #include <Library/SerialPortLib.h>

 #include <Chipset/ArmV7.h>
-#include <Drivers/PL390Gic.h>

 

 #define ARM_PRIMARY_CORE    0

 

@@ -38,7 +38,7 @@ NonSecureWaitForFirmware (
   ArmCallWFI();

 

   // Acknowledge the interrupt and send End of Interrupt signal.

-  PL390GicAcknowledgeSgiFrom (PcdGet32(PcdGicInterruptInterfaceBase), ARM_PRIMARY_CORE);

+  ArmGicAcknowledgeSgiFrom (PcdGet32(PcdGicInterruptInterfaceBase), ARM_PRIMARY_CORE);

 

   // Jump to secondary core entry point.

   secondary_start ();

@@ -87,7 +87,7 @@ ArmPlatformSecExtraAction (
   } else if (FeaturePcdGet (PcdSystemMemoryInitializeInSec)) {

     if (CoreId == ARM_PRIMARY_CORE) {

       // Signal the secondary cores they can jump to PEI phase

-      PL390GicSendSgiTo (PcdGet32(PcdGicDistributorBase), GIC_ICDSGIR_FILTER_EVERYONEELSE, 0x0E);

+      ArmGicSendSgiTo (PcdGet32(PcdGicDistributorBase), ARM_GIC_ICDSGIR_FILTER_EVERYONEELSE, 0x0E);

 

       // To enter into Non Secure state, we need to make a return from exception

       *JumpAddress = PcdGet32(PcdNormalFvBaseAddress);

diff --git a/ArmPlatformPkg/Library/DebugSecExtraActionLib/DebugSecExtraActionLib.inf b/ArmPlatformPkg/Library/DebugSecExtraActionLib/DebugSecExtraActionLib.inf
index 4b5df2887c..2a09063a54 100755
--- a/ArmPlatformPkg/Library/DebugSecExtraActionLib/DebugSecExtraActionLib.inf
+++ b/ArmPlatformPkg/Library/DebugSecExtraActionLib/DebugSecExtraActionLib.inf
@@ -36,7 +36,7 @@
 [LibraryClasses]
   DebugLib
   PcdLib
-  PL390GicSecLib
+  ArmGicSecLib
   PrintLib
   SerialPortLib
 
diff --git a/ArmPlatformPkg/PrePeiCore/MainMPCore.c b/ArmPlatformPkg/PrePeiCore/MainMPCore.c
index 35c41540f4..a369c6e49c 100644
--- a/ArmPlatformPkg/PrePeiCore/MainMPCore.c
+++ b/ArmPlatformPkg/PrePeiCore/MainMPCore.c
@@ -12,9 +12,9 @@
 *

 **/

 

+#include <Library/ArmGicLib.h>

 #include <Library/ArmMPCoreMailBoxLib.h>

 #include <Chipset/ArmV7.h>

-#include <Drivers/PL390Gic.h>

 

 #include "PrePeiCore.h"

 

@@ -45,7 +45,7 @@ SecondaryMain (
   while (secondary_entry_addr = ArmGetMPCoreMailbox(), secondary_entry_addr == 0) {

     ArmCallWFI();

     // Acknowledge the interrupt and send End of Interrupt signal.

-    PL390GicAcknowledgeSgiFrom(PcdGet32(PcdGicInterruptInterfaceBase),0/*CoreId*/);

+    ArmGicAcknowledgeSgiFrom(PcdGet32(PcdGicInterruptInterfaceBase),0/*CoreId*/);

   }

 

   secondary_start = (VOID (*)())secondary_entry_addr;

@@ -65,13 +65,13 @@ PrimaryMain (
 {

   EFI_SEC_PEI_HAND_OFF        SecCoreData;

 

-  //Enable the GIC Distributor

-  PL390GicEnableDistributor(PcdGet32(PcdGicDistributorBase));

+  // Enable the GIC Distributor

+  ArmGicEnableDistributor(PcdGet32(PcdGicDistributorBase));

 

   // If ArmVe has not been built as Standalone then we need to wake up the secondary cores

-  if (FeaturePcdGet(PcdSendSgiToBringUpSecondaryCores)) {

+  if (FeaturePcdGet (PcdSendSgiToBringUpSecondaryCores)) {

     // Sending SGI to all the Secondary CPU interfaces

-    PL390GicSendSgiTo (PcdGet32(PcdGicDistributorBase), GIC_ICDSGIR_FILTER_EVERYONEELSE, 0x0E);

+    ArmGicSendSgiTo (PcdGet32(PcdGicDistributorBase), ARM_GIC_ICDSGIR_FILTER_EVERYONEELSE, 0x0E);

   }

 

   //

diff --git a/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf b/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf
index 8c255443af..c2506ab542 100644
--- a/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf
+++ b/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf
@@ -44,7 +44,7 @@
   DebugLib

   DebugAgentLib

   IoLib

-  PL390GicNonSecLib

+  ArmGicLib

   PrintLib

   SerialPortLib

 

diff --git a/ArmPlatformPkg/PrePi/MainMPCore.c b/ArmPlatformPkg/PrePi/MainMPCore.c
index 165e7cfcb0..82d31905fe 100644
--- a/ArmPlatformPkg/PrePi/MainMPCore.c
+++ b/ArmPlatformPkg/PrePi/MainMPCore.c
@@ -14,9 +14,9 @@
 

 #include "PrePi.h"

 

+#include <Library/ArmGicLib.h>

 #include <Library/ArmMPCoreMailBoxLib.h>

 #include <Chipset/ArmV7.h>

-#include <Drivers/PL390Gic.h>

 

 VOID

 PrimaryMain (

@@ -24,13 +24,13 @@ PrimaryMain (
   IN  UINT64                    StartTimeStamp

   )

 {

-  //Enable the GIC Distributor

-  PL390GicEnableDistributor(PcdGet32(PcdGicDistributorBase));

+  // Enable the GIC Distributor

+  ArmGicEnableDistributor(PcdGet32(PcdGicDistributorBase));

 

   // In some cases, the secondary cores are waiting for an SGI from the next stage boot loader toresume their initialization

   if (!FixedPcdGet32(PcdSendSgiToBringUpSecondaryCores)) {

     // Sending SGI to all the Secondary CPU interfaces

-    PL390GicSendSgiTo (PcdGet32(PcdGicDistributorBase), GIC_ICDSGIR_FILTER_EVERYONEELSE, 0x0E);

+    ArmGicSendSgiTo (PcdGet32(PcdGicDistributorBase), ARM_GIC_ICDSGIR_FILTER_EVERYONEELSE, 0x0E);

   }

 

   PrePiMain (UefiMemoryBase, StartTimeStamp);

@@ -54,7 +54,7 @@ SecondaryMain (
   while (secondary_entry_addr = ArmGetMPCoreMailbox(), secondary_entry_addr == 0) {

     ArmCallWFI();

     // Acknowledge the interrupt and send End of Interrupt signal.

-    PL390GicAcknowledgeSgiFrom(PcdGet32(PcdGicInterruptInterfaceBase),0/*CoreId*/);

+    ArmGicAcknowledgeSgiFrom(PcdGet32(PcdGicInterruptInterfaceBase),0/*CoreId*/);

   }

 

   secondary_start = (VOID (*)())secondary_entry_addr;

diff --git a/ArmPlatformPkg/PrePi/PeiMPCore.inf b/ArmPlatformPkg/PrePi/PeiMPCore.inf
index 39781181fa..c8af14d19a 100755
--- a/ArmPlatformPkg/PrePi/PeiMPCore.inf
+++ b/ArmPlatformPkg/PrePi/PeiMPCore.inf
@@ -40,7 +40,7 @@
   DebugAgentLib

   ArmLib

   ArmMPCoreMailBoxLib

-  PL390GicNonSecLib

+  ArmGicLib

   IoLib

   TimerLib

   SerialPortLib

diff --git a/ArmPlatformPkg/Sec/Sec.c b/ArmPlatformPkg/Sec/Sec.c
index 42df66ea20..5610168df1 100644
--- a/ArmPlatformPkg/Sec/Sec.c
+++ b/ArmPlatformPkg/Sec/Sec.c
@@ -24,7 +24,7 @@
 #include <Library/ArmPlatformLib.h>
 
 #include <Chipset/ArmV7.h>
-#include <Drivers/PL390Gic.h>
+#include <Library/ArmGicLib.h>
 
 #define ARM_PRIMARY_CORE  0
 
@@ -160,27 +160,27 @@ CEntryPoint (
       //      3: As all the cores are in secure state, use secure SGI's
       //
 
-      PL390GicEnableDistributor (PcdGet32(PcdGicDistributorBase));
-      PL390GicEnableInterruptInterface (PcdGet32(PcdGicInterruptInterfaceBase));
+      ArmGicEnableDistributor (PcdGet32(PcdGicDistributorBase));
+      ArmGicEnableInterruptInterface (PcdGet32(PcdGicInterruptInterfaceBase));
 
       // Send SGI to all Secondary core to wake them up from WFI state.
-      PL390GicSendSgiTo (PcdGet32(PcdGicDistributorBase), GIC_ICDSGIR_FILTER_EVERYONEELSE, 0x0E);
+      ArmGicSendSgiTo (PcdGet32(PcdGicDistributorBase), ARM_GIC_ICDSGIR_FILTER_EVERYONEELSE, 0x0E);
     } else {
       // The secondary cores need to wait until the Trustzone chipsets configuration is done
       // before switching to Non Secure World
 
       // Enabled GIC CPU Interface
-      PL390GicEnableInterruptInterface (PcdGet32(PcdGicInterruptInterfaceBase));
+      ArmGicEnableInterruptInterface (PcdGet32(PcdGicInterruptInterfaceBase));
 
       // Waiting for the SGI from the primary core
       ArmCallWFI();
 
       // Acknowledge the interrupt and send End of Interrupt signal.
-      PL390GicAcknowledgeSgiFrom (PcdGet32(PcdGicInterruptInterfaceBase), ARM_PRIMARY_CORE);
+      ArmGicAcknowledgeSgiFrom (PcdGet32(PcdGicInterruptInterfaceBase), PRIMARY_CORE_ID);
     }
 
     // Transfer the interrupt to Non-secure World
-    PL390GicSetupNonSecure (PcdGet32(PcdGicDistributorBase),PcdGet32(PcdGicInterruptInterfaceBase));
+    ArmGicSetupNonSecure (PcdGet32(PcdGicDistributorBase),PcdGet32(PcdGicInterruptInterfaceBase));
 
     // Write to CP15 Non-secure Access Control Register :
     //   - Enable CP10 and CP11 accesses in NS World
@@ -199,9 +199,9 @@ CEntryPoint (
 
     // Trustzone is not enabled, just enable the Distributor and CPU interface
     if (CoreId == ARM_PRIMARY_CORE) {
-      PL390GicEnableDistributor (PcdGet32(PcdGicDistributorBase));
+      ArmGicEnableDistributor (PcdGet32(PcdGicDistributorBase));
     }
-    PL390GicEnableInterruptInterface (PcdGet32(PcdGicInterruptInterfaceBase));
+    ArmGicEnableInterruptInterface (PcdGet32(PcdGicInterruptInterfaceBase));
 
     // With Trustzone support the transition from Sec to Normal world is done by return_from_exception().
     // If we want to keep this function call we need to ensure the SVC's SPSR point to the same Program
diff --git a/ArmPlatformPkg/Sec/Sec.inf b/ArmPlatformPkg/Sec/Sec.inf
index 23dee117d3..bffa9b6795 100644
--- a/ArmPlatformPkg/Sec/Sec.inf
+++ b/ArmPlatformPkg/Sec/Sec.inf
@@ -42,7 +42,7 @@
   DebugLib
   DebugAgentLib
   IoLib
-  PL390GicSecLib
+  ArmGicSecLib
   PrintLib
   SerialPortLib