From: Oliver Kurth <okurth@vmware.com>
Date: Fri, 26 Oct 2018 17:44:59 +0000 (-0700)
Subject: Common header file change not applicable to open-vm-tools
X-Git-Tag: stable-11.0.0~362
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6e8833563045101a8fb7d91fc33cbe980588bebf;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 e9c5ff910..5c1ad9cde 100644
--- a/open-vm-tools/lib/include/x86cpuid.h
+++ b/open-vm-tools/lib/include/x86cpuid.h
@@ -1483,6 +1483,8 @@ CPUIDCheck(int32 eaxIn, int32 eaxInCheck,
 #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_1F            0x1F // Max Zen model defined in BKDG
+#define CPUID_MODEL_ZEN2_30           0x30 // family == CPUID_FAMILY_ZEN
+#define CPUID_MODEL_ZEN2_3F           0x3F // Max Zen2 model
 
 /* VIA model information */
 #define CPUID_MODEL_NANO                15 // Isaiah
@@ -2050,6 +2052,15 @@ CPUID_MODEL_IS_ZEN(uint32 eax)
 }
 
 
+static INLINE Bool
+CPUID_MODEL_IS_ZEN2(uint32 eax)
+{
+  return CPUID_EFFECTIVE_FAMILY(eax) == CPUID_FAMILY_ZEN &&
+         (CPUID_EFFECTIVE_MODEL(eax) >= CPUID_MODEL_ZEN2_30 &&
+          CPUID_EFFECTIVE_MODEL(eax) <= CPUID_MODEL_ZEN2_3F);
+}
+
+
 static INLINE Bool
 CPUID_FAMILY_IS_DHYANA(uint32 eax)
 {