From: Oliver Kurth <okurth@vmware.com>
Date: Fri, 15 Sep 2017 18:23:40 +0000 (-0700)
Subject: Change to shared header file unrelated to open-vm-tools.
X-Git-Tag: stable-10.2.0~207
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5949be840ee39f0853e98741bcae30e559914f00;p=thirdparty%2Fopen-vm-tools.git

Change to shared header file unrelated to open-vm-tools.
---

diff --git a/open-vm-tools/lib/include/x86cpuid.h b/open-vm-tools/lib/include/x86cpuid.h
index 7c6a27eb6..8dcb1826d 100644
--- a/open-vm-tools/lib/include/x86cpuid.h
+++ b/open-vm-tools/lib/include/x86cpuid.h
@@ -1379,6 +1379,7 @@ CPUIDCheck(int32 eaxIn, int32 eaxInCheck,
 #define CPUID_FAMILY_BOBCAT          0x14
 #define CPUID_FAMILY_BULLDOZER       0x15  // BD PD SR EX
 #define CPUID_FAMILY_KYOTO           0x16  // Note: Jaguar microarch
+#define CPUID_FAMILY_ZEN             0x17
 
 /* Effective VIA CPU Families */
 #define CPUID_FAMILY_C7               6
@@ -1452,6 +1453,8 @@ CPUIDCheck(int32 eaxIn, int32 eaxInCheck,
 #define CPUID_MODEL_STEAMROLLER_30    0x30 // family == CPUID_FAMILY_BULLDOZER
 #define CPUID_MODEL_EXCAVATOR_60      0x60 // family == CPUID_FAMILY_BULLDOZER
 #define CPUID_MODEL_EXCAVATOR_6F      0x6F // Max Excavator model defined in BKDG
+#define CPUID_MODEL_ZEN_00            0x00 // family == CPUID_FAMILY_ZEN
+#define CPUID_MODEL_ZEN_0F            0x0F // Max Zen model defined in BKDG
 
 /* VIA model information */
 #define CPUID_MODEL_NANO       15     // Isaiah
@@ -1807,6 +1810,11 @@ CPUID_FAMILY_IS_KYOTO(uint32 eax)
    return CPUID_EFFECTIVE_FAMILY(eax) == CPUID_FAMILY_KYOTO;
 }
 
+static INLINE Bool
+CPUID_FAMILY_IS_ZEN(uint32 eax)
+{
+   return CPUID_EFFECTIVE_FAMILY(eax) == CPUID_FAMILY_ZEN;
+}
 
 /*
  * AMD Barcelona (of either Opteron or Phenom kind).
@@ -1902,6 +1910,12 @@ CPUID_MODEL_IS_KYOTO(uint32 eax)
 }
 
 
+static INLINE Bool
+CPUID_MODEL_IS_ZEN(uint32 eax)
+{
+   return CPUID_EFFECTIVE_FAMILY(eax) == CPUID_FAMILY_ZEN &&
+          CPUID_EFFECTIVE_MODEL(eax) <= CPUID_MODEL_ZEN_0F;
+}
 
 #define CPUID_TYPE_PRIMARY     0
 #define CPUID_TYPE_OVERDRIVE   1