summaryrefslogtreecommitdiffstats
path: root/arch/x86_64
diff options
context:
space:
mode:
authorAndi Kleen <ak@suse.de>2007-05-02 19:27:20 +0200
committerAndi Kleen <andi@basil.nowhere.org>2007-05-02 19:27:20 +0200
commit72b1b1d0133d7eb4040697f1052bf92123fb051b (patch)
tree864d2e7ad0c0cc4a5196dfbf110b72f22439bc76 /arch/x86_64
parent4637a74cf2ac3a3696d385c8624d84de789d1bbe (diff)
downloadop-kernel-dev-72b1b1d0133d7eb4040697f1052bf92123fb051b.zip
op-kernel-dev-72b1b1d0133d7eb4040697f1052bf92123fb051b.tar.gz
[PATCH] x86-64: Use symbolic CPU features in early CPUID check
Dead to magic numbers! Generated code is the same. Signed-off-by: Andi Kleen <ak@suse.de>
Diffstat (limited to 'arch/x86_64')
-rw-r--r--arch/x86_64/kernel/verify_cpu.S23
1 files changed, 16 insertions, 7 deletions
diff --git a/arch/x86_64/kernel/verify_cpu.S b/arch/x86_64/kernel/verify_cpu.S
index 72edabd..e035f59 100644
--- a/arch/x86_64/kernel/verify_cpu.S
+++ b/arch/x86_64/kernel/verify_cpu.S
@@ -30,18 +30,27 @@
* appropriately. Either display a message or halt.
*/
-verify_cpu:
+#include <asm/cpufeature.h>
+verify_cpu:
pushfl # Save caller passed flags
pushl $0 # Kill any dangerous flags
popfl
- /* minimum CPUID flags for x86-64 */
- /* see http://www.x86-64.org/lists/discuss/msg02971.html */
-#define SSE_MASK ((1<<25)|(1<<26))
-#define REQUIRED_MASK1 ((1<<0)|(1<<3)|(1<<4)|(1<<5)|(1<<6)|(1<<8)|\
- (1<<13)|(1<<15)|(1<<24))
-#define REQUIRED_MASK2 (1<<29)
+ /* minimum CPUID flags for x86-64 as defined by AMD */
+#define M(x) (1<<(x))
+#define M2(a,b) M(a)|M(b)
+#define M4(a,b,c,d) M(a)|M(b)|M(c)|M(d)
+
+#define SSE_MASK \
+ (M2(X86_FEATURE_XMM,X86_FEATURE_XMM2))
+#define REQUIRED_MASK1 \
+ (M4(X86_FEATURE_FPU,X86_FEATURE_PSE,X86_FEATURE_TSC,X86_FEATURE_MSR)|\
+ M4(X86_FEATURE_PAE,X86_FEATURE_CX8,X86_FEATURE_PGE,X86_FEATURE_CMOV)|\
+ M(X86_FEATURE_FXSR))
+#define REQUIRED_MASK2 \
+ (M(X86_FEATURE_LM - 32))
+
pushfl # standard way to check for cpuid
popl %eax
movl %eax,%ebx
OpenPOWER on IntegriCloud