Changeset 106476 in vbox

Timestamp:

Oct 18, 2024 12:57:36 PM (4 months ago)

Author:

vboxsync

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

165303

Message:

VMMArm: Skeleton of the PMU device emulation enough to make Windows/ARM boot as a guest and have it out of the NEM darwin backend, bugref:10778

Location:

trunk

Files:

• include/VBox/log.h (modified) (2 diffs)
• include/VBox/vmm/cpum-armv8.h (modified) (2 diffs)
• include/VBox/vmm/pmu.h (added)
• src/VBox/Main/src-client/ConsoleImplConfigArmV8.cpp (modified) (1 diff)
• src/VBox/VMM/Makefile.kmk (modified) (2 diffs)
• src/VBox/VMM/VMMAll/CPUMAllSysRegs-armv8.cpp (modified) (4 diffs)
• src/VBox/VMM/VMMAll/PMUAll.cpp (added)
• src/VBox/VMM/VMMR3/NEMR3Native-darwin-armv8.cpp (modified) (2 diffs)
• src/VBox/VMM/VMMR3/PDMDevice.cpp (modified) (2 diffs)
• src/VBox/VMM/VMMR3/PMUR3.cpp (added)
• src/VBox/VMM/include/PMUInternal.h (added)

trunk/include/VBox/log.h

@@ -171 +171 @@
     /** Generic Platform Device group. */
     LOG_GROUP_DEV_PLATFORM,
+    /** PMU Device group. */
+    LOG_GROUP_DEV_PMU,
     /** QEMU firmware config Device group. */
     LOG_GROUP_DEV_QEMUFWCFG,
@@ -927 +929 @@
     "DEV_PIT", \
     "DEV_PLATFORM", \
+    "DEV_PMU", \
     "DEV_QEMUFWCFG", \
     "DEV_RTC", \

trunk/include/VBox/vmm/cpum-armv8.h

@@ -72 +72 @@
     /** Read from the OSLSR_EL1 syste register. */
     kCpumSysRegRdFn_OslsrEl1,
+    /** Read from a PMU system register. */
+    kCpumSysRegRdFn_Pmu,
 
     /** End of valid system register read function indexes. */
@@ -98 +100 @@
     /** Write to the OSLAR_EL1 syste register. */
     kCpumSysRegWrFn_OslarEl1,
+    /** Write to a PMU system register. */
+    kCpumSysRegWrFn_Pmu,
 
     /** End of valid system register write function indexes. */

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

@@ -499 +499 @@
         vrc = RTFdtNodeFinalize(hFdt);                                                      VRC();
 
+        /*
+         * Configure the perofrmance monitoring unit.
+         */
+        /** @todo Make this configurable and enable as default for Windows VMs because they assume a working PMU
+         * (which is not available in hardware on AppleSilicon).
+         */
+        InsertConfigNode(pDevices, "pmu",                &pDev);
+        InsertConfigNode(pDev,     "0",                  &pInst);
+        InsertConfigInteger(pInst, "Trusted",            1);
+        InsertConfigNode(pInst,    "Config",             &pCfg);
+
         RTGCPHYS GCPhysMmioStart;
         RTGCPHYS cbMmio;

trunk/src/VBox/VMM/Makefile.kmk

@@ -470 +470 @@
         VMMR3/PGMSavedState.cpp \
         VMMR3/PGMSharedPage.cpp \
+        VMMR3/PMUR3.cpp \
         VMMR3/SSM.cpp \
         VMMR3/STAM.cpp \
@@ -503 +504 @@
         VMMAll/GICAll.cpp \
         VMMAll/GIMAll.cpp \
+        VMMAll/PMUAll.cpp \
         VMMAll/TMAll.cpp \
         VMMAll/TMAllCpu.cpp \

trunk/src/VBox/VMM/VMMAll/CPUMAllSysRegs-armv8.cpp

@@ -34 +34 @@
 #include "CPUMInternal-armv8.h"
 #include <VBox/vmm/gic.h>
+#include <VBox/vmm/pmu.h>
 #include <VBox/vmm/vmcc.h>
 #include <VBox/err.h>
@@ -182 +183 @@
 
 
+
+/** @callback_method_impl{FNCPUMRDSYSREG} */
+static DECLCALLBACK(VBOXSTRICTRC) cpumSysRegRd_Pmu(PVMCPUCC pVCpu, uint32_t idSysReg, PCCPUMSYSREGRANGE pRange, uint64_t *puValue)
+{
+    RT_NOREF_PV(pRange);
+    return PMUReadSysReg(pVCpu, idSysReg, puValue);
+}
+
+
+/** @callback_method_impl{FNCPUMWRSYSREG} */
+static DECLCALLBACK(VBOXSTRICTRC) cpumSysRegWr_Pmu(PVMCPUCC pVCpu, uint32_t idSysReg, PCCPUMSYSREGRANGE pRange, uint64_t uValue, uint64_t uRawValue)
+{
+    RT_NOREF_PV(pRange); RT_NOREF_PV(uRawValue);
+    return PMUWriteSysReg(pVCpu, idSysReg, uValue);
+}
+
+
 /**
  * System register read function table.
@@ -193 +211 @@
     { cpumSysRegRd_GicV3Icc  },
     { cpumSysRegRd_OslsrEl1  },
+    { cpumSysRegRd_Pmu       }
 };
 
@@ -207 +226 @@
     { cpumSysRegWr_GicV3Icc },
     { cpumSysRegWr_OslarEl1 },
+    { cpumSysRegWr_Pmu      }
 };
 

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

@@ -1731 +1731 @@
     {
         RT_NOREF(pVM);
-
-        /** @todo Windows assumes a working PMU which is not available on AppleSilicon. It uses it
-         * to determine the base frequency it seems (because without the * 100 multiplier the frequency
-         * is detetcted as 24MHz. This needs to be moved into a separate PMU emulation (to be created) for
-         * all backends to share (Linux/KVM when running on AppleSilicon hardware). */
-        if (   idSysReg == ARMV8_AARCH64_SYSREG_PMCR_EL0
-            || idSysReg == ARMV8_AARCH64_SYSREG_PMCCNTR_EL0
-            || idSysReg == ARMV8_AARCH64_SYSREG_PMCNTENCLR_EL0)
-        {
-            if (idSysReg == ARMV8_AARCH64_SYSREG_PMCCNTR_EL0)
-            {
-                u64Val = ASMReadTSC() * 100;
-            }
-            else
-                u64Val = 0;
-        }
-        else
-            rcStrict = CPUMQueryGuestSysReg(pVCpu, idSysReg, &u64Val);
+        rcStrict = CPUMQueryGuestSysReg(pVCpu, idSysReg, &u64Val);
         Log4(("SysInsnExit/%u: %08RX64: READ %u:%u:%u:%u:%u -> %#RX64 rcStrict=%Rrc\n",
               pVCpu->idCpu, pVCpu->cpum.GstCtx.Pc.u64, uOp0, uOp1, uCRn, uCRm, uOp2, u64Val,
@@ -1757 +1740 @@
     else
     {
-        if (   idSysReg != ARMV8_AARCH64_SYSREG_PMCNTENCLR_EL0
-            && idSysReg != ARMV8_AARCH64_SYSREG_PMOVSCLR_EL0
-            && idSysReg != ARMV8_AARCH64_SYSREG_PMINTENCLR_EL1
-            && idSysReg != ARMV8_AARCH64_SYSREG_PMCR_EL0
-            && idSysReg != ARMV8_AARCH64_SYSREG_PMCCFILTR_EL0
-            && idSysReg != ARMV8_AARCH64_SYSREG_PMCNTENSET_EL0
-            && idSysReg != ARMV8_AARCH64_SYSREG_PMUSERENR_EL0
-            && idSysReg != ARMV8_AARCH64_SYSREG_PMCCNTR_EL0)
-        {
-            u64Val = nemR3DarwinGetGReg(pVCpu, uReg);
-            rcStrict = CPUMSetGuestSysReg(pVCpu, idSysReg, u64Val);
-        }
+        u64Val = nemR3DarwinGetGReg(pVCpu, uReg);
+        rcStrict = CPUMSetGuestSysReg(pVCpu, idSysReg, u64Val);
         Log4(("SysInsnExit/%u: %08RX64: WRITE %u:%u:%u:%u:%u %#RX64 -> rcStrict=%Rrc\n",
               pVCpu->idCpu, pVCpu->cpum.GstCtx.Pc.u64, uOp0, uOp1, uCRn, uCRm, uOp2, u64Val,

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

@@ -36 +36 @@
 #if defined(VBOX_VMM_TARGET_ARMV8)
 # include <VBox/vmm/gic.h>
+# include <VBox/vmm/pmu.h>
 #else
 # include <VBox/vmm/apic.h>
@@ -704 +705 @@
      */
     rc = pdmR3DevReg_Register(&RegCB.Core, &g_DeviceGICNem);
+    AssertRCReturn(rc, rc);
+
+    /*
+     * Register the internal VMM PMU device.
+     */
+    rc = pdmR3DevReg_Register(&RegCB.Core, &g_DevicePMU);
     AssertRCReturn(rc, rc);
 #else