ArmPkg/ArmGic: Introduced support for GicV2 to ArmGicDxe

[mirror_edk2.git] / ArmPkg / Drivers / ArmGic / ArmGicDxe.c

diff --git a/ArmPkg/Drivers/ArmGic/ArmGicDxe.c b/ArmPkg/Drivers/ArmGic/ArmGicDxe.c
index d57ae5d8ac84cc20640a9b41195b1fe6fbe0306d..37c32504a50475d8c1384d08d56abedd7c0d9ef3 100644 (file)
--- a/ArmPkg/Drivers/ArmGic/ArmGicDxe.c
+++ b/ArmPkg/Drivers/ArmGic/ArmGicDxe.c
@@ -1,8 +1,6 @@
 /*++\r
 \r
 /*++\r
 \r

-Copyright (c) 2009, Hewlett-Packard Company. All rights reserved.<BR>\r
-Portions copyright (c) 2010, Apple Inc. All rights reserved.<BR>\r
-Portions copyright (c) 2011-2014, ARM Ltd. All rights reserved.<BR>\r
+Copyright (c) 2013-2014, ARM Ltd. All rights reserved.<BR>\r

 \r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 \r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r


@@ -24,214 +22,8 @@ Abstract:
 \r
 #include <PiDxe.h>\r
 \r
 \r
 #include <PiDxe.h>\r
 \r

-#include <Library/BaseLib.h>\r
-#include <Library/BaseMemoryLib.h>\r
-#include <Library/UefiLib.h>\r
-#include <Library/PcdLib.h>\r
-#include <Library/IoLib.h>\r
-#include <Library/ArmGicLib.h>\r
-\r

 #include "ArmGicDxe.h"\r
 \r
 #include "ArmGicDxe.h"\r
 \r

-#define ARM_GIC_DEFAULT_PRIORITY  0x80\r
-\r
-extern EFI_HARDWARE_INTERRUPT_PROTOCOL gHardwareInterruptProtocol;\r
-\r
-/**\r
-  Enable interrupt source Source.\r
-\r
-  @param This     Instance pointer for this protocol\r
-  @param Source   Hardware source of the interrupt\r
-\r
-  @retval EFI_SUCCESS       Source interrupt enabled.\r
-  @retval EFI_DEVICE_ERROR  Hardware could not be programmed.\r
-\r
-**/\r
-EFI_STATUS\r
-EFIAPI\r
-EnableInterruptSource (\r
-  IN EFI_HARDWARE_INTERRUPT_PROTOCOL    *This,\r
-  IN HARDWARE_INTERRUPT_SOURCE          Source\r
-  )\r
-{\r
-  if (Source > mGicNumInterrupts) {\r
-    ASSERT(FALSE);\r
-    return EFI_UNSUPPORTED;\r
-  }\r
-\r
-  ArmGicEnableInterrupt (FixedPcdGet32 (PcdGicDistributorBase), Source);\r
-\r
-  return EFI_SUCCESS;\r
-}\r
-\r
-/**\r
-  Disable interrupt source Source.\r
-\r
-  @param This     Instance pointer for this protocol\r
-  @param Source   Hardware source of the interrupt\r
-\r
-  @retval EFI_SUCCESS       Source interrupt disabled.\r
-  @retval EFI_DEVICE_ERROR  Hardware could not be programmed.\r
-\r
-**/\r
-EFI_STATUS\r
-EFIAPI\r
-DisableInterruptSource (\r
-  IN EFI_HARDWARE_INTERRUPT_PROTOCOL    *This,\r
-  IN HARDWARE_INTERRUPT_SOURCE          Source\r
-  )\r
-{\r
-  if (Source > mGicNumInterrupts) {\r
-    ASSERT(FALSE);\r
-    return EFI_UNSUPPORTED;\r
-  }\r
-\r
-  ArmGicDisableInterrupt (PcdGet32(PcdGicDistributorBase), Source);\r
-\r
-  return EFI_SUCCESS;\r
-}\r
-\r
-/**\r
-  Return current state of interrupt source Source.\r
-\r
-  @param This     Instance pointer for this protocol\r
-  @param Source   Hardware source of the interrupt\r
-  @param InterruptState  TRUE: source enabled, FALSE: source disabled.\r
-\r
-  @retval EFI_SUCCESS       InterruptState is valid\r
-  @retval EFI_DEVICE_ERROR  InterruptState is not valid\r
-\r
-**/\r
-EFI_STATUS\r
-EFIAPI\r
-GetInterruptSourceState (\r
-  IN EFI_HARDWARE_INTERRUPT_PROTOCOL    *This,\r
-  IN HARDWARE_INTERRUPT_SOURCE          Source,\r
-  IN BOOLEAN                            *InterruptState\r
-  )\r
-{\r
-  if (Source > mGicNumInterrupts) {\r
-    ASSERT(FALSE);\r
-    return EFI_UNSUPPORTED;\r
-  }\r
-\r
-  *InterruptState = ArmGicIsInterruptEnabled (PcdGet32(PcdGicDistributorBase), Source);\r
-\r
-  return EFI_SUCCESS;\r
-}\r
-\r
-/**\r
-  Signal to the hardware that the End Of Intrrupt state \r
-  has been reached.\r
-\r
-  @param This     Instance pointer for this protocol\r
-  @param Source   Hardware source of the interrupt\r
-\r
-  @retval EFI_SUCCESS       Source interrupt EOI'ed.\r
-  @retval EFI_DEVICE_ERROR  Hardware could not be programmed.\r
-\r
-**/\r
-EFI_STATUS\r
-EFIAPI\r
-EndOfInterrupt (\r
-  IN EFI_HARDWARE_INTERRUPT_PROTOCOL    *This,\r
-  IN HARDWARE_INTERRUPT_SOURCE          Source\r
-  )\r
-{\r
-  if (Source > mGicNumInterrupts) {\r
-    ASSERT(FALSE);\r
-    return EFI_UNSUPPORTED;\r
-  }\r
-\r
-  ArmGicEndOfInterrupt (PcdGet32(PcdGicInterruptInterfaceBase), Source);\r
-  return EFI_SUCCESS;\r
-}\r
-\r
-/**\r
-  EFI_CPU_INTERRUPT_HANDLER that is called when a processor interrupt occurs.\r
-\r
-  @param  InterruptType    Defines the type of interrupt or exception that\r
-                           occurred on the processor.This parameter is processor architecture specific.\r
-  @param  SystemContext    A pointer to the processor context when\r
-                           the interrupt occurred on the processor.\r
-\r
-  @return None\r
-\r
-**/\r
-VOID\r
-EFIAPI\r
-IrqInterruptHandler (\r
-  IN EFI_EXCEPTION_TYPE           InterruptType,\r
-  IN EFI_SYSTEM_CONTEXT           SystemContext\r
-  )\r
-{\r
-  UINT32                      GicInterrupt;\r
-  HARDWARE_INTERRUPT_HANDLER  InterruptHandler;\r
-\r
-  GicInterrupt = ArmGicAcknowledgeInterrupt (PcdGet32(PcdGicInterruptInterfaceBase));\r
-\r
-  // Special Interrupts (ID1020-ID1023) have an Interrupt ID greater than the number of interrupt (ie: Spurious interrupt).\r
-  if ((GicInterrupt & ARM_GIC_ICCIAR_ACKINTID) >= mGicNumInterrupts) {\r
-    // The special interrupt do not need to be acknowledge\r
-    return;\r
-  }\r
-  \r
-  InterruptHandler = gRegisteredInterruptHandlers[GicInterrupt];\r
-  if (InterruptHandler != NULL) {\r
-    // Call the registered interrupt handler.\r
-    InterruptHandler (GicInterrupt, SystemContext);\r
-  } else {\r
-    DEBUG ((EFI_D_ERROR, "Spurious GIC interrupt: 0x%x\n", GicInterrupt));\r
-  }\r
-\r
-  EndOfInterrupt (&gHardwareInterruptProtocol, GicInterrupt);\r
-}\r
-\r
-//\r
-// The protocol instance produced by this driver\r
-//\r
-EFI_HARDWARE_INTERRUPT_PROTOCOL gHardwareInterruptProtocol = {\r
-  RegisterInterruptSource,\r
-  EnableInterruptSource,\r
-  DisableInterruptSource,\r
-  GetInterruptSourceState,\r
-  EndOfInterrupt\r
-};\r
-\r
-/**\r
-  Shutdown our hardware\r
-  \r
-  DXE Core will disable interrupts and turn off the timer and disable interrupts\r
-  after all the event handlers have run.\r
-\r
-  @param[in]  Event   The Event that is being processed\r
-  @param[in]  Context Event Context\r
-**/\r
-VOID\r
-EFIAPI\r
-ExitBootServicesEvent (\r
-  IN EFI_EVENT  Event,\r
-  IN VOID       *Context\r
-  )\r
-{\r
-  UINTN    Index;\r
-  \r
-  // Acknowledge all pending interrupts\r
-  for (Index = 0; Index < mGicNumInterrupts; Index++) {\r
-    DisableInterruptSource (&gHardwareInterruptProtocol, Index);\r
-  }\r
-\r
-  for (Index = 0; Index < mGicNumInterrupts; Index++) {\r
-    EndOfInterrupt (&gHardwareInterruptProtocol, Index);\r
-  }\r
-\r
-  // Disable Gic Interface\r
-  ArmGicDisableInterruptInterface (PcdGet32(PcdGicInterruptInterfaceBase));\r
-\r
-  // Disable Gic Distributor\r
-  ArmGicDisableDistributor (PcdGet32(PcdGicDistributorBase));\r
-}\r
-\r

 /**\r
   Initialize the state information for the CPU Architectural Protocol\r
 \r
 /**\r
   Initialize the state information for the CPU Architectural Protocol\r
 \r


@@ -249,66 +41,9 @@ InterruptDxeInitialize (
   IN EFI_SYSTEM_TABLE   *SystemTable\r
   )\r
 {\r
   IN EFI_SYSTEM_TABLE   *SystemTable\r
   )\r
 {\r

-  EFI_STATUS              Status;\r
-  UINTN                   Index;\r
-  UINT32                  RegOffset;\r
-  UINTN                   RegShift;\r
-  UINT32                  CpuTarget;\r
-  \r
-  // Make sure the Interrupt Controller Protocol is not already installed in the system.\r
-  ASSERT_PROTOCOL_ALREADY_INSTALLED (NULL, &gHardwareInterruptProtocolGuid);\r
-\r
-  mGicNumInterrupts = ArmGicGetMaxNumInterrupts (PcdGet32(PcdGicDistributorBase));\r
-\r
-  for (Index = 0; Index < mGicNumInterrupts; Index++) {\r
-    DisableInterruptSource (&gHardwareInterruptProtocol, Index);\r
-    \r
-    // Set Priority \r
-    RegOffset = Index / 4;\r
-    RegShift = (Index % 4) * 8;\r
-    MmioAndThenOr32 (\r
-      PcdGet32(PcdGicDistributorBase) + ARM_GIC_ICDIPR + (4*RegOffset),\r
-      ~(0xff << RegShift), \r
-      ARM_GIC_DEFAULT_PRIORITY << RegShift\r
-      );\r
-  }\r
-\r
-  //\r
-  // Targets the interrupts to the Primary Cpu\r
-  //\r
-\r
-  // Only Primary CPU will run this code. We can identify our GIC CPU ID by reading\r
-  // the GIC Distributor Target register. The 8 first GICD_ITARGETSRn are banked to each\r
-  // connected CPU. These 8 registers hold the CPU targets fields for interrupts 0-31.\r
-  // More Info in the GIC Specification about "Interrupt Processor Targets Registers"\r
-  //\r
-  // Read the first Interrupt Processor Targets Register (that corresponds to the 4\r
-  // first SGIs)\r
-  CpuTarget = MmioRead32 (PcdGet32 (PcdGicDistributorBase) + ARM_GIC_ICDIPTR);\r
-\r
-  // The CPU target is a bit field mapping each CPU to a GIC CPU Interface. This value\r
-  // is 0 when we run on a uniprocessor platform.\r
-  if (CpuTarget != 0) {\r
-    // The 8 first Interrupt Processor Targets Registers are read-only\r
-    for (Index = 8; Index < (mGicNumInterrupts / 4); Index++) {\r
-      MmioWrite32 (PcdGet32 (PcdGicDistributorBase) + ARM_GIC_ICDIPTR + (Index * 4), CpuTarget);\r
-    }\r
-  }\r
-\r
-  // Set binary point reg to 0x7 (no preemption)\r
-  MmioWrite32 (PcdGet32(PcdGicInterruptInterfaceBase) + ARM_GIC_ICCBPR, 0x7);\r
-\r
-  // Set priority mask reg to 0xff to allow all priorities through\r
-  MmioWrite32 (PcdGet32(PcdGicInterruptInterfaceBase) + ARM_GIC_ICCPMR, 0xff);\r
-\r
-  // Enable gic cpu interface\r
-  ArmGicEnableInterruptInterface (PcdGet32(PcdGicInterruptInterfaceBase));\r
-\r
-  // Enable gic distributor\r
-  ArmGicEnableDistributor (PcdGet32(PcdGicDistributorBase));\r
+  EFI_STATUS  Status;\r

 \r
 \r

-  Status = InstallAndRegisterInterruptService (\r
-      &gHardwareInterruptProtocol, IrqInterruptHandler, ExitBootServicesEvent);\r
+  Status = GicV2DxeInitialize (ImageHandle, SystemTable);\r

 \r
   return Status;\r
 }\r
 \r
   return Status;\r
 }\r