From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751552AbdAYLnQ (ORCPT ); Wed, 25 Jan 2017 06:43:16 -0500 Received: from terminus.zytor.com ([65.50.211.136]:49168 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751340AbdAYLnP (ORCPT ); Wed, 25 Jan 2017 06:43:15 -0500 Date: Wed, 25 Jan 2017 03:42:01 -0800 From: tip-bot for Andy Lutomirski Message-ID: Cc: tedheadster@gmail.com, riel@redhat.com, gnomes@lxorguk.ukuu.org.uk, fenghua.yu@intel.com, mingo@kernel.org, luto@kernel.org, torvalds@linux-foundation.org, hpa@zytor.com, yu-cheng.yu@intel.com, peterz@infradead.org, bp@suse.de, bp@alien8.de, brgerst@gmail.com, oleg@redhat.com, linux-kernel@vger.kernel.org, dave.hansen@linux.intel.com, tglx@linutronix.de Reply-To: bp@suse.de, yu-cheng.yu@intel.com, peterz@infradead.org, oleg@redhat.com, bp@alien8.de, brgerst@gmail.com, linux-kernel@vger.kernel.org, dave.hansen@linux.intel.com, tglx@linutronix.de, tedheadster@gmail.com, gnomes@lxorguk.ukuu.org.uk, riel@redhat.com, luto@kernel.org, mingo@kernel.org, fenghua.yu@intel.com, hpa@zytor.com, torvalds@linux-foundation.org In-Reply-To: References: To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/fpu] x86/fpu: Fix "x86/fpu: Legacy x87 FPU detected" message Git-Commit-ID: 9170fb409437b246078bcad3f1481d32dfe2ca28 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 9170fb409437b246078bcad3f1481d32dfe2ca28 Gitweb: http://git.kernel.org/tip/9170fb409437b246078bcad3f1481d32dfe2ca28 Author: Andy Lutomirski AuthorDate: Wed, 18 Jan 2017 11:15:40 -0800 Committer: Ingo Molnar CommitDate: Wed, 25 Jan 2017 10:12:42 +0100 x86/fpu: Fix "x86/fpu: Legacy x87 FPU detected" message That message isn't at all clear -- what does "Legacy x87" even mean? Clarify it. If there's no FPU, say: x86/fpu: No FPU detected If there's an FPU that doesn't have XSAVE, say: x86/fpu: x87 FPU will use FSAVE|FXSAVE Signed-off-by: Andy Lutomirski Reviewed-by: Borislav Petkov Cc: Borislav Petkov Cc: Brian Gerst Cc: Dave Hansen Cc: Fenghua Yu Cc: H. Peter Anvin Cc: Linus Torvalds Cc: Matthew Whitehead Cc: Oleg Nesterov Cc: One Thousand Gnomes Cc: Peter Zijlstra Cc: Rik van Riel Cc: Thomas Gleixner Cc: Yu-cheng Yu Link: http://lkml.kernel.org/r/bb839385e18e27bca23fe8666dfdad8170473045.1484705016.git.luto@kernel.org [ Small tweaks to the messages. ] Signed-off-by: Ingo Molnar --- arch/x86/kernel/fpu/xstate.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/arch/x86/kernel/fpu/xstate.c b/arch/x86/kernel/fpu/xstate.c index 1d77704..96002f1 100644 --- a/arch/x86/kernel/fpu/xstate.c +++ b/arch/x86/kernel/fpu/xstate.c @@ -705,8 +705,14 @@ void __init fpu__init_system_xstate(void) WARN_ON_FPU(!on_boot_cpu); on_boot_cpu = 0; + if (!boot_cpu_has(X86_FEATURE_FPU)) { + pr_info("x86/fpu: No FPU detected\n"); + return; + } + if (!boot_cpu_has(X86_FEATURE_XSAVE)) { - pr_info("x86/fpu: Legacy x87 FPU detected.\n"); + pr_info("x86/fpu: x87 FPU will use %s\n", + boot_cpu_has(X86_FEATURE_FXSR) ? "FXSAVE" : "FSAVE"); return; }