lkml.org 
[lkml]   [2015]   [May]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 120/208] x86/fpu: Move !FPU check ingo fpu__init_system_early_generic()
    Date
    There's a !FPU related sanity check in fpu__init_cpu_generic(),
    which is executed on every CPU onlining - even though we should do
    this only once, and during system init.

    Move this check to fpu__init_system_early_generic().

    Reviewed-by: Borislav Petkov <bp@alien8.de>
    Cc: Andy Lutomirski <luto@amacapital.net>
    Cc: Dave Hansen <dave.hansen@linux.intel.com>
    Cc: Fenghua Yu <fenghua.yu@intel.com>
    Cc: H. Peter Anvin <hpa@zytor.com>
    Cc: Linus Torvalds <torvalds@linux-foundation.org>
    Cc: Oleg Nesterov <oleg@redhat.com>
    Cc: Thomas Gleixner <tglx@linutronix.de>
    Signed-off-by: Ingo Molnar <mingo@kernel.org>
    ---
    arch/x86/kernel/fpu/init.c | 17 +++++++++--------
    1 file changed, 9 insertions(+), 8 deletions(-)

    diff --git a/arch/x86/kernel/fpu/init.c b/arch/x86/kernel/fpu/init.c
    index 3637c509956d..69cdadd49ddf 100644
    --- a/arch/x86/kernel/fpu/init.c
    +++ b/arch/x86/kernel/fpu/init.c
    @@ -85,6 +85,15 @@ static void fpu__init_system_early_generic(struct cpuinfo_x86 *c)
    set_cpu_cap(c, X86_FEATURE_FPU);
    else
    clear_cpu_cap(c, X86_FEATURE_FPU);
    +
    +#ifndef CONFIG_MATH_EMULATION
    + if (!cpu_has_fpu) {
    + pr_emerg("No FPU found and no math emulation present\n");
    + pr_emerg("Giving up\n");
    + for (;;)
    + asm volatile("hlt");
    + }
    +#endif
    }

    /*
    @@ -180,14 +189,6 @@ static void fpu__init_cpu_generic(void)
    unsigned long cr0;
    unsigned long cr4_mask = 0;

    -#ifndef CONFIG_MATH_EMULATION
    - if (!cpu_has_fpu) {
    - pr_emerg("No FPU found and no math emulation present\n");
    - pr_emerg("Giving up\n");
    - for (;;)
    - asm volatile("hlt");
    - }
    -#endif
    if (cpu_has_fxsr)
    cr4_mask |= X86_CR4_OSFXSR;
    if (cpu_has_xmm)
    --
    2.1.0


    \
     
     \ /
      Last update: 2015-05-05 21:01    [W:4.169 / U:0.052 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site