Changeset 0d107f31 in mainline for kernel/genarch

Timestamp:

2006-10-13T20:42:54Z (19 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.

Location:

kernel/genarch

Files:

• include/kbd/ns16550.h (modified) (2 diffs)
• include/kbd/z8530.h (modified) (2 diffs)
• src/kbd/ns16550.c (modified) (2 diffs)
• src/kbd/z8530.c (modified) (2 diffs)

kernel/genarch/include/kbd/ns16550.h

@@ -39 +39 @@
 
 #include <typedefs.h>
+#include <irq.h>
 
 extern void ns16550_init(void);
@@ -45 +46 @@
 extern void ns16550_release(void);
 extern char ns16550_key_read(chardev_t *d);
+extern irq_ownership_t ns16550_claim(void);
+extern void ns16550_irq_handler(irq_t *irq, void *arg, ...);
 
 #endif

kernel/genarch/include/kbd/z8530.h

@@ -38 +38 @@
 #define KERN_Z8530_H_
 
+#include <irq.h>
 #include <typedefs.h>
-
-#define Z8530_INTRCV_DATA0      0x39    /* hardcoded for use in Simics */
 
 extern bool z8530_belongs_to_kernel;
@@ -50 +49 @@
 extern void z8530_interrupt(void);
 extern char z8530_key_read(chardev_t *d);
+extern irq_ownership_t z8530_claim(void);
+extern void z8530_irq_handler(irq_t *irq, void *arg, ...);
 
 #endif

kernel/genarch/src/kbd/ns16550.c

@@ -40 +40 @@
 #include <genarch/kbd/scanc_sun.h>
 #include <arch/drivers/ns16550.h>
+#include <irq.h>
 #include <arch/interrupt.h>
 #include <cpu.h>
@@ -161 +162 @@
 }
 
+irq_ownership_t ns16550_claim(void)
+{
+        /* TODO */
+        return IRQ_ACCEPT;
+}
+
+void ns16550_irq_handler(irq_t *irq, void *arg, ...)
+{
+        panic("Not yet implemented.\n");
+}
+
 /** @}
  */

kernel/genarch/src/kbd/z8530.c

@@ -40 +40 @@
 #include <genarch/kbd/scanc_sun.h>
 #include <arch/drivers/z8530.h>
+#include <irq.h>
 #include <arch/interrupt.h>
 #include <arch/drivers/kbd.h>
+#include <arch/drivers/fhc.h>
 #include <cpu.h>
 #include <arch/asm.h>
@@ -170 +172 @@
 }
 
+irq_ownership_t z8530_claim(void)
+{
+        return (z8530_read_a(RR0) & RR0_RCA);
+}
+
+void z8530_irq_handler(irq_t *irq, void *arg, ...)
+{
+        /*
+         * 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. Process the interrupt directly.
+         */
+        if (z8530_belongs_to_kernel)
+                z8530_interrupt();
+        else
+                ipc_irq_send_notif(0);
+        fhc_clear_interrupt(central_fhc, irq->inr);
+}
+
 /** @}
  */