Changeset 106360 in vbox for trunk/src/VBox/Main/src-client

Timestamp:

Oct 16, 2024 12:58:46 PM (5 months ago)

Author:

vboxsync

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

165173

Message:

Main/ConsoleImplConfigArmV8.cpp: Generate ACPI tables if ACPI is enabled for the VM, bugref:10733

File:

• trunk/src/VBox/Main/src-client/ConsoleImplConfigArmV8.cpp (modified) (12 diffs)

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

@@ -68 +68 @@
 #include "BusAssignmentManager.h"
 #include "ResourceAssignmentManager.h"
+#include "SystemTableBuilder.h"
 #ifdef VBOX_WITH_EXTPACK
 # include "ExtPackManagerImpl.h"
@@ -188 +189 @@
                                                                                    _1G - (VBOXPLATFORMARMV8_PHYS_ADDR + _1M), /*cbMmio32*/
                                                                                    32                                         /*cInterrupts*/);
+    SystemTableBuilder *pSysTblsBldAcpi = NULL;
+
+    /*
+     * ACPI
+     */
+    BOOL fACPI;
+    hrc = firmwareSettings->COMGETTER(ACPIEnabled)(&fACPI);                                 H();
+    if (fACPI)
+        pSysTblsBldAcpi = SystemTableBuilder::createInstance(kSystemTableType_Acpi);
+
 
     /*
@@ -271 +282 @@
         vrc = RTFdtNodeFinalize(hFdt);
 
+        if (pSysTblsBldAcpi)
+        {
+            vrc = pSysTblsBldAcpi->configureClock();
+            VRC();
+        }
+
         /*
          * MM values.
@@ -294 +311 @@
         vrc = RTFdtNodePropertyAddString(  hFdt, "device_type",      "memory");             VRC();
         vrc = RTFdtNodeFinalize(hFdt);                                                      VRC();
+
+        if (pSysTblsBldAcpi)
+        {
+            vrc = pSysTblsBldAcpi->addMemory(GCPhysRam, cbRam);
+            VRC();
+        }
 
         /* Configure the CPUs in the system, only one socket and cluster at the moment. */
@@ -325 +348 @@
             }
             vrc = RTFdtNodeFinalize(hFdt);                                                  VRC();
+
+            if (pSysTblsBldAcpi)
+            {
+                vrc = pSysTblsBldAcpi->addCpu(i);
+                VRC();
+            }
         }
 
@@ -441 +470 @@
         vrc = RTFdtNodePropertyAddU32(     hFdt, "#interrupt-cells", 3);                                VRC();
 
+        if (pSysTblsBldAcpi)
+        {
+            vrc = pSysTblsBldAcpi->configureGic(cCpus, GCPhysIntcDist, cbMmioIntcDist,
+                                                GCPhysIntcReDist, cbMmioIntcReDist);
+            VRC();
+        }
+
 #if 0
         vrc = RTFdtNodeAddF(hFdt, "its@%RX32", 0x08080000);                                 VRC();
@@ -474 +510 @@
             vrc = RTFdtNodePropertyAddString(  hFdt, "compatible", "qemu,fw-cfg-mmio");     VRC();
             vrc = RTFdtNodeFinalize(hFdt);                                                  VRC();
+
+            if (pSysTblsBldAcpi)
+            {
+                vrc = pSysTblsBldAcpi->addMmioDeviceNoIrq("qemu-fw-cfg", 0, GCPhysMmioStart, cbMmio);
+                VRC();
+            }
         }
 
@@ -530 +572 @@
                                                  "arm,pl011", "arm,primecell");                     VRC();
             vrc = RTFdtNodeFinalize(hFdt);                                                          VRC();
+
+            if (pSysTblsBldAcpi)
+            {
+                vrc = pSysTblsBldAcpi->addMmioDevice("arm-pl011", ulInstance, GCPhysMmioStart, cbMmio, iIrq);
+                VRC();
+            }
 
             BOOL  fServer;
@@ -588 +636 @@
         vrc = RTFdtNodePropertyAddCellsU64(hFdt, "reg", 2, GCPhysMmioStart, cbMmio);        VRC();
         vrc = RTFdtNodeFinalize(hFdt);                                                      VRC();
+
+        if (pSysTblsBldAcpi)
+        {
+            vrc = pSysTblsBldAcpi->addMmioDevice("arm-pl061-gpio", 0, GCPhysMmioStart, _4K, iIrq); 
+            VRC();
+        }
 
         InsertConfigNode(pInst,    "LUN#0",           &pLunL0);
@@ -679 +733 @@
         vrc = RTFdtNodeFinalize(hFdt);                                                          VRC();
 
+        if (pSysTblsBldAcpi)
+        {
+            vrc = pSysTblsBldAcpi->configurePcieRootBus("pci-generic-ecam", aPinIrqs, GCPhysMmioStart, GCPhysPciMmioEcam,
+                                                        cbPciMmioEcam, GCPhysMmioStart, cbMmio, GCPhysPciMmio32, cbPciMmio32);
+            VRC();
+        }
+
         /*
          * VMSVGA compliant graphics controller.
@@ -802 +863 @@
     Assert(SUCCEEDED(hrc));
 
+    RTGCPHYS GCPhysXsdp = NIL_RTGCPHYS;
+    size_t cbAcpiXsdp = 0;
+    size_t cbAcpi     = 0;
+    if (pSysTblsBldAcpi)
+    {
+        vrc = pSysTblsBldAcpi->finishTables(VBOXPLATFORMARMV8_PHYS_ADDR + sizeof(ArmV8Platform) + RT_ALIGN_64(cbFdt, _64K),
+                                            hVfsIosDesc, &GCPhysXsdp, &cbAcpiXsdp, &cbAcpi);
+        AssertRCReturn(vrc, vrc);
+        Assert(GCPhysXsdp > VBOXPLATFORMARMV8_PHYS_ADDR);
+
+        /* Dump the ACPI table for debugging purposes if requested. */
+        Bstr SysTblsDumpVal;
+        hrc = mMachine->GetExtraData(Bstr("VBoxInternal2/DumpSysTables").raw(),
+                                     SysTblsDumpVal.asOutParam());
+        if (   hrc == S_OK
+            && SysTblsDumpVal.isNotEmpty())
+        {
+            vrc = pSysTblsBldAcpi->dumpTables(Utf8Str(SysTblsDumpVal).c_str());
+            AssertRCReturn(vrc, vrc);
+        }
+
+        delete pSysTblsBldAcpi;
+
+        vrc = RTVfsIoStrmZeroFill(hVfsIosDesc, (RTFOFF)(RT_ALIGN_64(cbAcpi, _64K) - cbAcpi));
+        AssertRCReturn(vrc, vrc);
+    }
+
     ArmV8Platform.u32Magic            = VBOXPLATFORMARMV8_MAGIC;
     ArmV8Platform.u32Version          = VBOXPLATFORMARMV8_VERSION;
@@ -810 +898 @@
     ArmV8Platform.i64OffFdt           = sizeof(ArmV8Platform);
     ArmV8Platform.cbFdt               = RT_ALIGN_64(cbFdt, _64K);
-    ArmV8Platform.i64OffAcpiXsdp      = 0;
-    ArmV8Platform.cbAcpiXsdp          = 0;
+    if (cbAcpi)
+    {
+        ArmV8Platform.i64OffAcpi      = sizeof(ArmV8Platform) + RT_ALIGN_64(cbFdt, _64K);
+        ArmV8Platform.cbAcpi          = RT_ALIGN_64(cbAcpi, _64K);
+        ArmV8Platform.i64OffAcpiXsdp  = GCPhysXsdp - VBOXPLATFORMARMV8_PHYS_ADDR;
+        ArmV8Platform.cbAcpiXsdp      = cbAcpiXsdp;
+    }
     ArmV8Platform.i64OffUefiRom       = -128 * _1M;
     ArmV8Platform.cbUefiRom           = _64M;