x86/cpuid: Sort cpu_has_* predicates by feature number

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Acked-by: Jan Beulich <jbeulich@suse.com>

diff --git a/xen/include/asm-x86/cpufeature.h b/xen/include/asm-x86/cpufeature.h
index b3d613fc6cc851349887768e1f94eb4cb2d03aef..597878390243a582523aaceb31ecbae97cc2fa4c 100644 (file)
--- a/xen/include/asm-x86/cpufeature.h
+++ b/xen/include/asm-x86/cpufeature.h
@@ -29,65 +29,80 @@
 #define CPUID_PM_LEAF                    6
 #define CPUID6_ECX_APERFMPERF_CAPABILITY 0x1
 
-#define cpu_has_fpu            1
-#define cpu_has_de             1
-#define cpu_has_pse            1
-#define cpu_has_pge            1
-#define cpu_has_pat            1
-#define cpu_has_apic           boot_cpu_has(X86_FEATURE_APIC)
-#define cpu_has_sep            boot_cpu_has(X86_FEATURE_SEP)
-#define cpu_has_mtrr           1
-#define cpu_has_mmx            1
-#define cpu_has_sse3           boot_cpu_has(X86_FEATURE_SSE3)
-#define cpu_has_ssse3          boot_cpu_has(X86_FEATURE_SSSE3)
-#define cpu_has_sse4_1         boot_cpu_has(X86_FEATURE_SSE4_1)
-#define cpu_has_sse4_2         boot_cpu_has(X86_FEATURE_SSE4_2)
-#define cpu_has_pclmulqdq      boot_cpu_has(X86_FEATURE_PCLMULQDQ)
-#define cpu_has_popcnt         boot_cpu_has(X86_FEATURE_POPCNT)
-#define cpu_has_aesni          boot_cpu_has(X86_FEATURE_AESNI)
-#define cpu_has_htt            boot_cpu_has(X86_FEATURE_HTT)
-#define cpu_has_nx             boot_cpu_has(X86_FEATURE_NX)
-#define cpu_has_clflush                boot_cpu_has(X86_FEATURE_CLFLUSH)
-#define cpu_has_page1gb                boot_cpu_has(X86_FEATURE_PAGE1GB)
-#define cpu_has_fsgsbase       boot_cpu_has(X86_FEATURE_FSGSBASE)
-#define cpu_has_aperfmperf     boot_cpu_has(X86_FEATURE_APERFMPERF)
-#define cpu_has_smep            boot_cpu_has(X86_FEATURE_SMEP)
-#define cpu_has_smap            boot_cpu_has(X86_FEATURE_SMAP)
-#define cpu_has_fpu_sel         (!boot_cpu_has(X86_FEATURE_NO_FPU_SEL))
-#define cpu_has_ffxsr           ((boot_cpu_data.x86_vendor == X86_VENDOR_AMD) \
-                                 && boot_cpu_has(X86_FEATURE_FFXSR))
-#define cpu_has_x2apic          boot_cpu_has(X86_FEATURE_X2APIC)
+/* CPUID level 0x00000001.edx */
+#define cpu_has_fpu             1
+#define cpu_has_de              1
+#define cpu_has_pse             1
+#define cpu_has_apic            boot_cpu_has(X86_FEATURE_APIC)
+#define cpu_has_sep             boot_cpu_has(X86_FEATURE_SEP)
+#define cpu_has_mtrr            1
+#define cpu_has_pge             1
+#define cpu_has_pat             1
+#define cpu_has_clflush         boot_cpu_has(X86_FEATURE_CLFLUSH)
+#define cpu_has_mmx             1
+#define cpu_has_htt             boot_cpu_has(X86_FEATURE_HTT)
+
+/* CPUID level 0x00000001.ecx */
+#define cpu_has_sse3            boot_cpu_has(X86_FEATURE_SSE3)
+#define cpu_has_pclmulqdq       boot_cpu_has(X86_FEATURE_PCLMULQDQ)
+#define cpu_has_monitor         boot_cpu_has(X86_FEATURE_MONITOR)
+#define cpu_has_vmx             boot_cpu_has(X86_FEATURE_VMX)
+#define cpu_has_eist            boot_cpu_has(X86_FEATURE_EIST)
+#define cpu_has_ssse3           boot_cpu_has(X86_FEATURE_SSSE3)
+#define cpu_has_cx16            boot_cpu_has(X86_FEATURE_CX16)
+#define cpu_has_pdcm            boot_cpu_has(X86_FEATURE_PDCM)
 #define cpu_has_pcid            boot_cpu_has(X86_FEATURE_PCID)
+#define cpu_has_sse4_1          boot_cpu_has(X86_FEATURE_SSE4_1)
+#define cpu_has_sse4_2          boot_cpu_has(X86_FEATURE_SSE4_2)
+#define cpu_has_x2apic          boot_cpu_has(X86_FEATURE_X2APIC)
+#define cpu_has_popcnt          boot_cpu_has(X86_FEATURE_POPCNT)
+#define cpu_has_aesni           boot_cpu_has(X86_FEATURE_AESNI)
 #define cpu_has_xsave           boot_cpu_has(X86_FEATURE_XSAVE)
 #define cpu_has_avx             boot_cpu_has(X86_FEATURE_AVX)
+#define cpu_has_rdrand          boot_cpu_has(X86_FEATURE_RDRAND)
+#define cpu_has_hypervisor      boot_cpu_has(X86_FEATURE_HYPERVISOR)
+
+/* CPUID level 0x80000001.edx */
+#define cpu_has_nx              boot_cpu_has(X86_FEATURE_NX)
+#define cpu_has_ffxsr           ((boot_cpu_data.x86_vendor == X86_VENDOR_AMD) \
+                                 && boot_cpu_has(X86_FEATURE_FFXSR))
+#define cpu_has_page1gb         boot_cpu_has(X86_FEATURE_PAGE1GB)
+#define cpu_has_rdtscp          boot_cpu_has(X86_FEATURE_RDTSCP)
+
+/* CPUID level 0x80000001.ecx */
+#define cpu_has_cmp_legacy      boot_cpu_has(X86_FEATURE_CMP_LEGACY)
+#define cpu_has_svm             boot_cpu_has(X86_FEATURE_SVM)
+#define cpu_has_sse4a           boot_cpu_has(X86_FEATURE_SSE4A)
 #define cpu_has_lwp             boot_cpu_has(X86_FEATURE_LWP)
+#define cpu_has_tbm             boot_cpu_has(X86_FEATURE_TBM)
+
+/* CPUID level 0x0000000D:1.eax */
+#define cpu_has_xsaveopt        boot_cpu_has(X86_FEATURE_XSAVEOPT)
+#define cpu_has_xsavec          boot_cpu_has(X86_FEATURE_XSAVEC)
+#define cpu_has_xgetbv1         boot_cpu_has(X86_FEATURE_XGETBV1)
+#define cpu_has_xsaves          boot_cpu_has(X86_FEATURE_XSAVES)
+
+/* CPUID level 0x00000007:0.ebx */
+#define cpu_has_fsgsbase        boot_cpu_has(X86_FEATURE_FSGSBASE)
 #define cpu_has_bmi1            boot_cpu_has(X86_FEATURE_BMI1)
+#define cpu_has_hle             boot_cpu_has(X86_FEATURE_HLE)
+#define cpu_has_avx2            boot_cpu_has(X86_FEATURE_AVX2)
+#define cpu_has_smep            boot_cpu_has(X86_FEATURE_SMEP)
 #define cpu_has_bmi2            boot_cpu_has(X86_FEATURE_BMI2)
+#define cpu_has_rtm             boot_cpu_has(X86_FEATURE_RTM)
+#define cpu_has_fpu_sel         (!boot_cpu_has(X86_FEATURE_NO_FPU_SEL))
 #define cpu_has_mpx             boot_cpu_has(X86_FEATURE_MPX)
+#define cpu_has_rdseed          boot_cpu_has(X86_FEATURE_RDSEED)
+#define cpu_has_smap            boot_cpu_has(X86_FEATURE_SMAP)
+#define cpu_has_sha             boot_cpu_has(X86_FEATURE_SHA)
+
+/* CPUID level 0x80000007.edx */
+#define cpu_has_itsc            boot_cpu_has(X86_FEATURE_ITSC)
+
+/* Synthesized. */
 #define cpu_has_arch_perfmon    boot_cpu_has(X86_FEATURE_ARCH_PERFMON)
-#define cpu_has_rdtscp          boot_cpu_has(X86_FEATURE_RDTSCP)
-#define cpu_has_svm            boot_cpu_has(X86_FEATURE_SVM)
-#define cpu_has_vmx            boot_cpu_has(X86_FEATURE_VMX)
-#define cpu_has_cpuid_faulting boot_cpu_has(X86_FEATURE_CPUID_FAULTING)
-#define cpu_has_cx16            boot_cpu_has(X86_FEATURE_CX16)
-#define cpu_has_xsaveopt       boot_cpu_has(X86_FEATURE_XSAVEOPT)
-#define cpu_has_xsavec         boot_cpu_has(X86_FEATURE_XSAVEC)
-#define cpu_has_xgetbv1                boot_cpu_has(X86_FEATURE_XGETBV1)
-#define cpu_has_xsaves         boot_cpu_has(X86_FEATURE_XSAVES)
-#define cpu_has_avx2           boot_cpu_has(X86_FEATURE_AVX2)
-#define cpu_has_monitor                boot_cpu_has(X86_FEATURE_MONITOR)
-#define cpu_has_eist           boot_cpu_has(X86_FEATURE_EIST)
-#define cpu_has_hypervisor     boot_cpu_has(X86_FEATURE_HYPERVISOR)
-#define cpu_has_rdrand         boot_cpu_has(X86_FEATURE_RDRAND)
-#define cpu_has_rdseed         boot_cpu_has(X86_FEATURE_RDSEED)
-#define cpu_has_cmp_legacy     boot_cpu_has(X86_FEATURE_CMP_LEGACY)
-#define cpu_has_sse4a          boot_cpu_has(X86_FEATURE_SSE4A)
-#define cpu_has_tbm            boot_cpu_has(X86_FEATURE_TBM)
-#define cpu_has_itsc           boot_cpu_has(X86_FEATURE_ITSC)
-#define cpu_has_hle            boot_cpu_has(X86_FEATURE_HLE)
-#define cpu_has_rtm            boot_cpu_has(X86_FEATURE_RTM)
-#define cpu_has_pdcm           boot_cpu_has(X86_FEATURE_PDCM)
-#define cpu_has_sha            boot_cpu_has(X86_FEATURE_SHA)
+#define cpu_has_cpuid_faulting  boot_cpu_has(X86_FEATURE_CPUID_FAULTING)
+#define cpu_has_aperfmperf      boot_cpu_has(X86_FEATURE_APERFMPERF)
 
 enum _cache_type {
     CACHE_TYPE_NULL = 0,