Changeset 108742 in vbox for trunk/src

Timestamp:

Mar 26, 2025 6:42:04 AM (3 weeks ago)

Author:

vboxsync

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

168167

Message:

Main: bugref:10877 Added ACPI MADT table entry for the GIC ITS and allow configuring it for the VM from ConsoleImpl.

Location:

trunk/src/VBox/Main

Files:

• include/SystemTableBuilder.h (modified) (3 diffs)
• src-client/ConsoleImplConfigArmV8.cpp (modified) (4 diffs)
• src-client/SystemTableBuilder.cpp (modified) (4 diffs)

trunk/src/VBox/Main/include/SystemTableBuilder.h

@@ -61 +61 @@
     virtual int addMmioDeviceNoIrq(const char *pszVBoxName, uint32_t uInstance, RTGCPHYS GCPhysMmio, RTGCPHYS cbMmio);
     virtual int addMmioDevice(const char *pszVBoxName, uint32_t uInstance, RTGCPHYS GCPhysMmio, RTGCPHYS cbMmio, uint32_t u32Irq);
-    virtual int configureGic(uint32_t cCpus, RTGCPHYS GCPhysIntcDist, RTGCPHYS cbMmioIntcDist, RTGCPHYS GCPhysIntcReDist, RTGCPHYS cbMmioIntcReDist);
+    virtual int configureGic(uint32_t cCpus, RTGCPHYS GCPhysIntcDist, RTGCPHYS cbMmioIntcDist, RTGCPHYS GCPhysIntcReDist,
+                             RTGCPHYS cbMmioIntcReDist, RTGCPHYS GCPhysIntcIts, RTGCPHYS cbMmioIntcIts);
     virtual int configureClock(void);
     virtual int configurePcieRootBus(const char *pszVBoxName, uint32_t aPinIrqs[4], RTGCPHYS GCPhysMmioPio, RTGCPHYS GCPhysMmioEcam, size_t cbPciMmioEcam,
@@ -86 +87 @@
     int addMmioDeviceNoIrq(const char *pszVBoxName, uint32_t uInstance, RTGCPHYS GCPhysMmio, RTGCPHYS cbMmio);
     int addMmioDevice(const char *pszVBoxName, uint32_t uInstance, RTGCPHYS GCPhysMmio, RTGCPHYS cbMmio, uint32_t u32Irq);
-    int configureGic(uint32_t cCpus, RTGCPHYS GCPhysIntcDist, RTGCPHYS cbMmioIntcDist, RTGCPHYS GCPhysIntcReDist, RTGCPHYS cbMmioIntcReDist);
+    int configureGic(uint32_t cCpus, RTGCPHYS GCPhysIntcDist, RTGCPHYS cbMmioIntcDist, RTGCPHYS GCPhysIntcReDist,
+                     RTGCPHYS cbMmioIntcReDist, RTGCPHYS GCPhysIntcIts, RTGCPHYS cbMmioIntcIts);
     int configureClock(void);
     int configurePcieRootBus(const char *pszVBoxName, uint32_t aPinIrqs[4], RTGCPHYS GCPhysMmioPio, RTGCPHYS GCPhysMmioEcam, size_t cbPciMmioEcam,
@@ -111 +113 @@
     RTGCPHYS m_GCPhysIntcReDist;
     RTGCPHYS m_cbMmioIntcReDist;
+    RTGCPHYS m_GCPhysIntcIts;
+    RTGCPHYS m_cbMmioIntcIts;
 
     RTGCPHYS m_GCPhysPciMmioEcam;

trunk/src/VBox/Main/src-client/ConsoleImplConfigArmV8.cpp

@@ -507 +507 @@
         RTGCPHYS cbMmioIntcReDist;
 
+        /** @todo Add API for configuring a GIC ITS for the VM and init this value from
+         *        there. */
+        BOOL fGicIts = FALSE;
+
         /* Allow for up to 256 vCPUs in the future without changing the address space layout. */
         hrc = pResMgr->assignMmioRegion("gic", _64K + 256 * _128K, &GCPhysIntcDist, &cbMmioIntcDist);     H();
@@ -513 +517 @@
         cbMmioIntcDist = _64K;
 
+        /* Reserve an MMIO region for the GIC ITS even if it might not be configured for the VM. */
         hrc = pResMgr->assignMmioRegion("gic-its", 2 * _64K, &GCPhysIntcIts, &cbMmioIntcIts);             H();
 
@@ -526 +531 @@
         InsertConfigInteger(pCfg,  "DistributorMmioBase",   GCPhysIntcDist);
         InsertConfigInteger(pCfg,  "RedistributorMmioBase", GCPhysIntcReDist);
-        InsertConfigInteger(pCfg,  "ItsMmioBase",           GCPhysIntcIts);
+        if (fGicIts == TRUE)
+            InsertConfigInteger(pCfg, "ItsMmioBase", GCPhysIntcIts);
 
         vrc = RTFdtNodeAddF(hFdt, "intc@%RGp", GCPhysIntcDist);                                         VRC();
@@ -544 +550 @@
         {
             vrc = pSysTblsBldAcpi->configureGic(cCpus, GCPhysIntcDist, cbMmioIntcDist,
-                                                GCPhysIntcReDist, cbMmioIntcReDist);
+                                                GCPhysIntcReDist, cbMmioIntcReDist, GCPhysIntcIts, cbMmioIntcIts);
             VRC();
         }

trunk/src/VBox/Main/src-client/SystemTableBuilder.cpp

@@ -345 +345 @@
 
 int SystemTableBuilderAcpi::configureGic(uint32_t cCpus, RTGCPHYS GCPhysIntcDist, RTGCPHYS cbMmioIntcDist, RTGCPHYS GCPhysIntcReDist,
-                                         RTGCPHYS cbMmioIntcReDist)
+                                         RTGCPHYS cbMmioIntcReDist, RTGCPHYS GCPhysIntcIts, RTGCPHYS cbMmioIntcIts)
 {
     m_cCpus            = cCpus;
@@ -352 +352 @@
     m_GCPhysIntcReDist = GCPhysIntcReDist;
     m_cbMmioIntcReDist = cbMmioIntcReDist;
+    m_GCPhysIntcIts    = GCPhysIntcIts;
+    m_cbMmioIntcIts    = cbMmioIntcIts;
     return VINF_SUCCESS;
 }
@@ -522 +524 @@
 
     cbMadt += sizeof(*pGicr);
+
+    /* Build the GITS. */
+    PACPIMADTGICITS pGits = (PACPIMADTGICITS)(pGicr + 1);
+    pGits->bType                    = ACPI_MADT_INTR_CTRL_TYPE_GIC_ITS;
+    pGits->cbThis                   = sizeof(*pGits);
+    pGits->u64PhysAddrBase          = m_GCPhysIntcIts;
+    pGits->u32GicItsId              = 0;
+
+    cbMadt += sizeof(*pGits);
 
     /* Finalize the MADT. */
@@ -1442 +1453 @@
 
 int SystemTableBuilder::configureGic(uint32_t cCpus, RTGCPHYS GCPhysIntcDist, RTGCPHYS cbMmioIntcDist, RTGCPHYS GCPhysIntcReDist,
-                                     RTGCPHYS cbMmioIntcReDist)
-{
-    RT_NOREF(cCpus, GCPhysIntcDist, cbMmioIntcDist, GCPhysIntcReDist, cbMmioIntcReDist);
+                                     RTGCPHYS cbMmioIntcReDist, RTGCPHYS GCPhysIntcIts, RTGCPHYS cbMmioIntcIts)
+{
+    RT_NOREF(cCpus, GCPhysIntcDist, cbMmioIntcDist, GCPhysIntcReDist, cbMmioIntcReDist, GCPhysIntcIts, cbMmioIntcIts);
     return VERR_NOT_IMPLEMENTED;
 }