ArmPkg/ArmGicLib: Replaced 'ArmGicAcknowledgeSgiFrom' by 'ArmGicAcknowledgeInterrupt'

[mirror_edk2.git] / ArmPkg / Drivers / PL390Gic / PL390Gic.c

diff --git a/ArmPkg/Drivers/PL390Gic/PL390Gic.c b/ArmPkg/Drivers/PL390Gic/PL390Gic.c
index 56c0fd9c4fdda43bf08ef29276086493df1a7df5..8a10d113f7af07cdedcdc7c2baa93e998682ecbd 100644 (file)
--- a/ArmPkg/Drivers/PL390Gic/PL390Gic.c
+++ b/ArmPkg/Drivers/PL390Gic/PL390Gic.c
@@ -38,45 +38,33 @@ ArmGicSendSgiTo (
   MmioWrite32 (GicDistributorBase + ARM_GIC_ICDSGIR, ((TargetListFilter & 0x3) << 24) | ((CPUTargetList & 0xFF) << 16) | SgiId);\r
 }\r
 \r
-UINT32\r
+RETURN_STATUS\r
 EFIAPI\r
-ArmGicAcknowledgeSgiFrom (\r
-  IN  INTN          GicInterruptInterfaceBase,\r
-  IN  INTN          CoreId\r
+ArmGicAcknowledgeInterrupt (\r
+  IN  UINTN          GicDistributorBase,\r
+  IN  UINTN          GicInterruptInterfaceBase,\r
+  OUT UINTN          *CoreId,\r
+  OUT UINTN          *InterruptId\r
   )\r
 {\r
-  INTN            InterruptId;\r
+  UINT32            Interrupt;\r
 \r
-  InterruptId = MmioRead32 (GicInterruptInterfaceBase + ARM_GIC_ICCIAR);\r
+  // Read the Interrupt Acknowledge Register\r
+  Interrupt = MmioRead32 (GicInterruptInterfaceBase + ARM_GIC_ICCIAR);\r
 \r
-  // Check if the Interrupt ID is valid, The read from Interrupt Ack register returns CPU ID and Interrupt ID\r
-  if ((((CoreId & 0x7) << 10) | PcdGet32(PcdGicSgiIntId)) == InterruptId) {\r
-    // Got SGI number 0 hence signal End of Interrupt by writing to ICCEOIR\r
-    MmioWrite32 (GicInterruptInterfaceBase + ARM_GIC_ICCEIOR, InterruptId);\r
-    return 1;\r
-  } else {\r
-    return 0;\r
-  }\r
-}\r
-\r
-UINT32\r
-EFIAPI\r
-ArmGicAcknowledgeSgi2From (\r
-  IN  INTN          GicInterruptInterfaceBase,\r
-  IN  INTN          CoreId,\r
-  IN  INTN          SgiId\r
-  )\r
-{\r
-  INTN            InterruptId;\r
-\r
-  InterruptId = MmioRead32(GicInterruptInterfaceBase + ARM_GIC_ICCIAR);\r
+  // Check if it is a valid interrupt ID\r
+  if ((Interrupt & 0x3FF) < ArmGicGetMaxNumInterrupts (GicDistributorBase)) {\r
+    // Got a valid SGI number hence signal End of Interrupt by writing to ICCEOIR\r
+    MmioWrite32 (GicInterruptInterfaceBase + ARM_GIC_ICCEIOR, Interrupt);\r
 \r
-  // Check if the Interrupt ID is valid, The read from Interrupt Ack register returns CPU ID and Interrupt ID\r
-  if((((CoreId & 0x7) << 10) | (SgiId & 0x3FF)) == (InterruptId & 0x1FFF)) {\r
-    // Got SGI number 0 hence signal End of Interrupt by writing to ICCEOIR\r
-    MmioWrite32 (GicInterruptInterfaceBase + ARM_GIC_ICCEIOR, InterruptId);\r
-    return 1;\r
+    if (CoreId) {\r
+      *CoreId = (Interrupt >> 10) & 0x7;\r
+    }\r
+    if (InterruptId) {\r
+      *InterruptId = Interrupt & 0x3FF;\r
+    }\r
+    return RETURN_SUCCESS;\r
   } else {\r
-    return 0;\r
+    return RETURN_INVALID_PARAMETER;\r
   }\r
 }\r