Changeset 89934 in vbox for trunk/src/VBox

Timestamp:

Jun 29, 2021 12:05:41 AM (4 years ago)

Author:

vboxsync

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

145392

Message:

VMM/CPUCpuId: Some intel updates. bugref:10052

Location:

trunk/src/VBox/VMM/VMMR3

Files:

• CPUMR3CpuId.cpp (modified) (7 diffs)
• CPUMR3Db.cpp (modified) (1 diff)

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

@@ -163 +163 @@
     /*[104(0x68)] = */ kCpumMicroarch_Intel_Unknown,
     /*[105(0x69)] = */ kCpumMicroarch_Intel_Unknown,
-    /*[106(0x6a)] = */ kCpumMicroarch_Intel_Unknown,
+    /*[106(0x6a)] = */ kCpumMicroarch_Intel_Core7_IceLake,      /* unconfirmed server */
     /*[107(0x6b)] = */ kCpumMicroarch_Intel_Unknown,
-    /*[108(0x6c)] = */ kCpumMicroarch_Intel_Unknown,
+    /*[108(0x6c)] = */ kCpumMicroarch_Intel_Core7_IceLake,      /* unconfirmed server */
     /*[109(0x6d)] = */ kCpumMicroarch_Intel_Unknown,
     /*[110(0x6e)] = */ kCpumMicroarch_Intel_Atom_Airmount,      /* or silvermount? */
@@ -182 +182 @@
     /*[123(0x7b)] = */ kCpumMicroarch_Intel_Unknown,
     /*[124(0x7c)] = */ kCpumMicroarch_Intel_Unknown,
-    /*[125(0x7d)] = */ kCpumMicroarch_Intel_Unknown,
-    /*[126(0x7e)] = */ kCpumMicroarch_Intel_Core7_IceLake, /* unconfirmed */
+    /*[125(0x7d)] = */ kCpumMicroarch_Intel_Core7_IceLake,      /* unconfirmed */
+    /*[126(0x7e)] = */ kCpumMicroarch_Intel_Core7_IceLake,      /* unconfirmed */
     /*[127(0x7f)] = */ kCpumMicroarch_Intel_Unknown,
     /*[128(0x80)] = */ kCpumMicroarch_Intel_Unknown,
@@ -197 +197 @@
     /*[138(0x8a)] = */ kCpumMicroarch_Intel_Unknown,
     /*[139(0x8b)] = */ kCpumMicroarch_Intel_Unknown,
-    /*[140(0x8c)] = */ kCpumMicroarch_Intel_Unknown,
-    /*[141(0x8d)] = */ kCpumMicroarch_Intel_Unknown,
-    /*[142(0x8e)] = */ kCpumMicroarch_Intel_Core7_KabyLake, /* Stepping >= 0xB is Whiskey Lake, 0xA is CoffeeLake. */
-    /*[143(0x8f)] = */ kCpumMicroarch_Intel_Unknown,
+    /*[140(0x8c)] = */ kCpumMicroarch_Intel_Core7_TigerLake,    /* 11th Gen Intel(R) Core(TM) i7-1185G7 @ 3.00GHz (bird) */
+    /*[141(0x8d)] = */ kCpumMicroarch_Intel_Core7_TigerLake,    /* unconfirmed */
+    /*[142(0x8e)] = */ kCpumMicroarch_Intel_Core7_KabyLake,     /* Stepping >= 0xB is Whiskey Lake, 0xA is CoffeeLake. */
+    /*[143(0x8f)] = */ kCpumMicroarch_Intel_Core7_SapphireRapids,
     /*[144(0x90)] = */ kCpumMicroarch_Intel_Unknown,
     /*[145(0x91)] = */ kCpumMicroarch_Intel_Unknown,
@@ -208 +208 @@
     /*[149(0x95)] = */ kCpumMicroarch_Intel_Unknown,
     /*[150(0x96)] = */ kCpumMicroarch_Intel_Unknown,
-    /*[151(0x97)] = */ kCpumMicroarch_Intel_Unknown,
+    /*[151(0x97)] = */ kCpumMicroarch_Intel_Core7_AlderLake,    /* unconfirmed, unreleased */
     /*[152(0x98)] = */ kCpumMicroarch_Intel_Unknown,
     /*[153(0x99)] = */ kCpumMicroarch_Intel_Unknown,
-    /*[154(0x9a)] = */ kCpumMicroarch_Intel_Unknown,
+    /*[154(0x9a)] = */ kCpumMicroarch_Intel_Core7_AlderLake,    /* unconfirmed, unreleased */
     /*[155(0x9b)] = */ kCpumMicroarch_Intel_Unknown,
     /*[156(0x9c)] = */ kCpumMicroarch_Intel_Unknown,
@@ -217 +217 @@
     /*[158(0x9e)] = */ kCpumMicroarch_Intel_Core7_KabyLake, /* Stepping >= 0xB is Whiskey Lake, 0xA is CoffeeLake. */
     /*[159(0x9f)] = */ kCpumMicroarch_Intel_Unknown,
+    /*[160(0xa0)] = */ kCpumMicroarch_Intel_Unknown,
+    /*[161(0xa1)] = */ kCpumMicroarch_Intel_Unknown,
+    /*[162(0xa2)] = */ kCpumMicroarch_Intel_Unknown,
+    /*[163(0xa3)] = */ kCpumMicroarch_Intel_Unknown,
+    /*[164(0xa4)] = */ kCpumMicroarch_Intel_Unknown,
+    /*[165(0xa5)] = */ kCpumMicroarch_Intel_Core7_CometLake,    /* unconfirmed */
+    /*[166(0xa6)] = */ kCpumMicroarch_Intel_Unknown,
+    /*[167(0xa7)] = */ kCpumMicroarch_Intel_Core7_CypressCove, /* 14nm backport, unconfirmed */
 };
-AssertCompile(RT_ELEMENTS(g_aenmIntelFamily06) == 0x9f+1);
+AssertCompile(RT_ELEMENTS(g_aenmIntelFamily06) == 0xa7+1);
 
 
@@ -225 +233 @@
  *
  * @returns Micro architecture.
- * @param   enmVendor           The CPU vendor .
+ * @param   enmVendor           The CPU vendor.
  * @param   bFamily             The CPU family.
  * @param   bModel              The CPU model.
@@ -543 +551 @@
         CASE_RET_STR(kCpumMicroarch_Intel_Core7_CascadeLake);
         CASE_RET_STR(kCpumMicroarch_Intel_Core7_CannonLake);
+        CASE_RET_STR(kCpumMicroarch_Intel_Core7_CometLake);
         CASE_RET_STR(kCpumMicroarch_Intel_Core7_IceLake);
+        CASE_RET_STR(kCpumMicroarch_Intel_Core7_RocketLake);
         CASE_RET_STR(kCpumMicroarch_Intel_Core7_TigerLake);
+        CASE_RET_STR(kCpumMicroarch_Intel_Core7_AlderLake);
+        CASE_RET_STR(kCpumMicroarch_Intel_Core7_SapphireRapids);
 
         CASE_RET_STR(kCpumMicroarch_Intel_Atom_Bonnell);

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

@@ -826 +826 @@
     AssertReturn(enmConsider >= kCpumMicroarch_Intel_P6_Core_Atom_First && enmConsider <= kCpumMicroarch_Intel_P6_Core_Atom_End,
                  false);
-    AssertReturn(enmTarget   >= kCpumMicroarch_Intel_P6_Core_Atom_First && enmTarget   <= kCpumMicroarch_Intel_P6_Core_Atom_End,
+    AssertReturn(   (enmTarget >= kCpumMicroarch_Intel_P6_Core_Atom_First && enmTarget <= kCpumMicroarch_Intel_P6_Core_Atom_End)
+                 || enmTarget == kCpumMicroarch_Intel_Unknown,
                  false);