mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-09-04 20:19:47 +08:00
7d0930647c
To pick the changes from:
8415a74852 ("x86/cpu, kvm: Add support for CPUID_80000021_EAX")
This only causes these perf files to be rebuilt:
CC /tmp/build/perf/bench/mem-memcpy-x86-64-asm.o
CC /tmp/build/perf/bench/mem-memset-x86-64-asm.o
And addresses these perf build warnings:
Warning: Kernel ABI header at 'tools/arch/x86/include/asm/disabled-features.h' differs from latest version at 'arch/x86/include/asm/disabled-features.h'
diff -u tools/arch/x86/include/asm/disabled-features.h arch/x86/include/asm/disabled-features.h
Warning: Kernel ABI header at 'tools/arch/x86/include/asm/required-features.h' differs from latest version at 'arch/x86/include/asm/required-features.h'
diff -u tools/arch/x86/include/asm/required-features.h arch/x86/include/asm/required-features.h
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Borislav Petkov (AMD) <bp@alien8.de>
Cc: Ian Rogers <irogers@google.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kim Phillips <kim.phillips@amd.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: https://lore.kernel.org/lkml/ZAYlS2XTJ5hRtss7@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
105 lines
2.7 KiB
C
105 lines
2.7 KiB
C
#ifndef _ASM_X86_REQUIRED_FEATURES_H
|
|
#define _ASM_X86_REQUIRED_FEATURES_H
|
|
|
|
/* Define minimum CPUID feature set for kernel These bits are checked
|
|
really early to actually display a visible error message before the
|
|
kernel dies. Make sure to assign features to the proper mask!
|
|
|
|
Some requirements that are not in CPUID yet are also in the
|
|
CONFIG_X86_MINIMUM_CPU_FAMILY which is checked too.
|
|
|
|
The real information is in arch/x86/Kconfig.cpu, this just converts
|
|
the CONFIGs into a bitmask */
|
|
|
|
#ifndef CONFIG_MATH_EMULATION
|
|
# define NEED_FPU (1<<(X86_FEATURE_FPU & 31))
|
|
#else
|
|
# define NEED_FPU 0
|
|
#endif
|
|
|
|
#if defined(CONFIG_X86_PAE) || defined(CONFIG_X86_64)
|
|
# define NEED_PAE (1<<(X86_FEATURE_PAE & 31))
|
|
#else
|
|
# define NEED_PAE 0
|
|
#endif
|
|
|
|
#ifdef CONFIG_X86_CMPXCHG64
|
|
# define NEED_CX8 (1<<(X86_FEATURE_CX8 & 31))
|
|
#else
|
|
# define NEED_CX8 0
|
|
#endif
|
|
|
|
#if defined(CONFIG_X86_CMOV) || defined(CONFIG_X86_64)
|
|
# define NEED_CMOV (1<<(X86_FEATURE_CMOV & 31))
|
|
#else
|
|
# define NEED_CMOV 0
|
|
#endif
|
|
|
|
# define NEED_3DNOW 0
|
|
|
|
#if defined(CONFIG_X86_P6_NOP) || defined(CONFIG_X86_64)
|
|
# define NEED_NOPL (1<<(X86_FEATURE_NOPL & 31))
|
|
#else
|
|
# define NEED_NOPL 0
|
|
#endif
|
|
|
|
#ifdef CONFIG_MATOM
|
|
# define NEED_MOVBE (1<<(X86_FEATURE_MOVBE & 31))
|
|
#else
|
|
# define NEED_MOVBE 0
|
|
#endif
|
|
|
|
#ifdef CONFIG_X86_64
|
|
#ifdef CONFIG_PARAVIRT_XXL
|
|
/* Paravirtualized systems may not have PSE or PGE available */
|
|
#define NEED_PSE 0
|
|
#define NEED_PGE 0
|
|
#else
|
|
#define NEED_PSE (1<<(X86_FEATURE_PSE) & 31)
|
|
#define NEED_PGE (1<<(X86_FEATURE_PGE) & 31)
|
|
#endif
|
|
#define NEED_MSR (1<<(X86_FEATURE_MSR & 31))
|
|
#define NEED_FXSR (1<<(X86_FEATURE_FXSR & 31))
|
|
#define NEED_XMM (1<<(X86_FEATURE_XMM & 31))
|
|
#define NEED_XMM2 (1<<(X86_FEATURE_XMM2 & 31))
|
|
#define NEED_LM (1<<(X86_FEATURE_LM & 31))
|
|
#else
|
|
#define NEED_PSE 0
|
|
#define NEED_MSR 0
|
|
#define NEED_PGE 0
|
|
#define NEED_FXSR 0
|
|
#define NEED_XMM 0
|
|
#define NEED_XMM2 0
|
|
#define NEED_LM 0
|
|
#endif
|
|
|
|
#define REQUIRED_MASK0 (NEED_FPU|NEED_PSE|NEED_MSR|NEED_PAE|\
|
|
NEED_CX8|NEED_PGE|NEED_FXSR|NEED_CMOV|\
|
|
NEED_XMM|NEED_XMM2)
|
|
#define SSE_MASK (NEED_XMM|NEED_XMM2)
|
|
|
|
#define REQUIRED_MASK1 (NEED_LM|NEED_3DNOW)
|
|
|
|
#define REQUIRED_MASK2 0
|
|
#define REQUIRED_MASK3 (NEED_NOPL)
|
|
#define REQUIRED_MASK4 (NEED_MOVBE)
|
|
#define REQUIRED_MASK5 0
|
|
#define REQUIRED_MASK6 0
|
|
#define REQUIRED_MASK7 0
|
|
#define REQUIRED_MASK8 0
|
|
#define REQUIRED_MASK9 0
|
|
#define REQUIRED_MASK10 0
|
|
#define REQUIRED_MASK11 0
|
|
#define REQUIRED_MASK12 0
|
|
#define REQUIRED_MASK13 0
|
|
#define REQUIRED_MASK14 0
|
|
#define REQUIRED_MASK15 0
|
|
#define REQUIRED_MASK16 0
|
|
#define REQUIRED_MASK17 0
|
|
#define REQUIRED_MASK18 0
|
|
#define REQUIRED_MASK19 0
|
|
#define REQUIRED_MASK20 0
|
|
#define REQUIRED_MASK_CHECK BUILD_BUG_ON_ZERO(NCAPINTS != 21)
|
|
|
|
#endif /* _ASM_X86_REQUIRED_FEATURES_H */
|