foo

core/irq.c

@@ -1,10 +1,15 @@
-#include <zinnia/atomic.h>
+#include <zinnia/assert.h>
 #include <zinnia/irq.h>
+#include <zinnia/list.h>
 #include <zinnia/percpu.h>
+#include <zinnia/print.h>
 #include <arch/irq.h>
 
-void irq_set_state(bool state) {
-    arch_irq_set_state(state);
+[[__percpu]]
+struct irq_percpu irq_data;
+
+bool irq_set_state(bool state) {
+    return arch_irq_set_state(state);
 }
 
 bool irq_get_state() {
@@ -16,26 +21,49 @@ void irq_wait() {
 }
 
 void irq_lock() {
-    struct irq_percpu* cpu = &percpu_get()->irq;
-    if (atomic_load(&cpu->in_interrupt, ATOMIC_ACQUIRE))
-        return;
-
-    arch_irq_set_state(false);
-    atomic_fetch_add(&percpu_get()->irq.level, 1, ATOMIC_ACQ_REL);
+    bool prev = arch_irq_set_state(false);
+    struct irq_percpu* state = percpu_ref(irq_data);
+    if (state->depth++ == 0)
+        state->saved_state = prev;
 }
 
 void irq_unlock() {
-    struct irq_percpu* cpu = &percpu_get()->irq;
-    if (atomic_load(&cpu->in_interrupt, ATOMIC_ACQUIRE))
-        return;
-
-    uint32_t old_level = atomic_fetch_sub(&cpu->level, 1, ATOMIC_ACQ_REL);
-    // If it was 1, the new IRQ level is now 0.
-    if (old_level == 1) {
+    struct irq_percpu* state = percpu_ref(irq_data);
+    if (--state->depth == 0 && state->saved_state)
         arch_irq_set_state(true);
-    }
 }
 
-bool irq_set_interrupted(bool is_interrupted) {
-    return atomic_exchange(&percpu_get()->irq.in_interrupt, is_interrupted, ATOMIC_RELEASE);
+void irq_line_program(struct irq_line* line, enum irq_trigger_mode trigger, enum irq_polarity polarity) {
+    irq_lock();
+    line->mode = line->set_config(line, trigger, polarity);
+    irq_unlock();
+}
+
+void irq_line_raise(struct irq_line* line) {
+    assert(!arch_irq_get_state(), "Raised an IRQ line with interrupts enabled");
+
+    irq_lock();
+    line->is_busy = true;
+
+    bool claimed = false;
+    struct irq_handler* handler;
+    list_foreach(handler, &line->handlers, next) {
+        if (handler->raise(handler) == IRQ_STATUS_HANDLED)
+            claimed = true;
+    }
+
+    if (!claimed)
+        log("irq: Spurious interrupt\n");
+
+    if ((line->mode & IRQ_MODE_EOI) && line->eoi)
+        line->eoi(line);
+
+    line->is_busy = false;
+    irq_unlock();
+}
+
+void irq_line_attach(struct irq_line* line, struct irq_handler* handler) {
+    irq_lock();
+    list_insert_head(&line->handlers, handler, next);
+    irq_unlock();
 }