Changeset 50653 in vbox for trunk/src/VBox/VMM/tools

Timestamp:

Feb 28, 2014 3:44:55 PM (11 years ago)

Author:

vboxsync

Message:

Added a more recent K8 CPU to the CPU database.

File:

• trunk/src/VBox/VMM/tools/VBoxCpuReport.cpp (modified) (6 diffs)

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

@@ -3271 +3271 @@
     uint64_t fIgnMask = 0;
     uint64_t fGpMask  = 0;
-    rc = msrProberModifyBitChanges(uMsr + iGuineaPig + 1, &fIgnMask, &fGpMask, 0);
+    rc = msrProberModifyBitChanges(uMsr + iGuineaPig + 1, &fIgnMask, &fGpMask, 0x800); /* enabling it may cause trouble */
     if (RT_FAILURE(rc))
         return rc;
@@ -3347 +3347 @@
        running 64-bit win81pe. Not giving PAT such a scrutiny fixes it. */
     if (   uMsr != 0x00000277
-        || g_enmMicroarch >= kCpumMicroarch_Intel_Core7_First)
+        || (  g_enmVendor == CPUMCPUVENDOR_INTEL
+            ? g_enmMicroarch >= kCpumMicroarch_Intel_Core7_First
+            : g_enmVendor == CPUMCPUVENDOR_AMD
+            ? g_enmMicroarch != kCpumMicroarch_AMD_K8_90nm_AMDV
+            : true) )
     {
         /* Every 8 bytes is a type, check the type ranges one by one. */
@@ -3370 +3374 @@
 static int reportMsr_Ia32MtrrDefType(uint32_t uMsr)
 {
-    int rc = msrVerifyMtrrTypeGPs(uMsr, 0, 7);
-    if (RT_FAILURE(rc))
-        return rc;
-
     uint64_t fGpMask  = 0;
     uint64_t fIgnMask = 0;
-    rc = msrProberModifyBitChanges(uMsr, &fIgnMask, &fGpMask, 0x7);
-    if (RT_FAILURE(rc))
-        return rc;
-    Assert(!(fGpMask & 7)); Assert(!(fIgnMask & 7));
+    if (g_enmMicroarch == kCpumMicroarch_AMD_K8_90nm_AMDV)
+    {
+        /* Problematic CPU! Fake it for now. */
+        fGpMask = ~(uint64_t)0xc07;
+        fIgnMask = 0;
+    }
+    else
+    {
+        int rc = msrVerifyMtrrTypeGPs(uMsr, 0, 7);
+        if (RT_FAILURE(rc))
+            return rc;
+
+        rc = msrProberModifyBitChanges(uMsr, &fIgnMask, &fGpMask, 0x7);
+        if (RT_FAILURE(rc))
+            return rc;
+        Assert(!(fGpMask & 7)); Assert(!(fIgnMask & 7));
+    }
 
     return printMsrFunctionCpumCpuEx(uMsr, NULL, NULL, NULL, fIgnMask, fGpMask, NULL);
@@ -3622 +3635 @@
     /* Turns out there are more killer bits here, at least on Opteron 2384.
        Skipping all known bits. */
-    if (g_enmMicroarch >= kCpumMicroarch_AMD_K8_65nm /* Not sure when introduced - harmless? */)
+    if (g_enmMicroarch >= kCpumMicroarch_AMD_K8_90nm_AMDV /* Not sure when introduced - harmless? */)
         fSkipMask |= RT_BIT(22); /* Tom2ForceMemTypeWB */
     if (g_enmMicroarch >= kCpumMicroarch_AMD_K8_First)
@@ -3942 +3955 @@
         int         rc;
 #if 0
-        if (uMsr < 0x00003170)
-            continue;
-        if (uMsr >= 0x00003170)
+        //if (uMsr < 0x00000000)
+        //    continue;
+        if (uMsr >= 0x00000277)
         {
             vbCpuRepDebug("produceMsrReport: uMsr=%#x (%s)...\n", uMsr, getMsrNameHandled(uMsr));
@@ -4135 +4148 @@
 #else
 
-    uint32_t uMsr = 0xc0000080;
+    uint32_t uMsr = 0xc0010010;
     uint64_t uValue = 0;
     msrProberRead(uMsr, &uValue);
-    /* Try for a triple fault... */
-    msrProberWrite(uMsr, uValue ^ MSR_K6_EFER_LME);
-    msrProberRead(uMsr, &uValue);
-    msrProberWrite(uMsr, uValue ^ MSR_K6_EFER_NXE);
+    reportMsr_AmdK8SysCfg(uMsr, uValue);
 #endif
     return VINF_SUCCESS;