From: John Wolfe <jwolfe@vmware.com>
Date: Thu, 20 Jan 2022 19:40:15 +0000 (-0800)
Subject: Common header file change not applicable to open-vm-tools.
X-Git-Tag: stable-12.1.0~163
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b59acd69c499825b1e0cc451f3c3798b1bb18d1c;p=thirdparty%2Fopen-vm-tools.git

Common header file change 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 4530d692b..600d043f3 100644
--- a/open-vm-tools/lib/include/x86cpuid.h
+++ b/open-vm-tools/lib/include/x86cpuid.h
@@ -1,5 +1,5 @@
 /*********************************************************
- * Copyright (C) 1998-2021 VMware, Inc. All rights reserved.
+ * Copyright (C) 1998-2022 VMware, Inc. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as published
@@ -218,6 +218,7 @@ enum {
 #define CPUID_MWAIT_FEATURES         5
 #define CPUID_PMC_FEATURES           0xa
 #define CPUID_XSAVE_FEATURES         0xd
+#define CPUID_RDT_FEATURES           0x10
 #define CPUID_SGX_FEATURES           0x12
 #define CPUID_PT_FEATURES            0x14
 #define CPUID_HYPERVISOR_LEVEL_0     0x40000000
@@ -526,7 +527,7 @@ FLAG(   7,  0, EBX, 11,  1, RTM,                                 YES,  11 ) \
 FLAG(   7,  0, EBX, 12,  1, PQM,                                 NO,    0 ) \
 FLAG(   7,  0, EBX, 13,  1, FP_SEGMENT_ZERO,                     ANY,  11 ) \
 FLAG(   7,  0, EBX, 14,  1, MPX,                                 ANY,  13 ) \
-FLAG(   7,  0, EBX, 15,  1, PQE,                                 NO,    0 ) \
+FLAG(   7,  0, EBX, 15,  1, PQE,                                 YES, FUT ) \
 FLAG(   7,  0, EBX, 16,  1, AVX512F,                             YES,  13 ) \
 FLAG(   7,  0, EBX, 17,  1, AVX512DQ,                            YES,  13 ) \
 FLAG(   7,  0, EBX, 18,  1, RDSEED,                              YES,  11 ) \
@@ -756,12 +757,19 @@ FLAG(   F,  1, EDX,  1,  1, PQM_MBM_TOTAL,                       NO,    0 ) \
 FLAG(   F,  1, EDX,  2,  1, PQM_MBM_LOCAL,                       NO,    0 )
 
 /*    LEVEL, SUB-LEVEL, REG, POS, SIZE, NAME,               MON SUPP, HWV  */
-#define CPUID_FIELD_DATA_LEVEL_10                                          \
-FLAG(  10,  0, EBX,  1,  1, PQE_L3,                              NO,    0 ) \
-FIELD( 10,  1, EAX,  0,  5, PQE_L3_MASK_LENGTH,                  NO,    0 ) \
+#define CPUID_FIELD_DATA_LEVEL_10                                           \
+FLAG(  10,  0, EBX,  1,  1, PQE_L3,                              YES, FUT ) \
+FLAG(  10,  0, EBX,  2,  1, PQE_L2,                              NO,    0 ) \
+FLAG(  10,  0, EBX,  3,  1, PQE_MBA,                             NO,    0 ) \
+FIELD( 10,  1, EAX,  0,  5, PQE_L3_MASK_LENGTH,                  YES, FUT ) \
 FIELD( 10,  1, EBX,  0, 32, PQE_L3_ISOLATION_UNIT_MAP,           NO,    0 ) \
 FLAG(  10,  1, ECX,  2,  1, PQE_L3_CDP,                          NO,    0 ) \
-FIELD( 10,  1, EDX,  0, 16, PQE_L3_MAX_COS_NUMBER,               NO,    0 )
+FIELD( 10,  1, EDX,  0, 16, PQE_L3_MAX_COS_NUMBER,               YES, FUT ) \
+FIELD( 10,  2, EAX,  0,  5, PQE_L2_MASK_LENGTH,                  NO,    0 ) \
+FIELD( 10,  2, EBX,  0, 32, PQE_L2_ISOLATION_UNIT_MAP,           NO,    0 ) \
+FLAG(  10,  2, ECX,  2,  1, PQE_L2_CDP,                          NO,    0 ) \
+FIELD( 10,  2, EDX,  0, 16, PQE_L2_MAX_COS_NUMBER,               NO,    0 )
+
 
 /*    LEVEL, SUB-LEVEL, REG, POS, SIZE, NAME,               MON SUPP, HWV  */
 #define CPUID_FIELD_DATA_LEVEL_12                                           \