Changeset 68532 in vbox for trunk

Timestamp:

Aug 25, 2017 3:34:32 PM (7 years ago)

Author:

vboxsync

Message:

CPUM: Use a valid value for initializing PkgCStateCfgCtrl on Core 2 CPUs.

Location:

trunk

Files:

• include/VBox/vmm/cpum.h (modified) (2 diffs)
• src/VBox/VMM/VMMR3/CPUM.cpp (modified) (1 diff)
• src/VBox/VMM/VMMR3/CPUMR3CpuId.cpp (modified) (1 diff)

trunk/include/VBox/vmm/cpum.h

@@ -125 +125 @@
 
     kCpumMicroarch_Intel_Core2_First,
-    kCpumMicroarch_Intel_Core2_Merom = kCpumMicroarch_Intel_Core2_First,
-    kCpumMicroarch_Intel_Core2_Penryn,
+    kCpumMicroarch_Intel_Core2_Merom = kCpumMicroarch_Intel_Core2_First,    /**< 65nm, Merom/Conroe/Kentsfield/Tigerton */
+    kCpumMicroarch_Intel_Core2_Penryn,      /**< 45nm, Penryn/Wolfdale/Yorkfield/Harpertown */
+    kCpumMicroarch_Intel_Core2_End,
 
     kCpumMicroarch_Intel_Core7_First,
@@ -257 +258 @@
 #define CPUMMICROARCH_IS_INTEL_CORE7(a_enmMicroarch) \
     ((a_enmMicroarch) >= kCpumMicroarch_Intel_Core7_First && (a_enmMicroarch) <= kCpumMicroarch_Intel_Core7_End)
+
+/** Predicate macro for catching Core 2 CPUs. */
+#define CPUMMICROARCH_IS_INTEL_CORE2(a_enmMicroarch) \
+    ((a_enmMicroarch) >= kCpumMicroarch_Intel_Core2_First && (a_enmMicroarch) <= kCpumMicroarch_Intel_Core2_End)
 
 /** Predicate macro for catching Atom CPUs, Silvermont and upwards. */

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

@@ -1270 +1270 @@
     /* C-state control. Guesses. */
     pVCpu->cpum.s.GuestMsrs.msr.PkgCStateCfgCtrl = 1 /*C1*/ | RT_BIT_32(25) | RT_BIT_32(26) | RT_BIT_32(27) | RT_BIT_32(28);
+    /* For Nehalem+ and Atoms, the 0xE2 MSR (MSR_PKG_CST_CONFIG_CONTROL) is documented. For Core 2,
+     * it's undocumented but exists as MSR_PMG_CST_CONFIG_CONTROL and has similar but not identical
+     * functionality. The default value must be different due to incompatible write mask.
+     */
+    if (CPUMMICROARCH_IS_INTEL_CORE2(pVM->cpum.s.GuestFeatures.enmMicroarch))
+        pVCpu->cpum.s.GuestMsrs.msr.PkgCStateCfgCtrl = 0x202a01;    /* From Mac Pro Harpertown, unlocked. */
 
     /*

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

@@ -529 +529 @@
         case kCpumMicroarch_Invalid:
         case kCpumMicroarch_Intel_End:
+        case kCpumMicroarch_Intel_Core2_End:
         case kCpumMicroarch_Intel_Core7_End:
         case kCpumMicroarch_Intel_Atom_End: