From: Kruti Pendharkar <kp025370@broadcom.com>
Date: Fri, 17 Oct 2025 04:25:48 +0000 (-0700)
Subject: Change to common header file not applicable to open-vm-tools.
X-Git-Tag: stable-13.1.0~70
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2994adf6dbf422bb8470f34a8e084eeab1589a89;p=thirdparty%2Fopen-vm-tools.git

Change to common header file 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 b83724ba6..31d5b091e 100644
--- a/open-vm-tools/lib/include/x86cpuid.h
+++ b/open-vm-tools/lib/include/x86cpuid.h
@@ -1958,6 +1958,8 @@ CPUIDCheck(int32 eaxIn, int32 eaxInCheck,
 #define CPUID_MODEL_ZEN5_0F           0x0F // Max Zen5 model
 #define CPUID_MODEL_ZEN5_10           0x10 // family == CPUID_FAMILY_ZEN5
 #define CPUID_MODEL_ZEN5_1F           0x1F // Zen5 D: max model
+#define CPUID_MODEL_ZEN6_50           0x50 // family == CPUID_FAMILY_ZEN5
+#define CPUID_MODEL_ZEN6_5F           0x5F // Max Zen6 model
 
 /* AMD stepping information */
 #define CPUID_STEPPING_ZEN_NAPLES_B2  0x02 // Zen Naples ZP-B2
@@ -2818,6 +2820,14 @@ CPUID_MODEL_IS_ZEN5(uint32 eax)
           CPUID_EFFECTIVE_MODEL(eax) <= CPUID_MODEL_ZEN5_1F;
 }
 
+static INLINE Bool
+CPUID_MODEL_IS_ZEN6(uint32 eax)
+{
+   return CPUID_EFFECTIVE_FAMILY(eax) == CPUID_FAMILY_ZEN5 &&
+          (CPUID_EFFECTIVE_MODEL(eax) >= CPUID_MODEL_ZEN6_50 ||
+           CPUID_EFFECTIVE_MODEL(eax) <= CPUID_MODEL_ZEN6_5F);
+}
+
 #define CPUID_LEAF4_CACHE_TYPE_NULL      0
 #define CPUID_LEAF4_CACHE_TYPE_DATA      1
 #define CPUID_LEAF4_CACHE_TYPE_INST      2