arm: check active_irq in the common GIC code

axel-h · Mar 8, 2023 · 0c6e69b · 0c6e69b
1 parent 050a01a
commit 0c6e69b
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 44 deletions.
diff --git a/include/arch/arm/arch/machine/gic_common.h b/include/arch/arm/arch/machine/gic_common.h
@@ -72,6 +72,44 @@ irq_t irqInvalid = (uint16_t) -1;
  */
 extern word_t active_irq[CONFIG_MAX_NUM_NODES];
 
+static inline irq_t getActiveIRQ(void)
+{
+    irq_t irq = active_irq[CURRENT_CPU_INDEX()];
+    if (!IS_IRQ_VALID(irq)) {
+        irq = arm_gic_get_pending_interrupt();
+        if (!IS_IRQ_VALID(irq)) {
+            return irqInvalid;
+        }
+        active_irq[CURRENT_CPU_INDEX()] = irq;
+    }
+    return CORE_IRQ_TO_IRQT(CURRENT_CPU_INDEX(), irq & IRQ_MASK);
+}
+
+static inline void ackInterrupt(irq_t irq)
+{
+    word_t hw_irq = IRQT_TO_IRQ(irq);
+    if (is_irq_edge_triggered(hw_irq)) {
+        dist_pending_clr(hw_irq);
+    }
+
+    irq_t a_irq = active_irq[CURRENT_CPU_INDEX()];
+    if (!IS_IRQ_VALID(a_irq)) {
+        /* This is not supposed to happen. */
+        printf("WARNING: can't ack invalid IRQ %d\n", a_irq);
+        return;
+    }
+
+    if ((a_irq & IRQ_MASK) != hw_irq) {
+        /* The ack does not match the interrupt currently pending. */
+        printf("WARNING: ack IRQ %d differs from pending IRQ %d\n", a_irq, hw_irq);
+        hw_irq = a_irq;
+        return;
+    }
+
+    arm_gic_ack_interrupt(hw_irq);
+    active_irq[CURRENT_CPU_INDEX()] = IRQ_NONE;
+}
+
 static inline void handleSpuriousIRQ(void)
 {
     /* Nothing to do here */

diff --git a/include/arch/arm/arch/machine/gic_v2.h b/include/arch/arm/arch/machine/gic_v2.h
@@ -156,20 +156,9 @@ static inline void dist_enable_set(word_t irq)
     gic_dist->enable_set[word] = BIT(bit);
 }
 
-static inline irq_t getActiveIRQ(void)
+static inline irq_t arm_gic_get_pending_interrupt(void)
 {
-    irq_t irq;
-    if (!IS_IRQ_VALID(active_irq[CURRENT_CPU_INDEX()])) {
-        active_irq[CURRENT_CPU_INDEX()] = gic_cpuiface->int_ack;
-    }
-
-    if (IS_IRQ_VALID(active_irq[CURRENT_CPU_INDEX()])) {
-        irq = CORE_IRQ_TO_IRQT(CURRENT_CPU_INDEX(), active_irq[CURRENT_CPU_INDEX()] & IRQ_MASK);
-    } else {
-        irq = irqInvalid;
-    }
-
-    return irq;
+    return gic_cpuiface->int_ack;
 }
 
 /*
@@ -194,16 +183,13 @@ static inline void maskInterrupt(bool_t disable, irq_t irq)
     }
 }
 
-static inline void ackInterrupt(irq_t irq)
+static inline void arm_gic_ack_interrupt(irq_t irq)
 {
-    assert(IS_IRQ_VALID(active_irq[CURRENT_CPU_INDEX()])
-           && (active_irq[CURRENT_CPU_INDEX()] & IRQ_MASK) == IRQT_TO_IRQ(irq));
-    if (is_irq_edge_triggered(IRQT_TO_IRQ(irq))) {
-        dist_pending_clr(IRQT_TO_IRQ(irq));
+    word_t hw_irq = IRQT_TO_IRQ(irq);
+    if (is_irq_edge_triggered(hw_irq)) {
+        dist_pending_clr(hw_irq);
     }
-    gic_cpuiface->eoi = active_irq[CURRENT_CPU_INDEX()];
-    active_irq[CURRENT_CPU_INDEX()] = IRQ_NONE;
-
+    gic_cpuiface->eoi = irq;
 }
 
 

diff --git a/include/arch/arm/arch/machine/gic_v3.h b/include/arch/arm/arch/machine/gic_v3.h
@@ -286,23 +286,11 @@ static inline void gic_enable_set(word_t irq)
 
 }
 
-static inline irq_t getActiveIRQ(void)
+static inline irq_t arm_gic_get_pending_interrupt(void)
 {
-    irq_t irq;
-
-    if (!IS_IRQ_VALID(active_irq[CURRENT_CPU_INDEX()])) {
-        uint32_t val = 0;
-        SYSTEM_READ_WORD(ICC_IAR1_EL1, val);
-        active_irq[CURRENT_CPU_INDEX()] = val;
-    }
-
-    if (IS_IRQ_VALID(active_irq[CURRENT_CPU_INDEX()])) {
-        irq = CORE_IRQ_TO_IRQT(CURRENT_CPU_INDEX(), active_irq[CURRENT_CPU_INDEX()] & IRQ_MASK);
-    } else {
-        irq = irqInvalid;
-    }
-
-    return irq;
+    uint32_t val = 0;
+    SYSTEM_READ_WORD(ICC_IAR1_EL1, val);
+    return (irq_t)val;
 }
 
 /*
@@ -333,19 +321,14 @@ static inline void maskInterrupt(bool_t disable, irq_t irq)
     }
 }
 
-static inline void ackInterrupt(irq_t irq)
+static inline void arm_ack_interrupt(irq_t irq)
 {
     word_t hw_irq = IRQT_TO_IRQ(irq);
-    assert(IS_IRQ_VALID(active_irq[CURRENT_CPU_INDEX()]) && (active_irq[CURRENT_CPU_INDEX()] & IRQ_MASK) == hw_irq);
-
     if (is_irq_edge_triggered(hw_irq)) {
         gic_pending_clr(hw_irq);
     }
-
     /* Set End of Interrupt for active IRQ: ICC_EOIR1_EL1 */
-    SYSTEM_WRITE_WORD(ICC_EOIR1_EL1, active_irq[CURRENT_CPU_INDEX()]);
-    active_irq[CURRENT_CPU_INDEX()] = IRQ_NONE;
-
+    SYSTEM_WRITE_WORD(ICC_EOIR1_EL1, hw_irq);
 }
 
 #ifdef CONFIG_ARM_HYPERVISOR_SUPPORT