Changeset 0d107f31 in mainline for kernel/arch/sparc64/src/trap/interrupt.c

Timestamp:

2006-10-13T20:42:54Z (18 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

7dcf22a

Parents:

8ce8499

Message:

Prototypical implementation of new IRQ redirector in sparc64.
The new code can support shared IRQs in kernel (and multiple IRQs per device).
Userspace support is yet to be written.
The only architecture that uses this code is actually sparc64 only.

File:

• kernel/arch/sparc64/src/trap/interrupt.c (modified) (4 diffs)

kernel/arch/sparc64/src/trap/interrupt.c

@@ -36 +36 @@
 #include <arch/trap/interrupt.h>
 #include <interrupt.h>
-#include <arch/drivers/fhc.h>
-#include <arch/drivers/kbd.h>
+#include <irq.h>
 #include <typedefs.h>
 #include <arch/types.h>
@@ -45 +44 @@
 #include <arch/barrier.h>
 #include <print.h>
-#include <genarch/kbd/z8530.h>
 #include <arch.h>
 #include <mm/tlb.h>
 #include <config.h>
+
+/*
+ * To be removed once we get rid of the dependency in ipc_irq_bind_arch().
+ */
+#include <arch/drivers/kbd.h>
+#include <genarch/kbd/z8530.h>
 
 /** Register Interrupt Level Handler.
@@ -72 +76 @@
 }
 
+/** Process hardware interrupt.
+ *
+ * @param n Ignored.
+ * @param istate Ignored.
+ */
 void interrupt(int n, istate_t *istate)
 {
@@ -80 +89 @@
         data0 = asi_u64_read(ASI_UDB_INTR_R, ASI_UDB_INTR_R_DATA_0);
 
-        switch (data0) {
-#ifdef CONFIG_Z8530
-        case Z8530_INTRCV_DATA0:
-                if (kbd_type != KBD_Z8530)
-                        break;
+        irq_t *irq = irq_dispatch(data0);
+        if (irq) {
                 /*
-                 * So far, we know we got this interrupt through the FHC.
-                 * Since we don't have enough information about the FHC and
-                 * because the interrupt looks like level sensitive,
-                 * we cannot handle it by scheduling one of the level
-                 * interrupt traps. Call the interrupt handler directly.
+                 * The IRQ handler was found.
                  */
-
-                if (z8530_belongs_to_kernel)
-                        z8530_interrupt();
-                else
-                        ipc_irq_send_notif(0);
-                fhc_clear_interrupt(central_fhc, data0);
-                break;
-
+                irq->handler(irq, irq->arg);
+        } else if (data0 > config.base) {
+                /*
+                 * This is a cross-call.
+                 * data0 contains address of kernel function.
+                 * We call the function only after we verify
+                 * it is on of the supported ones.
+                 */
+#ifdef CONFIG_SMP
+                if (data0 == (uintptr_t) tlb_shootdown_ipi_recv) {
+                        tlb_shootdown_ipi_recv();
+                }
 #endif
-        default:
-                if (data0 > config.base) {
-                        /*
-                         * This is a cross-call.
-                         * data0 contains address of kernel function.
-                         * We call the function only after we verify
-                         * it is on of the supported ones.
-                         */
-#ifdef CONFIG_SMP
-                        if (data0 == (uintptr_t) tlb_shootdown_ipi_recv) {
-                                tlb_shootdown_ipi_recv();
-                                break;
-                        }
+        } else {
+                /*
+                 * Spurious interrupt.
+                 */
+#ifdef CONFIG_DEBUG
+                printf("cpu%d: spurious interrupt (intrcv=%#llx, data0=%#llx)\n", CPU->id, intrcv, data0);
 #endif
-                }
-                        
-                printf("cpu%d: spurious interrupt (intrcv=%#llx, data0=%#llx)\n", CPU->id, intrcv, data0);
-                break;
         }