From: Kruti Pendharkar <kp025370@broadcom.com>
Date: Tue, 22 Apr 2025 08:53:45 +0000 (-0700)
Subject: Change to common header file not applicable to open-vm-tools.
X-Git-Tag: stable-13.1.0~196
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2a6d0dd95f6c717f924716a5087d4e8734dc8e30;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 4cc9d7a15..1d807302d 100644
--- a/open-vm-tools/lib/include/x86cpuid.h
+++ b/open-vm-tools/lib/include/x86cpuid.h
@@ -1874,6 +1874,7 @@ CPUIDCheck(int32 eaxIn, int32 eaxInCheck,
 #define CPUID_MODEL_GRANITERAPIDS_AE  0xae  // Granite Rapids D
 #define CPUID_MODEL_SIERRAFOREST_AF   0xaf  // Sierra Forest
 #define CPUID_MODEL_EMERALDRAPIDS_CF  0xcf  // Emerald Rapids
+#define CPUID_MODEL_METEORLAKE_AA     0xaa  // Meteor Lake
 #define CPUID_MODEL_METEORLAKE_AC     0xac  // Meteor Lake
 #define CPUID_MODEL_KNM_85            0x85  // Knights Mill
 #define CPUID_MODEL_KABYLAKE_8E       0x8e  // Kaby Lake U/Y QS
@@ -2343,7 +2344,8 @@ CPUID_MODEL_IS_METEORLAKE(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_METEORLAKE_AC;
+          (CPUID_EFFECTIVE_MODEL(v) == CPUID_MODEL_METEORLAKE_AA ||
+           CPUID_EFFECTIVE_MODEL(v) == CPUID_MODEL_METEORLAKE_AC);
 }
 
 static INLINE Bool