ioapic: extend interface for flexibility and irq masking

- We need a configure_irq because SCI has special polarity and trigger mode
- We need mask_irq to implement ACPICA handler removal

Signed-off-by: Sandro Rüegge <[email protected]>

Author: sparchatus

arch/x86/ioapic.c

@@ -275,12 +275,11 @@ static ioapic_t *find_ioapic_for_irq(uint32_t irq_src) {
     return NULL;
 }
 
-void configure_isa_irq(unsigned irq_src, uint8_t vector, ioapic_dest_mode_t dst_mode,
-                       uint8_t dst_ids) {
+void configure_irq(unsigned irq_src, uint8_t vector, ioapic_dest_mode_t dst_mode,
+                   uint8_t dst_ids, ioapic_polarity_t polarity,
+                   ioapic_trigger_mode_t trigger_mode) {
     irq_override_t *irq_override = get_system_isa_bus_irq(IOAPIC_IRQ_TYPE_INT, irq_src);
     ioapic_redirtbl_entry_t entry;
-    ioapic_polarity_t polarity = IOAPIC_POLARITY_AH;
-    ioapic_trigger_mode_t trigger_mode = IOAPIC_TRIGGER_MODE_EDGE;
     ioapic_t *ioapic;
 
     if (irq_override) {
@@ -293,9 +292,13 @@ void configure_isa_irq(unsigned irq_src, uint8_t vector, ioapic_dest_mode_t dst_
 
         if (irq_override->polarity == IOAPIC_IRQ_OVR_POLARITY_AL)
             polarity = IOAPIC_POLARITY_AL;
+        else if (irq_override->polarity == IOAPIC_IRQ_OVR_POLARITY_AH)
+            polarity = IOAPIC_POLARITY_AH;
 
         if (irq_override->trigger_mode == IOAPIC_IRQ_OVR_TRIGGER_LT)
             trigger_mode = IOAPIC_TRIGGER_MODE_LEVEL;
+        else if (irq_override->trigger_mode == IOAPIC_IRQ_OVR_TRIGGER_ET)
+            trigger_mode = IOAPIC_TRIGGER_MODE_EDGE;
     }
     else {
         ioapic = find_ioapic_for_irq(irq_src);
@@ -311,3 +314,31 @@ void configure_isa_irq(unsigned irq_src, uint8_t vector, ioapic_dest_mode_t dst_
     entry.int_mask = IOAPIC_INT_UNMASK;
     set_ioapic_redirtbl_entry(ioapic, irq_src, &entry);
 }
+
+void configure_isa_irq(unsigned irq_src, uint8_t vector, ioapic_dest_mode_t dst_mode,
+                       uint8_t dst_ids) {
+    configure_irq(irq_src, vector, dst_mode, dst_ids, IOAPIC_POLARITY_AH,
+                  IOAPIC_TRIGGER_MODE_EDGE);
+}
+
+void mask_irq(unsigned irq_src) {
+    irq_override_t *irq_override = get_system_isa_bus_irq(IOAPIC_IRQ_TYPE_INT, irq_src);
+    ioapic_redirtbl_entry_t entry;
+    ioapic_t *ioapic;
+
+    if (irq_override) {
+        irq_src = irq_override->dst;
+
+        if (irq_override->dst_id == IOAPIC_DEST_ID_UNKNOWN)
+            ioapic = find_ioapic_for_irq(irq_src);
+        else
+            ioapic = get_ioapic(irq_override->dst_id);
+    }
+    else {
+        ioapic = find_ioapic_for_irq(irq_src);
+    }
+
+    get_ioapic_redirtbl_entry(ioapic, irq_src, &entry);
+    entry.int_mask = IOAPIC_INT_MASK;
+    set_ioapic_redirtbl_entry(ioapic, irq_src, &entry);
+}

include/arch/x86/ioapic.h

@@ -216,8 +216,12 @@ extern int get_ioapic_redirtbl_entry(ioapic_t *ioapic, unsigned n,
 extern int set_ioapic_redirtbl_entry(ioapic_t *ioapic, unsigned n,
                                      ioapic_redirtbl_entry_t *entry);
 extern void set_ioapic_irq_mask(ioapic_t *ioapic, unsigned irq, ioapic_int_mask_t mask);
+extern void configure_irq(unsigned irq_src, uint8_t vector, ioapic_dest_mode_t dst_mode,
+                          uint8_t dst_ids, ioapic_polarity_t polarity,
+                          ioapic_trigger_mode_t trigger_mode);
 extern void configure_isa_irq(unsigned irq_src, uint8_t vector,
                               ioapic_dest_mode_t dst_mode, uint8_t dst_ids);
+extern void mask_irq(unsigned irq_src);
 
 /* Static declarations */