From: Borislav Petkov <bp@alien8.de>
To: Andy Lutomirski <luto@kernel.org>
Cc: x86@kernel.org, One Thousand Gnomes <gnomes@lxorguk.ukuu.org.uk>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
Brian Gerst <brgerst@gmail.com>,
Matthew Whitehead <tedheadster@gmail.com>
Subject: Re: [RFC PATCH 5/6] x86/fpu: Fix CPUID-less FPU detection
Date: Tue, 6 Dec 2016 10:40:00 +0100 [thread overview]
Message-ID: <20161206094000.ql5gjky7ag3b6j7v@pd.tnic> (raw)
In-Reply-To: <dd08dc0600e60207491908d7d70fc8c64fb82be3.1480985979.git.luto@kernel.org>
On Mon, Dec 05, 2016 at 05:01:14PM -0800, Andy Lutomirski wrote:
> The old code didn't work at all because it adjusted the current caps
> instead of the forced caps. Anything it did would be undone later
> during cpu identification. Fix that and, while we're at it, improve
> the logging and don't bother running it if CPUID is available.
>
> Signed-off-by: Andy Lutomirski <luto@kernel.org>
> ---
> arch/x86/kernel/fpu/init.c | 28 ++++++++++++++++------------
> 1 file changed, 16 insertions(+), 12 deletions(-)
>
> diff --git a/arch/x86/kernel/fpu/init.c b/arch/x86/kernel/fpu/init.c
> index 60dece392b3a..75e1bf3b0319 100644
> --- a/arch/x86/kernel/fpu/init.c
> +++ b/arch/x86/kernel/fpu/init.c
> @@ -50,29 +50,33 @@ void fpu__init_cpu(void)
>
> /*
> * The earliest FPU detection code.
> - *
> - * Set the X86_FEATURE_FPU CPU-capability bit based on
> - * trying to execute an actual sequence of FPU instructions:
> */
> static void fpu__init_system_early_generic(struct cpuinfo_x86 *c)
> {
> - unsigned long cr0;
> - u16 fsw, fcw;
> + if (!boot_cpu_has(X86_FEATURE_CPUID) &&
> + !test_bit(X86_FEATURE_FPU, (unsigned long *)cpu_caps_cleared)) {
Flip test and save an indentation level.
> + /*
> + * Set the X86_FEATURE_FPU CPU-capability bit based on
> + * trying to execute an actual sequence of FPU instructions:
> + */
>
> - fsw = fcw = 0xffff;
> + unsigned long cr0;
> + u16 fsw, fcw;
>
> - cr0 = read_cr0();
> - cr0 &= ~(X86_CR0_TS | X86_CR0_EM);
> - write_cr0(cr0);
> + fsw = fcw = 0xffff;
> +
> + cr0 = read_cr0();
> + cr0 &= ~(X86_CR0_TS | X86_CR0_EM);
> + write_cr0(cr0);
>
> - if (!test_bit(X86_FEATURE_FPU, (unsigned long *)cpu_caps_cleared)) {
> asm volatile("fninit ; fnstsw %0 ; fnstcw %1"
> : "+m" (fsw), "+m" (fcw));
> + pr_info("x86/fpu: FSW=0x%04hx FCW=0x%04hx\n", fsw, fcw);
Why do we want those in dmesg? Maybe KERN_DEBUG?
--
Regards/Gruss,
Boris.
Good mailing practices for 400: avoid top-posting and trim the reply.
next prev parent reply other threads:[~2016-12-06 9:40 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-06 1:01 [RFC PATCH 0/6] CPUID and FPU fixes Andy Lutomirski
2016-12-06 1:01 ` [RFC PATCH 1/6] x86/CPU: Add X86_FEATURE_CPUID Andy Lutomirski
2016-12-06 8:08 ` Borislav Petkov
2016-12-06 1:01 ` [RFC PATCH 2/6] x86/cpu: Factor out application of forced cpu caps Andy Lutomirski
2016-12-06 8:32 ` Borislav Petkov
2016-12-06 1:01 ` [RFC PATCH 3/6] x86/cpu: Re-apply forced caps every time cpu caps are re-read Andy Lutomirski
2016-12-06 8:57 ` Borislav Petkov
2016-12-06 1:01 ` [RFC PATCH 4/6] x86/fpu: Fix "x86/fpu: Legacy x87 FPU detected" message Andy Lutomirski
2016-12-06 9:24 ` Borislav Petkov
2016-12-06 17:59 ` Andy Lutomirski
2016-12-06 18:04 ` Borislav Petkov
2016-12-06 1:01 ` [RFC PATCH 5/6] x86/fpu: Fix CPUID-less FPU detection Andy Lutomirski
2016-12-06 9:40 ` Borislav Petkov [this message]
2016-12-06 17:52 ` Andy Lutomirski
2016-12-07 9:42 ` Borislav Petkov
2016-12-06 1:01 ` [RFC PATCH 6/6] x86/fpu: Fix the "Giving up, no FPU found" test Andy Lutomirski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20161206094000.ql5gjky7ag3b6j7v@pd.tnic \
--to=bp@alien8.de \
--cc=brgerst@gmail.com \
--cc=gnomes@lxorguk.ukuu.org.uk \
--cc=linux-kernel@vger.kernel.org \
--cc=luto@kernel.org \
--cc=tedheadster@gmail.com \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).