Changeset 108997 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

Apr 16, 2025 10:42:46 AM (3 weeks ago)

Author:

vboxsync

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

168520

Message:

VMM/GIC: bugref:10877 LPI, work-in-progress.

File:

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

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

@@ -661 +661 @@
 
 
-static void gicDistReadLpiConfigTableFromMemory(PPDMDEVINS pDevIns, PGICDEV pGicDev)
+static void gicDistReadLpiConfigTableFromMem(PPDMDEVINS pDevIns, PGICDEV pGicDev)
 {
     Assert(pGicDev->fEnableLpis);
     LogFlowFunc(("\n"));
 
-    /* Check if the guest is disabling LPIs by setting GICR_PROPBASER.IDBits < 13. */
+    /* Check if the guest is disabling LPIs by setting the number of LPI INTID bits below the minimum required bits. */
     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)
@@ -680 +680 @@
     int const rc = PDMDevHlpPhysReadMeta(pDevIns, GCPhysLpiConfigTable, (void *)&pGicDev->abLpiConfig[0], cbLpiConfigTable);
     AssertRC(rc);
+}
+
+
+static void gicReDistReadLpiPendingBitmapFromMem(PPDMDEVINS pDevIns, PVMCPU pVCpu, PGICDEV pGicDev)
+{
+    Assert(pGicDev->fEnableLpis);
+    LogFlowFunc(("\n"));
+
+    PGICCPU    pGicCpu   = VMCPU_TO_GICCPU(pVCpu);
+    bool const fIsZeroed = RT_BF_GET(pGicDev->uLpiPendingBaseReg.u, GIC_BF_REDIST_REG_PENDBASER_PTZ);
+    if (!fIsZeroed)
+    {
+        /* Copy the LPI pending bitmap from guest memory to our internal cache. */
+        RTGCPHYS const GCPhysLpiPendingBitmap = (pGicDev->uLpiPendingBaseReg.u & GIC_BF_REDIST_REG_PENDBASER_PHYS_ADDR_MASK)
+                                              + GIC_INTID_RANGE_LPI_START;  /* Skip first 1KB (since LPI INTIDs start at 8192). */
+        uint32_t const cbLpiPendingBitmap     = sizeof(pGicDev->bmLpiPending);
+
+        /** @todo Try releasing and re-acquiring the device critical section here.
+         *        Probably safe, but haven't verified this... */
+        int const rc = PDMDevHlpPhysReadMeta(pDevIns, GCPhysLpiPendingBitmap, (void *)&pGicCpu->bmLpiPending[0],
+                                             cbLpiPendingBitmap);
+        AssertRC(rc);
+    }
+    else
+        RT_ZERO(pGicCpu->bmLpiPending); /* Paranoia. */
 }
 
@@ -2482 +2507 @@
             break;
         case GIC_REDIST_REG_CTLR_OFF:
-            pGicDev->fEnableLpis = RT_BOOL(uValue & GIC_REDIST_REG_CTLR_ENABLE_LPI);
-            if (pGicDev->fEnableLpis)
-                gicDistReadLpiConfigTableFromMemory(pDevIns, pGicDev);
-            break;
+        {
+            /* Check if LPIs are supported and whether the enable LPI bit changed. */
+            uint32_t const uOldCtlr = pGicDev->fEnableLpis ? GIC_REDIST_REG_CTLR_ENABLE_LPI : 0;
+            uint32_t const uNewCtlr = uValue & GIC_REDIST_REG_CTLR_ENABLE_LPI;
+            if (   pGicDev->fLpi
+                && ((uNewCtlr ^ uOldCtlr) & GIC_REDIST_REG_CTLR_ENABLE_LPI))
+            {
+                pGicDev->fEnableLpis = RT_BOOL(uNewCtlr & GIC_REDIST_REG_CTLR_ENABLE_LPI);
+                if (pGicDev->fEnableLpis)
+                {
+                    gicDistReadLpiConfigTableFromMem(pDevIns, pGicDev);
+                    gicReDistReadLpiPendingBitmapFromMem(pDevIns, pVCpu, pGicDev);
+                }
+                else
+                {
+                    PGICCPU pGicCpu = VMCPU_TO_GICCPU(pVCpu);
+                    RT_ZERO(pGicCpu->bmLpiPending);
+                }
+            }
+            break;
+        }
         case GIC_REDIST_REG_PROPBASER_OFF:
             pGicDev->uLpiConfigBaseReg.s.Lo = uValue & RT_LO_U32(GIC_REDIST_REG_PROPBASER_RW_MASK);
@@ -3178 +3220 @@
     pGicCpu->fIntrGroup0Enabled = false;
     pGicCpu->fIntrGroup1Enabled = false;
+    RT_ZERO(pGicCpu->bmLpiPending);
 }