Changeset 3e828ea in mainline for kernel/arch/mips32/src/mach/malta/malta.c

Timestamp:

2019-09-23T12:49:29Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

9be2358

Parents:

9259d20 (diff), 1a4ec93f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Jiri Svoboda <jiri@…> (2019-09-22 12:49:07)

git-committer:

Jiri Svoboda <jiri@…> (2019-09-23 12:49:29)

Message:

Merge changes from master, especially Meson build

File:

• kernel/arch/mips32/src/mach/malta/malta.c (modified) (4 diffs)

kernel/arch/mips32/src/mach/malta/malta.c

@@ -42 +42 @@
 #include <genarch/srln/srln.h>
 #include <arch/interrupt.h>
+#include <stdbool.h>
+#include <byteorder.h>
+#include <sysinfo/sysinfo.h>
+#include <log.h>
 
 static void malta_init(void);
@@ -68 +72 @@
 #endif
 
-#ifdef CONFIG_NS16550
-static void tty_clear_interrupt(void *arg, inr_t inr)
+static void malta_isa_irq_handler(unsigned int i)
 {
-        (void) pio_read_8((ioport8_t *) GT64120_PCI0_INTACK);
-        pic_eoi();
+        uint8_t isa_irq = host2uint32_t_le(pio_read_32(GT64120_PCI0_INTACK));
+        if (i8259_is_spurious(isa_irq)) {
+                i8259_handle_spurious(isa_irq);
+#ifdef CONFIG_DEBUG
+                log(LF_ARCH, LVL_DEBUG, "cpu%u: PIC spurious interrupt %u",
+                    CPU->id, isa_irq);
+                return;
+#endif
+        }
+        irq_t *irq = irq_dispatch_and_lock(isa_irq);
+        if (irq) {
+                irq->handler(irq);
+                irq_spinlock_unlock(&irq->lock, false);
+        } else {
+#ifdef CONFIG_DEBUG
+                log(LF_ARCH, LVL_DEBUG, "cpu%u: unhandled IRQ (irq=%u)",
+                    CPU->id, isa_irq);
+#endif
+        }
+        i8259_eoi(isa_irq);
 }
-#endif
 
 void malta_init(void)
 {
-        i8259_init((i8259_t *) PIC0_BASE, (i8259_t *) PIC1_BASE, 2, 0, 8);
+        irq_init(ISA_IRQ_COUNT, ISA_IRQ_COUNT);
+
+        i8259_init((i8259_t *) PIC0_BASE, (i8259_t *) PIC1_BASE, 0);
+        sysinfo_set_item_val("i8259", NULL, true);
+
+        int_handler[INT_HW0] = malta_isa_irq_handler;
+        cp0_unmask_int(INT_HW0);
 
 #if (defined(CONFIG_NS16550) || defined(CONFIG_NS16550_OUT))
@@ -86 +112 @@
         outdev_t **tty_out_ptr = NULL;
 #endif
-        tty_instance = ns16550_init((ioport8_t *) TTY_BASE, 0, TTY_CPU_INT,
-            tty_clear_interrupt, NULL, tty_out_ptr);
+        tty_instance = ns16550_init((ioport8_t *) TTY_BASE, 0, TTY_ISA_IRQ,
+            NULL, NULL, tty_out_ptr);
 #endif
 }
@@ -120 +146 @@
                         indev_t *srln = srln_wire(srln_instance, sink);
                         ns16550_wire(tty_instance, srln);
-                        pic_enable_irqs(1 << TTY_ISA_IRQ);
-                        cp0_unmask_int(TTY_CPU_INT);
+                        i8259_enable_irqs(1 << TTY_ISA_IRQ);
                 }
         }