From: Oliver Kurth <okurth@vmware.com>
Date: Fri, 27 Jul 2018 18:46:22 +0000 (-0700)
Subject: Common header file change; not applicable to open-vm-tools.
X-Git-Tag: stable-11.0.0~493
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5b9d8e2a1bada1b13cf2369ca6ff118e07fec104;p=thirdparty%2Fopen-vm-tools.git

Common header file change; not applicable to open-vm-tools.
---

diff --git a/open-vm-tools/lib/include/x86cpuid.h b/open-vm-tools/lib/include/x86cpuid.h
index 7c4bf7bbf..1bd808d8d 100644
--- a/open-vm-tools/lib/include/x86cpuid.h
+++ b/open-vm-tools/lib/include/x86cpuid.h
@@ -1447,6 +1447,7 @@ CPUIDCheck(int32 eaxIn, int32 eaxInCheck,
 #define CPUID_MODEL_ATOM_5D        0x5d  // Future Silvermont
 #define CPUID_MODEL_SKYLAKE_5E     0x5e  // Skylake-S / Kaby Lake S/H ES
 #define CPUID_MODEL_ATOM_5F        0x5f  // Denverton
+#define CPUID_MODEL_CANNONLAKE_66  0x66  // Cannon Lake
 #define CPUID_MODEL_KNM_85         0x85  // Knights Mill
 #define CPUID_MODEL_KABYLAKE_8E    0x8e  // Kaby Lake U/Y QS
 #define CPUID_MODEL_KABYLAKE_9E    0x9e  // Kaby Lake S/H QS
@@ -1730,14 +1731,23 @@ CPUID_MODEL_IS_KABYLAKE(uint32 v) // IN: %eax from CPUID with %eax=1.
             CPUID_EFFECTIVE_STEPPING(v) == CPUID_STEPPING_KABYLAKE_ES));
 }
 
+static INLINE Bool
+CPUID_MODEL_IS_CANNONLAKE(uint32 v) // IN: %eax from CPUID with %eax=1.
+{
+   /* Assumes the CPU manufacturer is Intel. */
+   return CPUID_FAMILY_IS_P6(v) &&
+          CPUID_EFFECTIVE_MODEL(v) == CPUID_MODEL_CANNONLAKE_66;
+}
+
 static INLINE Bool
 CPUID_UARCH_IS_SKYLAKE(uint32 v) // IN: %eax from CPUID with %eax=1.
 {
    /* Assumes the CPU manufacturer is Intel. */
-   return CPUID_MODEL_IS_COFFEELAKE(v)  ||
+   return CPUID_MODEL_IS_SKYLAKE(v)     ||
           CPUID_MODEL_IS_KABYLAKE(v)    ||
+          CPUID_MODEL_IS_COFFEELAKE(v)  ||
           CPUID_MODEL_IS_CASCADELAKE(v) ||
-          CPUID_MODEL_IS_SKYLAKE(v);
+          CPUID_MODEL_IS_CANNONLAKE(v);
 }