Changeset 49945 in vbox for trunk

Timestamp:

Dec 17, 2013 1:28:11 AM (11 years ago)

Author:

vboxsync

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

91354

Message:

PAT hack for a core 2 duo.

File:

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

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

@@ -2885 +2885 @@
 static int reportMsr_Ia32MtrrFixedOrPat(uint32_t uMsr)
 {
-    /* Every 8 bytes is a type, check the type ranges one by one. */
-    for (uint32_t iBit = 0; iBit < 64; iBit += 8)
-    {
-        int rc = msrVerifyMtrrTypeGPs(uMsr, iBit, 7 + (uMsr == 0x00000277));
-        if (RT_FAILURE(rc))
-            return rc;
+    /* Had a spot of trouble on an old macbook pro with core2 duo T9900 (penryn)
+       running 64-bit win81pe. Not giving PAT such a scrutiny fixes it. */
+    if (   uMsr != 0x00000277
+        || g_enmMicroarch >= kCpumMicroarch_Intel_Core7_First)
+    {
+        /* Every 8 bytes is a type, check the type ranges one by one. */
+        for (uint32_t iBit = 0; iBit < 64; iBit += 8)
+        {
+            int rc = msrVerifyMtrrTypeGPs(uMsr, iBit, 7 + (uMsr == 0x00000277));
+            if (RT_FAILURE(rc))
+                return rc;
+        }
     }
 
@@ -3462 +3468 @@
         int         rc;
 #if 1
-        //if (uMsr < 0xc0000000)
-        //    continue;
-        if (uMsr >= 0xc0010000)
+        if (   0 //(uMsr >= 0x00000268 && uMsr <= 0x0000026f)
+            || uMsr == 0x00000277
+            || uMsr == 0x000002ff
+           )
         {
             vbCpuRepDebug("produceMsrReport: uMsr=%#x (%s)...\n", uMsr, getMsrNameHandled(uMsr));
-            RTThreadSleep(1000);
+            RTThreadSleep(2000);
         }
 #endif