From: Kruti Pendharkar <kp025370@broadcom.com>
Date: Fri, 11 Jul 2025 12:48:15 +0000 (-0700)
Subject: Change to common header file not applicable to open-vm-tools.
X-Git-Tag: stable-13.1.0~147
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9fd6ad1a6dde7990305f32483fd6babaaa72044f;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 7594786c0..726b10f7b 100644
--- a/open-vm-tools/lib/include/x86cpuid.h
+++ b/open-vm-tools/lib/include/x86cpuid.h
@@ -1888,6 +1888,7 @@ CPUIDCheck(int32 eaxIn, int32 eaxInCheck,
 #define CPUID_MODEL_RAPTORLAKE_BA     0xba  // Raptor Lake H/P/PX J-0, U Q-0
 #define CPUID_MODEL_RAPTORLAKE_BF     0xbf  // Raptor Lake S/HX C-0
 #define CPUID_MODEL_LUNARLAKE_BD      0xbd  // Lunar Lake
+#define CPUID_MODEL_ARROWLAKE_C6      0xc6  // Arrow Lake
 
 /* Intel model information (family 19) */
 #define CPUID_MODEL_DIAMONDRAPIDS     0x01  // Diamond Rapids
@@ -2359,11 +2360,19 @@ CPUID_MODEL_IS_LUNARLAKE(uint32 v) // IN: %eax from CPUID with %eax=1.
           CPUID_EFFECTIVE_MODEL(v) == CPUID_MODEL_LUNARLAKE_BD;
 }
 
+static INLINE Bool
+CPUID_MODEL_IS_ARROWLAKE(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_ARROWLAKE_C6;
+}
+
 static INLINE Bool
 CPUID_UARCH_IS_LUNARLAKE(uint32 v) // IN: %eax from CPUID with %eax=1.
 {
    /* Assumes the CPU manufacturer is Intel. */
-   return CPUID_MODEL_IS_LUNARLAKE(v);
+   return CPUID_MODEL_IS_LUNARLAKE(v) || CPUID_MODEL_IS_ARROWLAKE(v);
 }
 
 static INLINE Bool