Changeset 105600 in vbox for trunk/src/VBox/Main/src-client/ConsoleImplConfigArmV8.cpp

Timestamp:

Aug 6, 2024 9:39:44 AM (6 months ago)

Author:

vboxsync

Message:

VMM/ARM: Move the VBox ARMv8 platform descriptor from the end of the address space right after the UEFI region, bugref:10746

The original solution was to avoid as many hardcoded addresses as possible by placing the VBox region descriptor right at the end
of the guest physical address space. This turned out to be a bad idea because on M3 the host maximum physical address width and
guest maxmium physical address width differ so mapping the platform descriptor fails. Also saved states would not be portable if
a saved state is mvoed between systems with different physical address widths.
The solution is to move the platform descriptor right after the UEFI region and move the MMIO region, which grew from top to bottom
to start right after the base RAM region and grow upwards.

File:

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

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

@@ -108 +108 @@
 #define VRC()       AssertLogRelMsgReturnStmt(RT_SUCCESS(vrc), ("vrc=%Rrc\n", vrc), RTFdtDestroy(hFdt), vrc)
 
-    /** @todo Find a way to figure it out before CPUM is set up, can't use CPUMGetGuestAddrWidths() and on macOS we need
-     * access to Hypervisor.framework to query the ID registers (Linux can in theory parse /proc/cpuinfo, no idea for Windows). */
-    RTGCPHYS GCPhysTopOfAddrSpace = RT_BIT_64(36);
-
     /*
      * Get necessary objects and frequently used parameters.
@@ -187 +183 @@
     BusAssignmentManager *pBusMgr = mBusMgr = BusAssignmentManager::createInstance(pVMM, chipsetType, IommuType_None);
     ResourceAssignmentManager *pResMgr = ResourceAssignmentManager::createInstance(pVMM, chipsetType, IommuType_None,
-                                                                                   GCPhysTopOfAddrSpace - sizeof(VBOXPLATFORMARMV8),
-                                                                                   _1G,             /*GCPhysRam*/
-                                                                                   128 * _1M,       /*GCPhysMmio32Start*/
-                                                                                   _1G - 128 * _1M, /*cbMmio32*/
-                                                                                   32               /*cInterrupts*/);
+                                                                                   RT_MAX(_1G + cbRam, _4G),                  /*GCPhysMmio*/
+                                                                                   _1G,                                       /*GCPhysRam*/
+                                                                                   VBOXPLATFORMARMV8_PHYS_ADDR + _1M,         /*GCPhysMmio32Start*/
+                                                                                   _1G - (VBOXPLATFORMARMV8_PHYS_ADDR + _1M), /*cbMmio32*/
+                                                                                   32                                         /*cInterrupts*/);
 
     /*
@@ -332 +328 @@
 
         vrc = RTFdtNodeFinalize(hFdt);                                                      VRC();
+
+
+        /*
+         * CPUM values.
+         */
+        PCFGMNODE pCpum;
+        InsertConfigNode(pRoot, "CPUM", &pCpum);
 
 
@@ -398 +401 @@
         InsertConfigNode(pResources,    "ArmV8Desc",             &pRes);
         InsertConfigInteger(pRes,       "RegisterAsRom",         1);
-        InsertConfigInteger(pRes,       "GCPhysLoadAddress",     UINT64_MAX); /* End of physical address space. */
+        InsertConfigInteger(pRes,       "GCPhysLoadAddress",     VBOXPLATFORMARMV8_PHYS_ADDR);
         InsertConfigString(pRes,        "ResourceId",            "VBoxArmV8Desc");
 
@@ -613 +616 @@
         RTGCPHYS GCPhysPciMmioEcam, GCPhysPciMmio, GCPhysPciMmio32;
         RTGCPHYS cbPciMmioEcam, cbPciMmio, cbPciMmio32;
-        hrc = pResMgr->assignMmioRegionAligned("pci-pio",    _64K, _64K,         &GCPhysMmioStart,   &cbMmio);         H();
-        hrc = pResMgr->assignMmioRegion(       "pci-ecam",   16 * _1M,           &GCPhysPciMmioEcam, &cbPciMmioEcam);  H();
-        hrc = pResMgr->assignMmioRegion(       "pci-mmio",   _2G,                &GCPhysPciMmio,     &cbPciMmio);      H();
-        hrc = pResMgr->assignMmio32Region(     "pci-mmio32", (1024 - 128) * _1M, &GCPhysPciMmio32,   &cbPciMmio32);    H();
+        hrc = pResMgr->assignMmioRegionAligned("pci-pio",    _64K, _64K,                              &GCPhysMmioStart,   &cbMmio);         H();
+        hrc = pResMgr->assignMmioRegion(       "pci-ecam",   16 * _1M,                                &GCPhysPciMmioEcam, &cbPciMmioEcam);  H();
+        hrc = pResMgr->assignMmioRegion(       "pci-mmio",   _2G,                                     &GCPhysPciMmio,     &cbPciMmio);      H();
+        hrc = pResMgr->assignMmio32Region(     "pci-mmio32", _1G - VBOXPLATFORMARMV8_PHYS_ADDR - _1M, &GCPhysPciMmio32,   &cbPciMmio32);    H();
 
         InsertConfigNode(pDevices, "pci-generic-ecam",  &pDev);
@@ -773 +776 @@
     VBOXPLATFORMARMV8 ArmV8Platform; RT_ZERO(ArmV8Platform);
 
+    /* Make room for the descriptor at the beginning. */
+    vrc = RTVfsIoStrmZeroFill(hVfsIosDesc, sizeof(ArmV8Platform));
+    AssertRCReturnStmt(vrc, RTFdtDestroy(hFdt), vrc);
+
     vrc = RTFdtDumpToVfsIoStrm(hFdt, RTFDTTYPE_DTB, 0 /*fFlags*/, hVfsIosDesc, NULL /*pErrInfo*/);
+    uint64_t cbFdt = 0;
     if (RT_SUCCESS(vrc))
-        vrc = RTVfsFileQuerySize(hVfsFileDesc, &ArmV8Platform.cbFdt);
+    {
+        vrc = RTVfsFileQuerySize(hVfsFileDesc, &cbFdt);
+        cbFdt -= sizeof(ArmV8Platform);
+    }
     AssertRCReturnStmt(vrc, RTFdtDestroy(hFdt), vrc);
 
-    vrc = RTVfsIoStrmZeroFill(hVfsIosDesc, (RTFOFF)(RT_ALIGN_64(ArmV8Platform.cbFdt, _64K) - ArmV8Platform.cbFdt));
+    vrc = RTVfsIoStrmZeroFill(hVfsIosDesc, (RTFOFF)(RT_ALIGN_64(cbFdt, _64K) - cbFdt));
     AssertRCReturn(vrc, vrc);
 
@@ -797 +808 @@
     ArmV8Platform.u64PhysAddrRamBase  = GCPhysRam;
     ArmV8Platform.cbRamBase           = cbRam;
-    ArmV8Platform.u64OffBackFdt       = RT_ALIGN_64(ArmV8Platform.cbFdt, _64K);
-    ArmV8Platform.cbFdt               = RT_ALIGN_64(ArmV8Platform.cbFdt, _64K);
-    ArmV8Platform.u64OffBackAcpiXsdp  = 0;
+    ArmV8Platform.i64OffFdt           = sizeof(ArmV8Platform);
+    ArmV8Platform.cbFdt               = RT_ALIGN_64(cbFdt, _64K);
+    ArmV8Platform.i64OffAcpiXsdp      = 0;
     ArmV8Platform.cbAcpiXsdp          = 0;
-    ArmV8Platform.u64OffBackUefiRom   = GCPhysTopOfAddrSpace - sizeof(ArmV8Platform);
-    ArmV8Platform.cbUefiRom           = _64M; /** @todo Fixed reservation but the ROM region is usually much smaller. */
-    ArmV8Platform.u64OffBackMmio      = GCPhysTopOfAddrSpace - sizeof(ArmV8Platform) - GCPhysMmioStart;
+    ArmV8Platform.i64OffUefiRom       = -128 * _1M;
+    ArmV8Platform.cbUefiRom           = _64M;
+    ArmV8Platform.i64OffMmio          = GCPhysMmioStart - _128M;
     ArmV8Platform.cbMmio              = cbMmio;
-    ArmV8Platform.u64OffBackMmio32    = GCPhysTopOfAddrSpace - sizeof(ArmV8Platform) - GCPhysMmio32Start;
+    ArmV8Platform.i64OffMmio32        = GCPhysMmio32Start - _128M;
     ArmV8Platform.cbMmio32            = cbMmio32;
 
     /* Add the VBox platform descriptor to the resource store. */
-    vrc = RTVfsIoStrmWrite(hVfsIosDesc, &ArmV8Platform, sizeof(ArmV8Platform), true /*fBlocking*/, NULL /*pcbWritten*/);
+    vrc = RTVfsIoStrmWriteAt(hVfsIosDesc, 0, &ArmV8Platform, sizeof(ArmV8Platform), true /*fBlocking*/, NULL /*pcbWritten*/);
     RTVfsIoStrmRelease(hVfsIosDesc);
     vrc = mptrResourceStore->i_addItem("resources", "VBoxArmV8Desc", hVfsFileDesc);