LKML Archive on lore.kernel.org
 help / Atom feed
From: tip-bot for Andy Lutomirski <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: bp@suse.de, mingo@kernel.org, luto@kernel.org,
	fenghua.yu@intel.com, yu-cheng.yu@intel.com, brgerst@gmail.com,
	bp@alien8.de, linux-kernel@vger.kernel.org, riel@redhat.com,
	oleg@redhat.com, hpa@zytor.com, peterz@infradead.org,
	tedheadster@gmail.com, torvalds@linux-foundation.org,
	dave.hansen@linux.intel.com, gnomes@lxorguk.ukuu.org.uk,
	tglx@linutronix.de
Subject: [tip:x86/fpu] x86/cpu: Factor out application of forced CPU caps
Date: Wed, 25 Jan 2017 03:40:52 -0800
Message-ID: <tip-8bf1ebca215c262e48c15a4a15f175991776f57f@git.kernel.org> (raw)
In-Reply-To: <623ff7555488122143e4417de09b18be2085ad06.1484705016.git.luto@kernel.org>

Commit-ID:  8bf1ebca215c262e48c15a4a15f175991776f57f
Gitweb:     http://git.kernel.org/tip/8bf1ebca215c262e48c15a4a15f175991776f57f
Author:     Andy Lutomirski <luto@kernel.org>
AuthorDate: Wed, 18 Jan 2017 11:15:38 -0800
Committer:  Ingo Molnar <mingo@kernel.org>
CommitDate: Wed, 25 Jan 2017 10:12:40 +0100

x86/cpu: Factor out application of forced CPU caps

There are multiple call sites that apply forced CPU caps.  Factor
them into a helper.

Signed-off-by: Andy Lutomirski <luto@kernel.org>
Reviewed-by: Borislav Petkov <bp@suse.de>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
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: Matthew Whitehead <tedheadster@gmail.com>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: One Thousand Gnomes <gnomes@lxorguk.ukuu.org.uk>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Rik van Riel <riel@redhat.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Yu-cheng Yu <yu-cheng.yu@intel.com>
Link: http://lkml.kernel.org/r/623ff7555488122143e4417de09b18be2085ad06.1484705016.git.luto@kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
 arch/x86/kernel/cpu/common.c | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
index c3328d0..2ea16e0 100644
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@ -655,6 +655,16 @@ void cpu_detect(struct cpuinfo_x86 *c)
 	}
 }
 
+static void apply_forced_caps(struct cpuinfo_x86 *c)
+{
+	int i;
+
+	for (i = 0; i < NCAPINTS; i++) {
+		c->x86_capability[i] &= ~cpu_caps_cleared[i];
+		c->x86_capability[i] |= cpu_caps_set[i];
+	}
+}
+
 void get_cpu_cap(struct cpuinfo_x86 *c)
 {
 	u32 eax, ebx, ecx, edx;
@@ -1035,10 +1045,7 @@ static void identify_cpu(struct cpuinfo_x86 *c)
 		this_cpu->c_identify(c);
 
 	/* Clear/Set all flags overridden by options, after probe */
-	for (i = 0; i < NCAPINTS; i++) {
-		c->x86_capability[i] &= ~cpu_caps_cleared[i];
-		c->x86_capability[i] |= cpu_caps_set[i];
-	}
+	apply_forced_caps(c);
 
 #ifdef CONFIG_X86_64
 	c->apicid = apic->phys_pkg_id(c->initial_apicid, 0);
@@ -1097,10 +1104,7 @@ static void identify_cpu(struct cpuinfo_x86 *c)
 	 * Clear/Set all flags overridden by options, need do it
 	 * before following smp all cpus cap AND.
 	 */
-	for (i = 0; i < NCAPINTS; i++) {
-		c->x86_capability[i] &= ~cpu_caps_cleared[i];
-		c->x86_capability[i] |= cpu_caps_set[i];
-	}
+	apply_forced_caps(c);
 
 	/*
 	 * On SMP, boot_cpu_data holds the common feature set between

  reply index

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-01-18 19:15 [PATCH v2 0/6] CPUID and FPU fixes Andy Lutomirski
2017-01-18 19:15 ` [PATCH v2 3/6] x86/cpu: Re-apply forced caps every time cpu caps are re-read Andy Lutomirski
2017-01-19 11:23   ` Borislav Petkov
2017-01-25 11:41   ` [tip:x86/fpu] x86/cpu: Re-apply forced caps every time CPU " tip-bot for Andy Lutomirski
2017-01-18 19:15 ` [PATCH v2 5/6] x86/fpu: Fix CPUID-less FPU detection Andy Lutomirski
2017-01-19 11:23   ` Borislav Petkov
2017-01-25 11:42   ` [tip:x86/fpu] " tip-bot for Andy Lutomirski
2017-01-18 19:15 [PATCH v2 1/6] x86/cpu: Add X86_FEATURE_CPUID Andy Lutomirski
2017-01-25 11:40 ` [tip:x86/fpu] " tip-bot for Borislav Petkov
2017-01-18 19:15 [PATCH v2 2/6] x86/cpu: Factor out application of forced cpu caps Andy Lutomirski
2017-01-25 11:40 ` tip-bot for Andy Lutomirski [this message]
2017-01-18 19:15 [PATCH v2 4/6] x86/fpu: Fix "x86/fpu: Legacy x87 FPU detected" message Andy Lutomirski
2017-01-25 11:42 ` [tip:x86/fpu] " tip-bot for Andy Lutomirski
2017-01-18 19:15 [PATCH v2 6/6] x86/fpu: Fix the "Giving up, no FPU found" test Andy Lutomirski
2017-01-25 11:43 ` [tip:x86/fpu] " tip-bot for Andy Lutomirski

Reply instructions:

You may reply publically 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=tip-8bf1ebca215c262e48c15a4a15f175991776f57f@git.kernel.org \
    --to=tipbot@zytor.com \
    --cc=bp@alien8.de \
    --cc=bp@suse.de \
    --cc=brgerst@gmail.com \
    --cc=dave.hansen@linux.intel.com \
    --cc=fenghua.yu@intel.com \
    --cc=gnomes@lxorguk.ukuu.org.uk \
    --cc=hpa@zytor.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=luto@kernel.org \
    --cc=mingo@kernel.org \
    --cc=oleg@redhat.com \
    --cc=peterz@infradead.org \
    --cc=riel@redhat.com \
    --cc=tedheadster@gmail.com \
    --cc=tglx@linutronix.de \
    --cc=torvalds@linux-foundation.org \
    --cc=yu-cheng.yu@intel.com \
    /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

LKML Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/lkml/0 lkml/git/0.git
	git clone --mirror https://lore.kernel.org/lkml/1 lkml/git/1.git
	git clone --mirror https://lore.kernel.org/lkml/2 lkml/git/2.git
	git clone --mirror https://lore.kernel.org/lkml/3 lkml/git/3.git
	git clone --mirror https://lore.kernel.org/lkml/4 lkml/git/4.git
	git clone --mirror https://lore.kernel.org/lkml/5 lkml/git/5.git
	git clone --mirror https://lore.kernel.org/lkml/6 lkml/git/6.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 lkml lkml/ https://lore.kernel.org/lkml \
		linux-kernel@vger.kernel.org linux-kernel@archiver.kernel.org
	public-inbox-index lkml


Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-kernel


AGPL code for this site: git clone https://public-inbox.org/ public-inbox