Fixed a bug in the HardwareInterrupt handler that would blow the stack if you reenabl...

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

diff --git a/ArmPkg/Drivers/CpuDxe/CpuDxe.c b/ArmPkg/Drivers/CpuDxe/CpuDxe.c
index 2b43d2a9c9ebce464d1604a372b5ccd77c5eb753..d3f0ff505dc98442b8fae8baf2c602f79c345d2c 100644 (file)
--- a/ArmPkg/Drivers/CpuDxe/CpuDxe.c
+++ b/ArmPkg/Drivers/CpuDxe/CpuDxe.c
@@ -14,7 +14,6 @@
 \r
 #include "CpuDxe.h"\r
 \r
-BOOLEAN gExceptionContext = FALSE;\r
 BOOLEAN mInterruptState   = FALSE;\r
 \r
 EFI_STATUS\r
@@ -49,9 +48,7 @@ CpuEnableInterrupt (
   IN EFI_CPU_ARCH_PROTOCOL          *This\r
   )\r
 {\r
-  if (!gExceptionContext) {\r
-    ArmEnableInterrupts ();\r
-  }\r
+  ArmEnableInterrupts ();\r
 \r
   mInterruptState  = TRUE;\r
   return EFI_SUCCESS;\r
@@ -64,9 +61,7 @@ CpuDisableInterrupt (
   IN EFI_CPU_ARCH_PROTOCOL          *This\r
   )\r
 {\r
-  if (!gExceptionContext) {\r
-    ArmDisableInterrupts ();\r
-  }\r
+  ArmDisableInterrupts ();\r
 \r
   mInterruptState = FALSE;\r
   return EFI_SUCCESS;\r

diff --git a/ArmPkg/Drivers/CpuDxe/Exception.c b/ArmPkg/Drivers/CpuDxe/Exception.c
index 8859ca8667477fac4f38ba0a9bdf5446fdc89b63..9910bd2b881a5d730784f243cb63ed9446d70e9d 100644 (file)
--- a/ArmPkg/Drivers/CpuDxe/Exception.c
+++ b/ArmPkg/Drivers/CpuDxe/Exception.c
@@ -15,8 +15,6 @@
 #include "CpuDxe.h" \r
 #include <Library/CacheMaintenanceLib.h>\r
 \r
-extern BOOLEAN gExceptionContext;\r
-\r
 VOID\r
 ExceptionHandlersStart (\r
   VOID\r
@@ -142,8 +140,7 @@ CommonCExceptionHandler (
 {\r
   BOOLEAN Dispatched = FALSE;\r
  \r
-  gExceptionContext = TRUE; \r
-  \r
+ \r
   if (ExceptionType <= MAX_ARM_EXCEPTION) {\r
     if (gDebuggerExceptionHandlers[ExceptionType]) {\r
       //\r
@@ -162,8 +159,6 @@ CommonCExceptionHandler (
     ASSERT (FALSE);\r
   }\r
 \r
-  gExceptionContext = FALSE; \r
-\r
   if (Dispatched) {\r
     //\r
     // We did work so this was an expected ExceptionType\r

diff --git a/BeagleBoardPkg/InterruptDxe/HardwareInterrupt.c b/BeagleBoardPkg/InterruptDxe/HardwareInterrupt.c
index 3e69515dfe5fd20ca8e1c5513de21825387336d8..c87d56406391935897906655b267d9f1b7f72b36 100644 (file)
--- a/BeagleBoardPkg/InterruptDxe/HardwareInterrupt.c
+++ b/BeagleBoardPkg/InterruptDxe/HardwareInterrupt.c
@@ -234,12 +234,16 @@ IrqInterruptHandler (
   \r
   Vector = MmioRead32(INTCPS_SIR_IRQ) & INTCPS_SIR_IRQ_MASK;\r
 \r
+  // Needed to prevent infinite nesting if Time Driver lowers TPL\r
+  MmioWrite32(INTCPS_CONTROL, INTCPS_CONTROL_NEWIRQAGR);\r
+\r
   InterruptHandler = gRegisteredInterruptHandlers[Vector];\r
   if (InterruptHandler != NULL) {\r
     // Call the registered interrupt handler.\r
     InterruptHandler(Vector, SystemContext);\r
   }\r
   \r
+  // Needed to clear after running the handler\r
   MmioWrite32(INTCPS_CONTROL, INTCPS_CONTROL_NEWIRQAGR);\r
 }\r
 \r