From: John Wolfe <jwolfe@vmware.com>
Date: Fri, 6 May 2022 21:28:00 +0000 (-0700)
Subject: Change to common header file not applicable to open-vm-tools.
X-Git-Tag: stable-12.1.0~77
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9b9f221c486069d90ed6460edab72cb545ca0361;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 5a728aa74..2abe2cdc6 100644
--- a/open-vm-tools/lib/include/x86cpuid.h
+++ b/open-vm-tools/lib/include/x86cpuid.h
@@ -192,7 +192,7 @@ typedef struct CPUIDQuery {
    CPUIDLEVEL(TRUE,  821, 0x80000021, 0, 17) \
    CPUIDLEVEL(TRUE,  822, 0x80000022, 0, 20) \
    CPUIDLEVEL(TRUE,  823, 0x80000023, 0, 20) \
-   CPUIDLEVEL(TRUE,  826, 0x80000026, 4, 20)
+   CPUIDLEVEL(FALSE, 826, 0x80000026, 4, 20)
 
 #define CPUID_ALL_LEVELS CPUID_CACHED_LEVELS
 
@@ -2471,6 +2471,12 @@ CPUID_MODEL_IS_ZEN3(uint32 eax)
 #define CPUID_AMD_LEAF81D_CACHE_TYPE_INST   2
 #define CPUID_AMD_LEAF81D_CACHE_TYPE_UNIF   3
 
+#define CPUID_AMD_TOPOLOGY_LEVEL_TYPE_INVALID   0
+#define CPUID_AMD_TOPOLOGY_LEVEL_TYPE_CORE      1
+#define CPUID_AMD_TOPOLOGY_LEVEL_TYPE_COMPLEX   2
+#define CPUID_AMD_TOPOLOGY_LEVEL_TYPE_CCD       3
+#define CPUID_AMD_TOPOLOGY_LEVEL_TYPE_SOCKET    4
+
 /*
  * For certain AMD processors, an lfence instruction is necessary at various
  * places to ensure ordering.