儲存庫 vbox 的更動 101496

時間撮記:

2023-10-18 上午11:27:55 (16 月 以前)

作者:

vboxsync

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

159568

訊息:

VMM,Main: Don't hardcode the vTimer interrupt number in the NEM backend but let the configuration constructor decide the value so it matches the FDT, bugref:10390 bugref:10528

位置:

trunk/src/VBox

檔案:

• Main/src-client/ConsoleImplConfigArmV8.cpp (修改) (3 筆差異)
• VMM/VMMR3/NEMR3.cpp (修改) (2 筆差異)
• VMM/VMMR3/NEMR3Native-darwin-armv8.cpp (修改) (3 筆差異)
• VMM/include/NEMInternal.h (修改) (1 筆差異)

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

@@ -200 +200 @@
         InsertConfigInteger(pRoot, "TimerMillies",         10);
 
+        /*
+         * NEM
+         */
+        PCFGMNODE pNEM;
+        InsertConfigNode(pRoot, "NEM", &pNEM);
+
         uint32_t idPHandleIntCtrl = RTFdtPHandleAllocate(hFdt);
         Assert(idPHandleIntCtrl != UINT32_MAX);
@@ -234 +240 @@
 
         /* Configure the timer and clock. */
+        InsertConfigInteger(pNEM, "VTimerInterrupt", 0xb);
         vrc = RTFdtNodeAdd(hFdt, "timer");                                                  VRC();
         vrc = RTFdtNodePropertyAddCellsU32(hFdt, "interrupts", 12,
@@ -263 +270 @@
 
         vrc = RTFdtNodeFinalize(hFdt);                                                      VRC();
-
-        /*
-         * NEM
-         */
-        PCFGMNODE pNEM;
-        InsertConfigNode(pRoot, "NEM", &pNEM);
 
         /*

trunk/src/VBox/VMM/VMMR3/NEMR3.cpp

@@ -103 +103 @@
                                   "|VmxLbr"
 #endif
+#if defined(VBOX_VMM_TARGET_ARMV8)
+                                  "|VTimerInterrupt"
+#endif
                                   ,
                                   "" /* pszValidNodes */, "NEM" /* pszWho */, 0 /* uInstance */);
@@ -136 +139 @@
         pVCpu->nem.s.fTrapXcptGpForLovelyMesaDrv = f;
     }
+
+#if defined(VBOX_VMM_TARGET_ARMV8)
+    /** @cfgm{/NEM/VTimerInterrupt, uint32_t}
+     * Specifies the interrupt identifier for the VTimer. */
+    rc = CFGMR3QueryU32(pCfgNem, "VTimerInterrupt", &pVM->nem.s.u32GicPpiVTimer);
+    AssertLogRelRCReturn(rc, rc);
+#endif
 
     return VINF_SUCCESS;

trunk/src/VBox/VMM/VMMR3/NEMR3Native-darwin-armv8.cpp

@@ -70 +70 @@
 *   Defined Constants And Macros                                                                                                 *
 *********************************************************************************************************************************/
-
-
-/** @todo The vTimer PPI for the virt platform, make it configurable. */
-#define NEM_DARWIN_VTIMER_GIC_PPI_IRQ           11
 
 
@@ -1412 +1408 @@
             TMCpuSetVTimerNextActivation(pVCpu, UINT64_MAX);
             pVCpu->nem.s.fVTimerActivated = true;
-            return GICPpiSet(pVCpu, NEM_DARWIN_VTIMER_GIC_PPI_IRQ, true /*fAsserted*/);
+            return GICPpiSet(pVCpu, pVM->nem.s.u32GicPpiVTimer, true /*fAsserted*/);
         }
         default:
@@ -1477 +1473 @@
         {
             /* Clear the interrupt. */
-            GICPpiSet(pVCpu, NEM_DARWIN_VTIMER_GIC_PPI_IRQ, false /*fAsserted*/);
+            GICPpiSet(pVCpu, pVM->nem.s.u32GicPpiVTimer, false /*fAsserted*/);
 
             pVCpu->nem.s.fVTimerActivated = false;

trunk/src/VBox/VMM/include/NEMInternal.h

@@ -220 +220 @@
      *  us to use the debug execution loop. */
     bool                        fUseDebugLoop;
+
+#if defined(VBOX_VMM_TARGET_ARMV8)
+    /** The PPI interrupt number of the vTimer. */
+    uint32_t                    u32GicPpiVTimer;
+#endif
 
 #if defined(RT_OS_LINUX)