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

Timestamp:

Apr 15, 2025 12:30:07 PM (4 weeks ago)

Author:

vboxsync

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

168496

Message:

VMM/GIC: bugref:10877 Minus 1 bites us again and LPI configuration table work-in-progress.

File:

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

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

@@ -661 +661 @@
 
 
+static void gicDistReadLpiConfigTableFromMemory(PPDMDEVINS pDevIns, PGICDEV pGicDev)
+{
+    Assert(pGicDev->fEnableLpis);
+    LogFlowFunc(("\n"));
+
+    /* Check if the guest is disabling LPIs by setting GICR_PROPBASER.IDBits < 13. */
+    uint8_t const cIdBits = RT_BF_GET(pGicDev->uLpiConfigBaseReg.u, GIC_BF_REDIST_REG_PROPBASER_ID_BITS) + 1;
+    if (cIdBits < GIC_LPI_ID_BITS_MIN)
+        return;
+
+    /* Copy the LPI config table from guest memory to our internal cache. */
+    Assert(UINT32_C(2) << pGicDev->uMaxLpi <= RT_ELEMENTS(pGicDev->abLpiConfig));
+    RTGCPHYS const GCPhysLpiConfigTable = pGicDev->uLpiConfigBaseReg.u & GIC_BF_REDIST_REG_PROPBASER_PHYS_ADDR_MASK;
+    uint32_t const cbLpiConfigTable     = sizeof(pGicDev->abLpiConfig);
+
+    /** @todo Try releasing and re-acquiring the device critical section here.
+     *        Probably safe, but haven't verified this... */
+    int const rc = PDMDevHlpPhysReadMeta(pDevIns, GCPhysLpiConfigTable, (void *)&pGicDev->abLpiConfig[0], cbLpiConfigTable);
+    AssertRC(rc);
+}
+
+
 /**
  * Updates the internal IRQ state and sets or clears the appropriate force action
@@ -2050 +2072 @@
                      | (pGicDev->fMbi ? GIC_DIST_REG_TYPER_MBIS : 0)
                      | (pGicDev->fRangeSel ? GIC_DIST_REG_TYPER_RSS : 0)
-                     | GIC_DIST_REG_TYPER_IDBITS_SET(16)             /* We only support 16-bit interrupt IDs. */
+                     | GIC_DIST_REG_TYPER_IDBITS_SET(15)             /* We only support 16-bit interrupt IDs. */
                      | (pGicDev->fAff3Levels ? GIC_DIST_REG_TYPER_A3V : 0);
             if (pGicDev->fExtSpi)
@@ -2461 +2483 @@
         case GIC_REDIST_REG_CTLR_OFF:
             pGicDev->fEnableLpis = RT_BOOL(uValue & GIC_REDIST_REG_CTLR_ENABLE_LPI);
+            if (pGicDev->fEnableLpis)
+                gicDistReadLpiConfigTableFromMemory(pDevIns, pGicDev);
             break;
         case GIC_REDIST_REG_PROPBASER_OFF: