Changeset 85353 in vbox for trunk/src/VBox

Timestamp:

Jul 15, 2020 4:40:28 PM (5 years ago)

Author:

vboxsync

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

139348

Message:

VMM/VBoxCpuReport: Make it work on Zen CPUs, tested on Ryzen 7 1800X

File:

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

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

@@ -523 +523 @@
 #endif
             /* Skip 0xc0011012..13 as it seems to be bad for our health (Phenom II X6 1100T). */
+            /* Ditto for 0x0000002ff (MSR_IA32_MTRR_DEF_TYPE) on AMD (Ryzen 7 1800X). */
             /* Ditto for 0x0000002a (EBL_CR_POWERON) and 0x00000277 (MSR_IA32_CR_PAT) on Intel (Atom 330). */
             /* And more of the same for 0x280 on Intel Pentium III. */
             if (   ((uMsr >= 0xc0011012 && uMsr <= 0xc0011013) && (g_enmVendor == CPUMCPUVENDOR_AMD || g_enmVendor == CPUMCPUVENDOR_HYGON))
+                || (   uMsr == 0x2ff
+                    && (g_enmVendor == CPUMCPUVENDOR_AMD || g_enmVendor == CPUMCPUVENDOR_HYGON)
+                    && g_enmMicroarch >= kCpumMicroarch_AMD_Zen_First)
                 || (   (uMsr == 0x2a || uMsr == 0x277)
                     && g_enmVendor == CPUMCPUVENDOR_INTEL
@@ -2527 +2531 @@
         case 0xc001001a:
         case 0xc001001d:
+
+        case 0xc0010058: /* MMIO Configuration Base Address on AMD Zen CPUs. */
+            if (CPUMMICROARCH_IS_AMD_FAM_ZEN(g_enmMicroarch))
+                return VBCPUREPBADNESS_BOND_VILLAIN;
+            break;
+
         case 0xc0010064: /* P-state fequency, voltage, ++. */
         case 0xc0010065: /* P-state fequency, voltage, ++. */
@@ -3367 +3377 @@
         fSkipMask |= UINT64_C(0x0000000ffffff000);
 
+    /* @todo This makes the host unstable on a AMD Ryzen 1800X CPU, skip everything for now.
+     * Figure out exactly what causes the issue.
+     */
+    if (   g_enmMicroarch >= kCpumMicroarch_AMD_Zen_First
+        && g_enmMicroarch >= kCpumMicroarch_AMD_Zen_End)
+        fSkipMask |= UINT64_C(0xffffffffffffffff);
+
     return reportMsr_GenFunctionEx(uMsr, "Ia32ApicBase", uValue, fSkipMask, 0, NULL);
 }
@@ -3564 +3581 @@
     /* 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. */
+    /* This hangs the host on a AMD Ryzen 1800X CPU */
     if (   uMsr != 0x00000277
         || (  g_enmVendor == CPUMCPUVENDOR_INTEL
             ? g_enmMicroarch >= kCpumMicroarch_Intel_Core7_First
             : g_enmVendor == CPUMCPUVENDOR_AMD || g_enmVendor == CPUMCPUVENDOR_HYGON
-            ? g_enmMicroarch != kCpumMicroarch_AMD_K8_90nm_AMDV
+            ? (   g_enmMicroarch != kCpumMicroarch_AMD_K8_90nm_AMDV
+               && !CPUMMICROARCH_IS_AMD_FAM_ZEN(g_enmMicroarch))
             : true) )
     {
@@ -3644 +3663 @@
         cRegs++;
     }
-    if (cRegs & 3)
+
+    /** aeichner: An AMD Ryzen 7 1800X CPU triggers this and I'm too lazy to check the correctness in detail. */
+    if (   (cRegs & 3)
+        && !CPUMMICROARCH_IS_AMD_FAM_ZEN(g_enmMicroarch))
         return RTMsgErrorRc(VERR_INVALID_PARAMETER, "MC MSR range is odd: cRegs=%#x\n", cRegs);