[RFC PATCH 02/27] KVM: x86: Reorder the features for CPUID 7

[Binbin Wu <binbin.wu@linux.intel.com>]

Reorder the feature bits in CPUID_7_ECX, CPUID_7_EDX and CPUID_7_1_EAX
to align with the hardware defined order.

Opportunistically add comments for unsupported bits for CPUID_7_ECX and
CPUID_7_EDX.

No functional change intended.

Signed-off-by: Binbin Wu <binbin.wu@linux.intel.com>
---
 arch/x86/kvm/cpuid.c | 48 +++++++++++++++++++++++++++++---------------
 1 file changed, 32 insertions(+), 16 deletions(-)

diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c
index 25f582a8d795..056f86121728 100644
--- a/arch/x86/kvm/cpuid.c
+++ b/arch/x86/kvm/cpuid.c
@@ -947,26 +947,34 @@ void kvm_initialize_cpu_caps(void)
 	);
 
 	kvm_cpu_cap_init(CPUID_7_ECX,
+		/* PREFETCHWT1 */
 		F(AVX512VBMI),
-		PASSTHROUGH_F(LA57),
+		F(UMIP),
 		F(PKU),
 		RUNTIME_F(OSPKE),
-		F(RDPID),
-		F(AVX512_VPOPCNTDQ),
-		F(UMIP),
+		VENDOR_F(WAITPKG),
 		F(AVX512_VBMI2),
+		X86_64_F(SHSTK),
 		F(GFNI),
 		F(VAES),
 		F(VPCLMULQDQ),
 		F(AVX512_VNNI),
 		F(AVX512_BITALG),
+		/* TME */
+		F(AVX512_VPOPCNTDQ),
+		/* Reserved */
+		PASSTHROUGH_F(LA57),
+		/* MPX_MAWAU */
+		F(RDPID),
+		/* KEY_LOCKER */
+		F(BUS_LOCK_DETECT),
 		F(CLDEMOTE),
+		/* Reserved */
 		F(MOVDIRI),
 		F(MOVDIR64B),
-		VENDOR_F(WAITPKG),
+		/* ENQCMD */
 		F(SGX_LC),
-		F(BUS_LOCK_DETECT),
-		X86_64_F(SHSTK),
+		/* PKS */
 	);
 
 	/*
@@ -985,23 +993,31 @@ void kvm_initialize_cpu_caps(void)
 		kvm_cpu_cap_clear(X86_FEATURE_SHSTK);
 
 	kvm_cpu_cap_init(CPUID_7_EDX,
+		/* Reserved, SGX_KEYS */
 		F(AVX512_4VNNIW),
 		F(AVX512_4FMAPS),
-		F(SPEC_CTRL),
-		F(SPEC_CTRL_SSBD),
-		EMULATED_F(ARCH_CAPABILITIES),
-		F(INTEL_STIBP),
-		F(MD_CLEAR),
-		F(AVX512_VP2INTERSECT),
 		F(FSRM),
+		/* UINT, Reserved, Reserved */
+		F(AVX512_VP2INTERSECT),
+		/* SRBDS_CTRL */
+		F(MD_CLEAR),
+		/* RTM_ALWAYS_ABORT, Reserved, TSX_FORCE_ABORT */
 		F(SERIALIZE),
+		/* HYBRID_CPU */
 		F(TSXLDTRK),
+		/* Reserved, PCONFIG, ARCH_LBR */
+		F(IBT),
+		/* Reserved */
+		F(AMX_BF16),
 		F(AVX512_FP16),
 		F(AMX_TILE),
 		F(AMX_INT8),
-		F(AMX_BF16),
+		F(SPEC_CTRL),
+		F(INTEL_STIBP),
 		F(FLUSH_L1D),
-		F(IBT),
+		EMULATED_F(ARCH_CAPABILITIES),
+		/* CORE_CAPABILITIES */
+		F(SPEC_CTRL_SSBD),
 	);
 
 	/*
@@ -1033,8 +1049,8 @@ void kvm_initialize_cpu_caps(void)
 		F(FZRM),
 		F(FSRS),
 		F(FSRC),
-		F(WRMSRNS),
 		X86_64_F(LKGS),
+		F(WRMSRNS),
 		F(AMX_FP16),
 		F(AVX_IFMA),
 		F(LAM),
-- 
2.46.0