Changeset 8607db8 in mainline for kernel/arch/amd64/src/interrupt.c

Timestamp:

2006-10-27T13:34:20Z (18 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

ec04b20

Parents:

16d71f41

Message:

amd64: adopt new IRQ interface

File:

• kernel/arch/amd64/src/interrupt.c (modified) (5 diffs)

kernel/arch/amd64/src/interrupt.c

@@ -52 +52 @@
 #include <arch/ddi/ddi.h>
 #include <interrupt.h>
-#include <ipc/irq.h>
-
-void print_info_errcode(int n, istate_t *istate)
+#include <ddi/irq.h>
+
+/*
+ * Interrupt and exception dispatching.
+ */
+
+void (* disable_irqs_function)(uint16_t irqmask) = NULL;
+void (* enable_irqs_function)(uint16_t irqmask) = NULL;
+void (* eoi_function)(void) = NULL;
+
+void decode_istate(int n, istate_t *istate)
 {
         char *symbol;
@@ -76 +84 @@
 }
 
-/*
- * Interrupt and exception dispatching.
- */
-
-void (* disable_irqs_function)(uint16_t irqmask) = NULL;
-void (* enable_irqs_function)(uint16_t irqmask) = NULL;
-void (* eoi_function)(void) = NULL;
-
-void null_interrupt(int n, istate_t *istate)
+static void trap_virtual_eoi(void)
+{
+        if (eoi_function)
+                eoi_function();
+        else
+                panic("no eoi_function\n");
+
+}
+
+static void null_interrupt(int n, istate_t *istate)
 {
         fault_if_from_uspace(istate, "unserviced interrupt: %d", n);
-        print_info_errcode(n, istate);
+        decode_istate(n, istate);
         panic("unserviced interrupt\n");
 }
 
 /** General Protection Fault. */
-void gp_fault(int n, istate_t *istate)
+static void gp_fault(int n, istate_t *istate)
 {
         if (TASK) {
@@ -115 +124 @@
         }
 
-        print_info_errcode(n, istate);
+        decode_istate(n, istate);
         panic("general protection fault\n");
 }
 
-void ss_fault(int n, istate_t *istate)
+static void ss_fault(int n, istate_t *istate)
 {
         fault_if_from_uspace(istate, "stack fault");
-        print_info_errcode(n, istate);
+        decode_istate(n, istate);
         panic("stack fault\n");
 }
 
-void nm_fault(int n, istate_t *istate)
+static void nm_fault(int n, istate_t *istate)
 {
 #ifdef CONFIG_FPU_LAZY     
@@ -136 +145 @@
 }
 
-void tlb_shootdown_ipi(int n, istate_t *istate)
+static void tlb_shootdown_ipi(int n, istate_t *istate)
 {
         trap_virtual_eoi();
         tlb_shootdown_ipi_recv();
+}
+
+/** Handler of IRQ exceptions */
+static void irq_interrupt(int n, istate_t *istate)
+{
+        ASSERT(n >= IVT_IRQBASE);
+        
+        int inum = n - IVT_IRQBASE;
+        ASSERT(inum < IRQ_COUNT);
+        ASSERT((inum != IRQ_PIC_SPUR) && (inum != IRQ_PIC1));
+
+        irq_t *irq = irq_dispatch_and_lock(inum);
+        if (irq) {
+                /*
+                 * The IRQ handler was found.
+                 */
+                irq->handler(irq, irq->arg);
+                spinlock_unlock(&irq->lock);
+        } else {
+                /*
+                 * Spurious interrupt.
+                 */
+#ifdef CONFIG_DEBUG
+                printf("cpu%d: spurious interrupt (inum=%d)\n", CPU->id, inum);
+#endif
+        }
+        trap_virtual_eoi();
+}
+
+void interrupt_init(void)
+{
+        int i;
+        
+        for (i = 0; i < IVT_ITEMS; i++)
+                exc_register(i, "null", (iroutine) null_interrupt);
+        
+        for (i = 0; i < IRQ_COUNT; i++) {
+                if ((i != IRQ_PIC_SPUR) && (i != IRQ_PIC1))
+                        exc_register(IVT_IRQBASE + i, "irq", (iroutine) irq_interrupt);
+        }
+        
+        exc_register(7, "nm_fault", (iroutine) nm_fault);
+        exc_register(12, "ss_fault", (iroutine) ss_fault);
+        exc_register(13, "gp_fault", (iroutine) gp_fault);
+        exc_register(14, "ident_mapper", (iroutine) ident_page_fault);
+        
+#ifdef CONFIG_SMP
+        exc_register(VECTOR_TLB_SHOOTDOWN_IPI, "tlb_shootdown", (iroutine) tlb_shootdown_ipi);
+#endif
 }
 
@@ -158 +216 @@
 }
 
-void trap_virtual_eoi(void)
-{
-        if (eoi_function)
-                eoi_function();
-        else
-                panic("no eoi_function\n");
-
-}
-
 /** @}
  */