Changeset 108749 in vbox for trunk/src

Timestamp:

Mar 26, 2025 8:44:50 AM (3 weeks ago)

Author:

vboxsync

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

168174

Message:

Main: bugref:10877 Dont' add the ACPI MADT entry for the GIC ITS if it isn't enabled for the VM.

Location:

trunk/src/VBox/Main/src-client

Files:

• ConsoleImplConfigArmV8.cpp (modified) (1 diff)
• SystemTableBuilder.cpp (modified) (1 diff)

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

@@ -536 +536 @@
             InsertConfigInteger(pCfg, "Lpi",         1);
         }
+        else
+            GCPhysIntcIts = cbMmioIntcIts = 0;
 
         vrc = RTFdtNodeAddF(hFdt, "intc@%RGp", GCPhysIntcDist);                                         VRC();

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

@@ -525 +525 @@
     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);
+    /* Build the GITS only if it's enabled for the VM. */
+    if (m_GCPhysIntcIts)
+    {
+        Assert(m_cbMmioIntcIts > 0);
+        Assert(m_GCPhysIntcIts != NIL_RTGCPHYS);
+        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. */