X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=ArmPkg%2FDrivers%2FCpuDxe%2FException.c;h=e0aca46cd79729672c4b93e521dd30ba08ffede2;hp=e313cf3fe97034e0c8d47f30f22586a4eecb4361;hb=d6ebcab76903254f4423b7e7d3808fb0abaadb46;hpb=6f72e28d04348ad4539679949609675b114896e1

diff --git a/ArmPkg/Drivers/CpuDxe/Exception.c b/ArmPkg/Drivers/CpuDxe/Exception.c
index e313cf3fe9..e0aca46cd7 100644
--- a/ArmPkg/Drivers/CpuDxe/Exception.c
+++ b/ArmPkg/Drivers/CpuDxe/Exception.c
@@ -1,8 +1,8 @@
 /** @file
 
-  Copyright (c) 2008-2009, Apple Inc. All rights reserved.
+  Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>
   
-  All rights reserved. This program and the accompanying materials
+  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
@@ -81,45 +81,6 @@ RegisterInterruptHandler (
 }
 
 
-/**
-  This function registers and enables the handler specified by InterruptHandler for a processor 
-  interrupt or exception type specified by InterruptType. If InterruptHandler is NULL, then the 
-  handler for the processor interrupt or exception type specified by InterruptType is uninstalled. 
-  The installed handler is called once for each processor interrupt or exception.
-
-  @param  InterruptType    A pointer to the processor's current interrupt state. Set to TRUE if interrupts
-                           are enabled and FALSE if interrupts are disabled.
-  @param  InterruptHandler A pointer to a function of type EFI_CPU_INTERRUPT_HANDLER that is called
-                           when a processor interrupt occurs. If this parameter is NULL, then the handler
-                           will be uninstalled.
-
-  @retval EFI_SUCCESS           The handler for the processor interrupt was successfully installed or uninstalled.
-  @retval EFI_ALREADY_STARTED   InterruptHandler is not NULL, and a handler for InterruptType was
-                                previously installed.
-  @retval EFI_INVALID_PARAMETER InterruptHandler is NULL, and a handler for InterruptType was not
-                                previously installed.
-  @retval EFI_UNSUPPORTED       The interrupt specified by InterruptType is not supported.
-
-**/
-EFI_STATUS
-RegisterDebuggerInterruptHandler (
-  IN EFI_EXCEPTION_TYPE             InterruptType,
-  IN EFI_CPU_INTERRUPT_HANDLER      InterruptHandler
-  )
-{
-  if (InterruptType > MAX_ARM_EXCEPTION) {
-    return EFI_UNSUPPORTED;
-  }
-
-  if ((InterruptHandler != NULL) && (gDebuggerExceptionHandlers[InterruptType] != NULL)) {
-    return EFI_ALREADY_STARTED;
-  }
-
-  gDebuggerExceptionHandlers[InterruptType] = InterruptHandler;
-
-  return EFI_SUCCESS;
-}
-
 
 
 VOID
@@ -129,33 +90,16 @@ CommonCExceptionHandler (
   IN OUT EFI_SYSTEM_CONTEXT           SystemContext
   )
 {
-  BOOLEAN Dispatched = FALSE;
- 
- 
+
   if (ExceptionType <= MAX_ARM_EXCEPTION) {
-    if (gDebuggerExceptionHandlers[ExceptionType]) {
-      //
-      // If DebugSupport hooked the interrupt call the handler. This does not disable 
-      // the normal handler.
-      //
-      gDebuggerExceptionHandlers[ExceptionType] (ExceptionType, SystemContext);
-      Dispatched = TRUE;
-    }
     if (gExceptionHandlers[ExceptionType]) {
       gExceptionHandlers[ExceptionType] (ExceptionType, SystemContext);
-      Dispatched = TRUE;
+      return;
     }
   } else {
     DEBUG ((EFI_D_ERROR, "Unknown exception type %d from %08x\n", ExceptionType, SystemContext.SystemContextArm->PC));
     ASSERT (FALSE);
   }
-
-  if (Dispatched) {
-    //
-    // We did work so this was an expected ExceptionType
-    //
-    return;
-  }
   
   if (ExceptionType == EXCEPT_ARM_SOFTWARE_INTERRUPT) {
     //
@@ -178,26 +122,24 @@ InitializeExceptions (
   UINTN                Offset;
   UINTN                Length;
   UINTN                Index;
-  BOOLEAN              Enabled;
+  BOOLEAN              IrqEnabled;
+  BOOLEAN              FiqEnabled;
   EFI_PHYSICAL_ADDRESS Base;
+  UINT32               *VectorBase;
 
   //
   // Disable interrupts
   //
-  Cpu->GetInterruptState (Cpu, &Enabled);
+  Cpu->GetInterruptState (Cpu, &IrqEnabled);
   Cpu->DisableInterrupt (Cpu);
 
   //
-  // Initialize the C entry points for interrupts
+  // EFI does not use the FIQ, but a debugger might so we must disable 
+  // as we take over the exception vectors. 
   //
-  for (Index = 0; Index <= MAX_ARM_EXCEPTION; Index++) {
-    Status = RegisterInterruptHandler (Index, NULL);
-    ASSERT_EFI_ERROR (Status);
-    
-    Status = RegisterDebuggerInterruptHandler (Index, NULL);
-    ASSERT_EFI_ERROR (Status);
-  }
-  
+  FiqEnabled = ArmGetFiqState ();
+  ArmDisableFiq ();
+
   //
   // Copy an implementation of the ARM exception vectors to PcdCpuVectorBaseAddress.
   //
@@ -207,6 +149,7 @@ InitializeExceptions (
   // Reserve space for the exception handlers
   //
   Base = (EFI_PHYSICAL_ADDRESS)PcdGet32 (PcdCpuVectorBaseAddress);
+  VectorBase = (UINT32 *)(UINTN)Base;
   Status = gBS->AllocatePages (AllocateAddress, EfiBootServicesCode, EFI_SIZE_TO_PAGES (Length), &Base);
   // If the request was for memory that's not in the memory map (which is often the case for 0x00000000
   // on embedded systems, for example, we don't want to hang up.  So we'll check here for a status of 
@@ -215,7 +158,11 @@ InitializeExceptions (
     ASSERT_EFI_ERROR (Status);
   }
 
-  CopyMem ((VOID *)(UINTN)PcdGet32 (PcdCpuVectorBaseAddress), (VOID *)ExceptionHandlersStart, Length);
+  // Save existing vector table, in case debugger is already hooked in
+  CopyMem ((VOID *)gDebuggerExceptionHandlers, (VOID *)VectorBase, sizeof (gDebuggerExceptionHandlers));
+
+  // Copy our assembly code into the page that contains the exception vectors. 
+  CopyMem ((VOID *)VectorBase, (VOID *)ExceptionHandlersStart, Length);
 
   //
   // Patch in the common Assembly exception handler
@@ -223,10 +170,29 @@ InitializeExceptions (
   Offset = (UINTN)CommonExceptionEntry - (UINTN)ExceptionHandlersStart;
   *(UINTN *) ((UINT8 *)(UINTN)PcdGet32 (PcdCpuVectorBaseAddress) + Offset) = (UINTN)AsmCommonExceptionEntry;
 
+  //
+  // Initialize the C entry points for interrupts
+  //
+  for (Index = 0; Index <= MAX_ARM_EXCEPTION; Index++) {
+    if ((gDebuggerExceptionHandlers[Index] == 0) || (gDebuggerExceptionHandlers[Index] == (VOID *)(UINTN)0xEAFFFFFE)) {
+      // Exception handler contains branch to vector location (jmp $) so no handler
+      // NOTE: This code assumes vectors are ARM and not Thumb code
+      Status = RegisterInterruptHandler (Index, NULL);
+      ASSERT_EFI_ERROR (Status);
+    } else {
+      // If the debugger has alread hooked put its vector back
+      VectorBase[Index] = (UINT32)(UINTN)gDebuggerExceptionHandlers[Index];
+    }
+  }
+
   // Flush Caches since we updated executable stuff
   InvalidateInstructionCacheRange ((VOID *)PcdGet32(PcdCpuVectorBaseAddress), Length);
 
-  if (Enabled) {
+  if (FiqEnabled) {
+    ArmEnableFiq ();
+  }
+
+  if (IrqEnabled) {
     // 
     // Restore interrupt state
     //