ArmPkg/ArmGic: Introduced support for GicV2 to ArmGicDxe

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Olivier Martin <olivier.martin@arm.com>



git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15627 6f19259b-4bc3-4df7-8a09-765794883524

1 files changed, 3 insertions, 268 deletions

diff --git a/ArmPkg/Drivers/ArmGic/ArmGicDxe.c b/ArmPkg/Drivers/ArmGic/ArmGicDxe.c
index d57ae5d8ac..37c32504a5 100644
--- a/ArmPkg/Drivers/ArmGic/ArmGicDxe.c
+++ b/ArmPkg/Drivers/ArmGic/ArmGicDxe.c
@@ -1,8 +1,6 @@
 /*++

 

-Copyright (c) 2009, Hewlett-Packard Company. All rights reserved.<BR>

-Portions copyright (c) 2010, Apple Inc. All rights reserved.<BR>

-Portions copyright (c) 2011-2014, ARM Ltd. All rights reserved.<BR>

+Copyright (c) 2013-2014, ARM Ltd. All rights reserved.<BR>

 

 This program and the accompanying materials

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

@@ -24,214 +22,8 @@ Abstract:
 

 #include <PiDxe.h>

 

-#include <Library/BaseLib.h>

-#include <Library/BaseMemoryLib.h>

-#include <Library/UefiLib.h>

-#include <Library/PcdLib.h>

-#include <Library/IoLib.h>

-#include <Library/ArmGicLib.h>

-

 #include "ArmGicDxe.h"

 

-#define ARM_GIC_DEFAULT_PRIORITY  0x80

-

-extern EFI_HARDWARE_INTERRUPT_PROTOCOL gHardwareInterruptProtocol;

-

-/**

-  Enable interrupt source Source.

-

-  @param This     Instance pointer for this protocol

-  @param Source   Hardware source of the interrupt

-

-  @retval EFI_SUCCESS       Source interrupt enabled.

-  @retval EFI_DEVICE_ERROR  Hardware could not be programmed.

-

-**/

-EFI_STATUS

-EFIAPI

-EnableInterruptSource (

-  IN EFI_HARDWARE_INTERRUPT_PROTOCOL    *This,

-  IN HARDWARE_INTERRUPT_SOURCE          Source

-  )

-{

-  if (Source > mGicNumInterrupts) {

-    ASSERT(FALSE);

-    return EFI_UNSUPPORTED;

-  }

-

-  ArmGicEnableInterrupt (FixedPcdGet32 (PcdGicDistributorBase), Source);

-

-  return EFI_SUCCESS;

-}

-

-/**

-  Disable interrupt source Source.

-

-  @param This     Instance pointer for this protocol

-  @param Source   Hardware source of the interrupt

-

-  @retval EFI_SUCCESS       Source interrupt disabled.

-  @retval EFI_DEVICE_ERROR  Hardware could not be programmed.

-

-**/

-EFI_STATUS

-EFIAPI

-DisableInterruptSource (

-  IN EFI_HARDWARE_INTERRUPT_PROTOCOL    *This,

-  IN HARDWARE_INTERRUPT_SOURCE          Source

-  )

-{

-  if (Source > mGicNumInterrupts) {

-    ASSERT(FALSE);

-    return EFI_UNSUPPORTED;

-  }

-

-  ArmGicDisableInterrupt (PcdGet32(PcdGicDistributorBase), Source);

-

-  return EFI_SUCCESS;

-}

-

-/**

-  Return current state of interrupt source Source.

-

-  @param This     Instance pointer for this protocol

-  @param Source   Hardware source of the interrupt

-  @param InterruptState  TRUE: source enabled, FALSE: source disabled.

-

-  @retval EFI_SUCCESS       InterruptState is valid

-  @retval EFI_DEVICE_ERROR  InterruptState is not valid

-

-**/

-EFI_STATUS

-EFIAPI

-GetInterruptSourceState (

-  IN EFI_HARDWARE_INTERRUPT_PROTOCOL    *This,

-  IN HARDWARE_INTERRUPT_SOURCE          Source,

-  IN BOOLEAN                            *InterruptState

-  )

-{

-  if (Source > mGicNumInterrupts) {

-    ASSERT(FALSE);

-    return EFI_UNSUPPORTED;

-  }

-

-  *InterruptState = ArmGicIsInterruptEnabled (PcdGet32(PcdGicDistributorBase), Source);

-

-  return EFI_SUCCESS;

-}

-

-/**

-  Signal to the hardware that the End Of Intrrupt state 

-  has been reached.

-

-  @param This     Instance pointer for this protocol

-  @param Source   Hardware source of the interrupt

-

-  @retval EFI_SUCCESS       Source interrupt EOI'ed.

-  @retval EFI_DEVICE_ERROR  Hardware could not be programmed.

-

-**/

-EFI_STATUS

-EFIAPI

-EndOfInterrupt (

-  IN EFI_HARDWARE_INTERRUPT_PROTOCOL    *This,

-  IN HARDWARE_INTERRUPT_SOURCE          Source

-  )

-{

-  if (Source > mGicNumInterrupts) {

-    ASSERT(FALSE);

-    return EFI_UNSUPPORTED;

-  }

-

-  ArmGicEndOfInterrupt (PcdGet32(PcdGicInterruptInterfaceBase), Source);

-  return EFI_SUCCESS;

-}

-

-/**

-  EFI_CPU_INTERRUPT_HANDLER that is called when a processor interrupt occurs.

-

-  @param  InterruptType    Defines the type of interrupt or exception that

-                           occurred on the processor.This parameter is processor architecture specific.

-  @param  SystemContext    A pointer to the processor context when

-                           the interrupt occurred on the processor.

-

-  @return None

-

-**/

-VOID

-EFIAPI

-IrqInterruptHandler (

-  IN EFI_EXCEPTION_TYPE           InterruptType,

-  IN EFI_SYSTEM_CONTEXT           SystemContext

-  )

-{

-  UINT32                      GicInterrupt;

-  HARDWARE_INTERRUPT_HANDLER  InterruptHandler;

-

-  GicInterrupt = ArmGicAcknowledgeInterrupt (PcdGet32(PcdGicInterruptInterfaceBase));

-

-  // Special Interrupts (ID1020-ID1023) have an Interrupt ID greater than the number of interrupt (ie: Spurious interrupt).

-  if ((GicInterrupt & ARM_GIC_ICCIAR_ACKINTID) >= mGicNumInterrupts) {

-    // The special interrupt do not need to be acknowledge

-    return;

-  }

-  

-  InterruptHandler = gRegisteredInterruptHandlers[GicInterrupt];

-  if (InterruptHandler != NULL) {

-    // Call the registered interrupt handler.

-    InterruptHandler (GicInterrupt, SystemContext);

-  } else {

-    DEBUG ((EFI_D_ERROR, "Spurious GIC interrupt: 0x%x\n", GicInterrupt));

-  }

-

-  EndOfInterrupt (&gHardwareInterruptProtocol, GicInterrupt);

-}

-

-//

-// The protocol instance produced by this driver

-//

-EFI_HARDWARE_INTERRUPT_PROTOCOL gHardwareInterruptProtocol = {

-  RegisterInterruptSource,

-  EnableInterruptSource,

-  DisableInterruptSource,

-  GetInterruptSourceState,

-  EndOfInterrupt

-};

-

-/**

-  Shutdown our hardware

-  

-  DXE Core will disable interrupts and turn off the timer and disable interrupts

-  after all the event handlers have run.

-

-  @param[in]  Event   The Event that is being processed

-  @param[in]  Context Event Context

-**/

-VOID

-EFIAPI

-ExitBootServicesEvent (

-  IN EFI_EVENT  Event,

-  IN VOID       *Context

-  )

-{

-  UINTN    Index;

-  

-  // Acknowledge all pending interrupts

-  for (Index = 0; Index < mGicNumInterrupts; Index++) {

-    DisableInterruptSource (&gHardwareInterruptProtocol, Index);

-  }

-

-  for (Index = 0; Index < mGicNumInterrupts; Index++) {

-    EndOfInterrupt (&gHardwareInterruptProtocol, Index);

-  }

-

-  // Disable Gic Interface

-  ArmGicDisableInterruptInterface (PcdGet32(PcdGicInterruptInterfaceBase));

-

-  // Disable Gic Distributor

-  ArmGicDisableDistributor (PcdGet32(PcdGicDistributorBase));

-}

-

 /**

   Initialize the state information for the CPU Architectural Protocol

 

@@ -249,66 +41,9 @@ InterruptDxeInitialize (
   IN EFI_SYSTEM_TABLE   *SystemTable

   )

 {

-  EFI_STATUS              Status;

-  UINTN                   Index;

-  UINT32                  RegOffset;

-  UINTN                   RegShift;

-  UINT32                  CpuTarget;

-  

-  // Make sure the Interrupt Controller Protocol is not already installed in the system.

-  ASSERT_PROTOCOL_ALREADY_INSTALLED (NULL, &gHardwareInterruptProtocolGuid);

-

-  mGicNumInterrupts = ArmGicGetMaxNumInterrupts (PcdGet32(PcdGicDistributorBase));

-

-  for (Index = 0; Index < mGicNumInterrupts; Index++) {

-    DisableInterruptSource (&gHardwareInterruptProtocol, Index);

-    

-    // Set Priority 

-    RegOffset = Index / 4;

-    RegShift = (Index % 4) * 8;

-    MmioAndThenOr32 (

-      PcdGet32(PcdGicDistributorBase) + ARM_GIC_ICDIPR + (4*RegOffset),

-      ~(0xff << RegShift), 

-      ARM_GIC_DEFAULT_PRIORITY << RegShift

-      );

-  }

-

-  //

-  // Targets the interrupts to the Primary Cpu

-  //

-

-  // Only Primary CPU will run this code. We can identify our GIC CPU ID by reading

-  // the GIC Distributor Target register. The 8 first GICD_ITARGETSRn are banked to each

-  // connected CPU. These 8 registers hold the CPU targets fields for interrupts 0-31.

-  // More Info in the GIC Specification about "Interrupt Processor Targets Registers"

-  //

-  // Read the first Interrupt Processor Targets Register (that corresponds to the 4

-  // first SGIs)

-  CpuTarget = MmioRead32 (PcdGet32 (PcdGicDistributorBase) + ARM_GIC_ICDIPTR);

-

-  // The CPU target is a bit field mapping each CPU to a GIC CPU Interface. This value

-  // is 0 when we run on a uniprocessor platform.

-  if (CpuTarget != 0) {

-    // The 8 first Interrupt Processor Targets Registers are read-only

-    for (Index = 8; Index < (mGicNumInterrupts / 4); Index++) {

-      MmioWrite32 (PcdGet32 (PcdGicDistributorBase) + ARM_GIC_ICDIPTR + (Index * 4), CpuTarget);

-    }

-  }

-

-  // Set binary point reg to 0x7 (no preemption)

-  MmioWrite32 (PcdGet32(PcdGicInterruptInterfaceBase) + ARM_GIC_ICCBPR, 0x7);

-

-  // Set priority mask reg to 0xff to allow all priorities through

-  MmioWrite32 (PcdGet32(PcdGicInterruptInterfaceBase) + ARM_GIC_ICCPMR, 0xff);

-

-  // Enable gic cpu interface

-  ArmGicEnableInterruptInterface (PcdGet32(PcdGicInterruptInterfaceBase));

-

-  // Enable gic distributor

-  ArmGicEnableDistributor (PcdGet32(PcdGicDistributorBase));

+  EFI_STATUS  Status;

 

-  Status = InstallAndRegisterInterruptService (

-      &gHardwareInterruptProtocol, IrqInterruptHandler, ExitBootServicesEvent);

+  Status = GicV2DxeInitialize (ImageHandle, SystemTable);

 

   return Status;

 }