Changeset 101496 in vbox for trunk/src/VBox/VMM/VMMR3

Timestamp:

Oct 18, 2023 11:27:55 AM (15 months ago)

Author:

vboxsync

Message:

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

Location:

trunk/src/VBox/VMM/VMMR3

Files:

• NEMR3.cpp (modified) (2 diffs)
• NEMR3Native-darwin-armv8.cpp (modified) (3 diffs)

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;