Changeset 108448 in vbox for trunk/src/VBox/VMM/VMMAll/GICAll.cpp

Timestamp:

Mar 5, 2025 9:20:57 AM (7 weeks ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

167822

Message:

VMM/GIC: bugref:10404 Use the function that combines getting the highest priority pending interrupt.

File:

• trunk/src/VBox/VMM/VMMAll/GICAll.cpp (modified) (5 diffs)

trunk/src/VBox/VMM/VMMAll/GICAll.cpp

@@ -1653 +1653 @@
 
 
+#if 0
 /**
  * Gets the highest priority pending distributor interrupt that can be forwarded to
@@ -1811 +1812 @@
     return uIntId;
 }
+#endif
 
 
@@ -1987 +1989 @@
     LogFlowFunc(("fGroup0=%RTbool fGroup1=%RTbool\n", fGroup0, fGroup1));
 
-    /** @todo Later combine the redistributor and distributor interrupt
-     *        gathering.  */
-
     /* Get highest priority pending interrupt from the distributor. */
-    uint8_t  bPriority;
-    uint16_t idxIntr;
-    uint16_t uIntId = gicDistGetHighestPrioPendingIntr(pGicDev, fGroup0, fGroup1, &idxIntr, &bPriority);
-
-    /* Compare with the highest priority pending interrupt from the redistributor. */
-    PGICCPU  pGicCpu   = VMCPU_TO_GICCPU(pVCpu);
-    bool     fInRedist = false;
-    uint8_t  bPriorityRedist;
-    uint16_t idxRedistIntr;
-    uint16_t const uIntIdRedist = gicReDistGetHighestPrioPendingIntr(pGicCpu, fGroup0, fGroup1, &idxRedistIntr, &bPriorityRedist);
-    if (   uIntIdRedist != GIC_INTID_RANGE_SPECIAL_NO_INTERRUPT
-        && bPriorityRedist < bPriority)
-    {
-        fInRedist = true;
-        bPriority = bPriorityRedist;
-        uIntId    = uIntIdRedist;
-        idxIntr   = idxRedistIntr;
-    }
-
-    /* Sanity check if the interrupt ID is within known ranges. */
-    Assert(   GIC_IS_INTR_SGI_OR_PPI(uIntId)
-           || GIC_IS_INTR_SPI(uIntId)
-           || GIC_IS_INTR_EXT_PPI(uIntId)
-           || GIC_IS_INTR_EXT_SPI(uIntId)
-           || uIntId == GIC_INTID_RANGE_SPECIAL_NO_INTERRUPT);
-    /* Ensure that if no interrupt is pending, the priority is appropriate. */
-    Assert(uIntId != GIC_INTID_RANGE_SPECIAL_NO_INTERRUPT || bPriority == GIC_IDLE_PRIORITY);
+    uint8_t   bPriority;
+    uint16_t  idxIntr;
+    PGICCPU   pGicCpu = VMCPU_TO_GICCPU(pVCpu);
+    uint16_t const uIntId = gicGetHighestPrioPendingIntrEx(pGicDev, pGicCpu, fGroup0, fGroup1, &idxIntr, &bPriority);
 
     /* Acknowledge the interrupt. */
     if (uIntId != GIC_INTID_RANGE_SPECIAL_NO_INTERRUPT)
     {
-        if (fInRedist)
+        bool const fIsRedistIntId = GIC_IS_INTR_SGI_OR_PPI(uIntId) || GIC_IS_INTR_EXT_PPI(uIntId);
+        if (fIsRedistIntId)
         {
             /** @todo Check if the interrupt has sufficient priority (preemption level
@@ -2053 +2030 @@
              *        checking?). */
 
+            /* Sanity check if the interrupt ID belongs to the distirbutor. */
+            Assert(GIC_IS_INTR_SPI(uIntId) || GIC_IS_INTR_EXT_SPI(uIntId));
+
             /* Mark the interrupt as active. */
             Assert(idxIntr < sizeof(pGicDev->bmIntrActive) * 8);
@@ -2070 +2050 @@
         }
     }
+    else
+        Assert(bPriority == GIC_IDLE_PRIORITY);
 
     LogFlowFunc(("uIntId=%u\n", uIntId));