Commit 8ccb3dcd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

x86: Fix booting with "no387 nofxsr"

Jesper Juhl reported that testing the software math-emulation by forcing
"no387" doesn't work on modern CPU's.

The reason was two-fold:
 - you also need to pass in "nofxsr" to make sure that we not only don't
   touch the old i387 legacy hardware, it also needs to disable the
   modern XMM/FXSR sequences
 - "nofxsr" didn't actually clear the capability bits immediately,
   leaving the early boot sequence still using FXSR until we got to
   the identify_cpu() stage.

This fixes the "nofxsr" flag to take effect immediately on the boot CPU.

Debugging by Randy Dunlap
Acked-by: default avatarRandy Dunlap <>
Cc: Jesper Juhl <>
Cc: Andi Kleen <>
Signed-off-by: default avatarLinus Torvalds <>
parent 63c422af
...@@ -184,7 +184,16 @@ static void __cpuinit get_cpu_vendor(struct cpuinfo_x86 *c, int early) ...@@ -184,7 +184,16 @@ static void __cpuinit get_cpu_vendor(struct cpuinfo_x86 *c, int early)
static int __init x86_fxsr_setup(char * s) static int __init x86_fxsr_setup(char * s)
{ {
/* Tell all the other CPU's to not use it... */
disable_x86_fxsr = 1; disable_x86_fxsr = 1;
* ... and clear the bits early in the boot_cpu_data
* so that the bootup process doesn't try to do this
* either.
clear_bit(X86_FEATURE_FXSR, boot_cpu_data.x86_capability);
clear_bit(X86_FEATURE_XMM, boot_cpu_data.x86_capability);
return 1; return 1;
} }
__setup("nofxsr", x86_fxsr_setup); __setup("nofxsr", x86_fxsr_setup);
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment