Changeset 50617 in vbox for trunk/src/VBox/VMM

Timestamp:

Feb 26, 2014 7:34:46 PM (11 years ago)

Author:

vboxsync

Message:

Implemented MSR 0x00000035 on i7, it reports threads and core counts on intel.

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/CPUMAllMsrs.cpp (modified) (3 diffs)
• VMMR3/cpus/Intel_Core_i5_3570.h (modified) (1 diff)
• VMMR3/cpus/Intel_Core_i7_3820QM.h (modified) (1 diff)
• VMMR3/cpus/Intel_Core_i7_3960X.h (modified) (1 diff)
• include/CPUMInternal.h (modified) (1 diff)
• tools/VBoxCpuReport.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/VMMAll/CPUMAllMsrs.cpp

@@ -1516 +1516 @@
 {
     /** @todo Write EBL_CR_POWERON: Remember written bits. */
+    return VINF_SUCCESS;
+}
+
+
+/** @callback_method_impl{FNCPUMRDMSR} */
+static DECLCALLBACK(int) cpumMsrRd_IntelI7CoreThreadCount(PVMCPU pVCpu, uint32_t idMsr, PCCPUMMSRRANGE pRange, uint64_t *puValue)
+{
+    /* Note! According to cpuid_set_info in XNU (10.7.0), Westmere CPU only
+             have a 4-bit core count. */
+    uint16_t cCores   = pVCpu->CTX_SUFF(pVM)->cCpus;
+    uint16_t cThreads = cCores; /** @todo hyper-threading. */
+    *puValue = RT_MAKE_U32(cThreads, cCores);
     return VINF_SUCCESS;
 }
@@ -4457 +4469 @@
 
     cpumMsrRd_IntelEblCrPowerOn,
+    cpumMsrRd_IntelI7CoreThreadCount,
     cpumMsrRd_IntelP4EbcHardPowerOn,
     cpumMsrRd_IntelP4EbcSoftPowerOn,
@@ -5146 +5159 @@
 
     CPUM_ASSERT_RD_MSR_FN(IntelEblCrPowerOn);
+    CPUM_ASSERT_RD_MSR_FN(IntelI7CoreThreadCount);
     CPUM_ASSERT_RD_MSR_FN(IntelP4EbcHardPowerOn);
     CPUM_ASSERT_RD_MSR_FN(IntelP4EbcSoftPowerOn);

trunk/src/VBox/VMM/VMMR3/cpus/Intel_Core_i5_3570.h

@@ -70 +70 @@
     MVX(0x00000033, "TEST_CTL", 0, 0, UINT64_C(0xffffffff7fffffff)),
     MVO(0x00000034, "P6_UNK_0000_0034", 0x285),
-    MVO(0x00000035, "P6_UNK_0000_0035", 0x40004),
+    MFO(0x00000035, "MSR_CORE_THREAD_COUNT", IntelI7CoreThreadCount), /* value=0x40004*/
     MVO(0x00000036, "I7_UNK_0000_0036", UINT64_C(0x1000000000105df2)),
     MFO(0x0000003a, "IA32_FEATURE_CONTROL", Ia32FeatureControl), /* value=0x5 */

trunk/src/VBox/VMM/VMMR3/cpus/Intel_Core_i7_3820QM.h

@@ -70 +70 @@
     MVX(0x00000033, "TEST_CTL", 0, 0, UINT64_C(0xffffffff7fffffff)),
     MVO(0x00000034, "P6_UNK_0000_0034", 0xe),
-    MVO(0x00000035, "P6_UNK_0000_0035", 0x40008),
+    MFO(0x00000035, "MSR_CORE_THREAD_COUNT", IntelI7CoreThreadCount), /* value=0x40008*/
     MVO(0x00000036, "I7_UNK_0000_0036", 0x6c405eec),
     MFO(0x0000003a, "IA32_FEATURE_CONTROL", Ia32FeatureControl), /* value=0xff07 */

trunk/src/VBox/VMM/VMMR3/cpus/Intel_Core_i7_3960X.h

@@ -79 +79 @@
     MVX(0x00000033, "TEST_CTL", 0, 0, UINT64_C(0xffffffff7fffffff)),
     MVO(0x00000034, "P6_UNK_0000_0034", 0x4cb),
-    MVO(0x00000035, "P6_UNK_0000_0035", 0x6000c),
+    MFO(0x00000035, "MSR_CORE_THREAD_COUNT", IntelI7CoreThreadCount), /* value=0x6000c*/
     MFO(0x0000003a, "IA32_FEATURE_CONTROL", Ia32FeatureControl), /* value=0x5 */
     MVX(0x0000003e, "I7_UNK_0000_003e", 0x1, 0, UINT64_C(0xfffffffffffffffe)),

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

@@ -207 +207 @@
 
     kCpumMsrRdFn_IntelEblCrPowerOn,
+    kCpumMsrRdFn_IntelI7CoreThreadCount,
     kCpumMsrRdFn_IntelP4EbcHardPowerOn,
     kCpumMsrRdFn_IntelP4EbcSoftPowerOn,

trunk/src/VBox/VMM/tools/VBoxCpuReport.cpp

@@ -627 +627 @@
         case 0x00000033: return "TEST_CTL";
         case 0x00000034: return "P6_UNK_0000_0034"; /* P6_M_Dothan. */
-        case 0x00000035: return "P6_UNK_0000_0035"; /* P6_M_Dothan. */
+        case 0x00000035: return CPUMMICROARCH_IS_INTEL_CORE7(g_enmMicroarch) ? "MSR_CORE_THREAD_COUNT" : "P6_UNK_0000_0035"; /* P6_M_Dothan. */
         case 0x00000036: return "I7_UNK_0000_0036"; /* SandyBridge, IvyBridge. */
         case 0x00000039: return "C2_UNK_0000_0039"; /* Core2_Penryn */
@@ -1810 +1810 @@
         case 0x0000002c: *pfTakesValue = true; return g_fIntelNetBurst ? "IntelP4EbcFrequencyId" : NULL;
         //case 0x00000033: return "IntelTestCtl";
+        case 0x00000035: return CPUMMICROARCH_IS_INTEL_CORE7(g_enmMicroarch) ? "IntelI7CoreThreadCount" : NULL;
         case 0x0000003a: return "Ia32FeatureControl";