From: Kruti Pendharkar <kp025370@broadcom.com>
Date: Wed, 8 Jan 2025 06:05:51 +0000 (-0800)
Subject: Change to common header file not applicable to open-vm-tools.
X-Git-Tag: stable-13.0.0~40
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=41da23f6b63b1e768006ab566958fbeb62697e4e;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 0854fe804..8074410e4 100644
--- a/open-vm-tools/lib/include/x86cpuid.h
+++ b/open-vm-tools/lib/include/x86cpuid.h
@@ -1802,6 +1802,7 @@ CPUIDCheck(int32 eaxIn, int32 eaxInCheck,
 #define CPUID_FAMILY_KYOTO           0x16  // Note: Jaguar microarch
 #define CPUID_FAMILY_ZEN             0x17
 #define CPUID_FAMILY_ZEN3            0x19
+#define CPUID_FAMILY_ZEN5            0x1A
 
 /* Effective VIA CPU Families */
 #define CPUID_FAMILY_C7               6
@@ -1920,6 +1921,10 @@ CPUIDCheck(int32 eaxIn, int32 eaxInCheck,
 #define CPUID_MODEL_ZEN4_1F           0x1F // Max Zen4 model
 #define CPUID_MODEL_ZEN4_A0           0xA0 // family == CPUID_FAMILY_ZEN3
 #define CPUID_MODEL_ZEN4_AF           0xAF // Zen4 D: max model
+#define CPUID_MODEL_ZEN5_00           0x00 // family == CPUID_FAMILY_ZEN5
+#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
 
 /* AMD stepping information */
 #define CPUID_STEPPING_ZEN_NAPLES_B2  0x02 // Zen Naples ZP-B2
@@ -2515,6 +2520,11 @@ CPUID_FAMILY_IS_ZEN3(uint32 eax)
    return CPUID_EFFECTIVE_FAMILY(eax) == CPUID_FAMILY_ZEN3;
 }
 
+static INLINE Bool
+CPUID_FAMILY_IS_ZEN5(uint32 eax)
+{
+      return CPUID_EFFECTIVE_FAMILY(eax) == CPUID_FAMILY_ZEN5;
+}
 
 /*
  * AMD Barcelona (of either Opteron or Phenom kind).
@@ -2661,6 +2671,12 @@ CPUID_MODEL_IS_ZEN4(uint32 eax)
             CPUID_EFFECTIVE_MODEL(eax) <= CPUID_MODEL_ZEN4_AF));
 }
 
+static INLINE Bool
+CPUID_MODEL_IS_ZEN5(uint32 eax)
+{
+   return CPUID_EFFECTIVE_FAMILY(eax) == CPUID_FAMILY_ZEN5 &&
+          CPUID_EFFECTIVE_MODEL(eax) <= CPUID_MODEL_ZEN5_1F;
+}
 
 #define CPUID_LEAF4_CACHE_TYPE_NULL      0
 #define CPUID_LEAF4_CACHE_TYPE_DATA      1