xen-devel.lists.xenproject.org archive mirror
 help / color / mirror / Atom feed
From: "Luis R. Rodriguez" <mcgrof@kernel.org>
To: bp@alien8.de, hpa@zytor.com, tglx@linutronix.de,
	mingo@redhat.com, rusty@rustcorp.com.au
Cc: xen-devel@lists.xensource.com, x86@kernel.org,
	linux-kernel@vger.kernel.org, luto@amacapital.net,
	"Luis R. Rodriguez" <mcgrof@kernel.org>,
	lguest@lists.ozlabs.org, david.vrabel@citrix.com,
	boris.ostrovsky@oracle.com
Subject: [PATCH v3 08/11] x86/cpu/intel: replace paravirt_enabled() for f00f work around
Date: Mon, 22 Feb 2016 23:24:12 -0800	[thread overview]
Message-ID: <1456212255-23959-9-git-send-email-mcgrof@kernel.org> (raw)
In-Reply-To: <1456212255-23959-1-git-send-email-mcgrof@kernel.org>

Use the harware subarch instead now that they are set. If we
want to test removing this work around on Xen we can do so
separatley as another independent change, for now we just want
to remove paravirt_enabled().

v3: fix 0-day-bot compile error on a randconfig, missing
    to include <asm/setup.h>

Signed-off-by: Luis R. Rodriguez <mcgrof@kernel.org>
---
 arch/x86/kernel/cpu/intel.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c
index 565648bc1a0a..48ab1b6e0889 100644
--- a/arch/x86/kernel/cpu/intel.c
+++ b/arch/x86/kernel/cpu/intel.c
@@ -13,6 +13,7 @@
 #include <asm/msr.h>
 #include <asm/bugs.h>
 #include <asm/cpu.h>
+#include <asm/setup.h>
 
 #ifdef CONFIG_X86_64
 #include <linux/topology.h>
@@ -220,7 +221,9 @@ static void intel_workarounds(struct cpuinfo_x86 *c)
 	 * The Quark is also family 5, but does not have the same bug.
 	 */
 	clear_cpu_bug(c, X86_BUG_F00F);
-	if (!paravirt_enabled() && c->x86 == 5 && c->x86_model < 9) {
+	if (boot_params.hdr.hardware_subarch != X86_SUBARCH_XEN &&
+	    boot_params.hdr.hardware_subarch != X86_SUBARCH_LGUEST &&
+	    c->x86 == 5 && c->x86_model < 9) {
 		static int f00f_workaround_enabled;
 
 		set_cpu_bug(c, X86_BUG_F00F);
-- 
2.7.0

  parent reply	other threads:[~2016-02-23  7:24 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-02-23  7:24 [PATCH v3 00/11] x86/init: replace paravirt_enabled() were possible Luis R. Rodriguez
2016-02-23  7:24 ` [PATCH v3 01/11] x86/boot: enumerate documentation for the x86 hardware_subarch Luis R. Rodriguez
2016-02-23  8:51   ` Ingo Molnar
2016-02-23 10:34     ` Luis R. Rodriguez
2016-02-23 20:41       ` Luis R. Rodriguez
2016-02-24  8:32         ` Ingo Molnar
2016-02-24 16:40           ` Andy Lutomirski
2016-02-25  1:18             ` Luis R. Rodriguez
2016-02-25  1:29               ` Andy Lutomirski
     [not found]             ` <CALCETrW=dia7QCDhJVF8rnaKGDx_NNYVZqUNZSs9R87_o=h6NQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2016-02-25  8:10               ` Ingo Molnar
2016-03-02  0:43           ` Luis R. Rodriguez
2016-03-02 19:40             ` Luis R. Rodriguez
2016-04-07 20:59           ` Luis R. Rodriguez
2016-02-23  7:24 ` [PATCH v3 02/11] tools/lguest: make lguest launcher use X86_SUBARCH_LGUEST explicitly Luis R. Rodriguez
2016-02-23  7:24 ` [PATCH v3 03/11] x86/xen: use X86_SUBARCH_XEN for PV guest boots Luis R. Rodriguez
2016-02-23  7:24 ` [PATCH v3 04/11] x86/init: make ebda depend on PC subarch Luis R. Rodriguez
2016-02-23  7:24 ` [PATCH v3 05/11] tools/lguest: force disable tboot and apm Luis R. Rodriguez
2016-02-23  7:24 ` [PATCH v3 06/11] apm32: remove paravirt_enabled() use Luis R. Rodriguez
2016-02-23  7:24 ` [PATCH v3 07/11] x86/tboot: remove paravirt_enabled() Luis R. Rodriguez
2016-02-23  7:24 ` Luis R. Rodriguez [this message]
2016-02-23  7:24 ` [PATCH v3 09/11] x86/boot: add BIT() to boot/bitops.h Luis R. Rodriguez
2016-02-23  7:24 ` [PATCH v3 10/11] x86/rtc: replace paravirt rtc check with x86 specific solution Luis R. Rodriguez
2016-02-23 11:57   ` [Xen-devel] " David Vrabel
2016-02-23 18:10     ` Luis R. Rodriguez
2016-02-23  7:24 ` [PATCH v3 11/11] pnpbios: replace paravirt_enabled() check with subarch checks Luis R. Rodriguez

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=1456212255-23959-9-git-send-email-mcgrof@kernel.org \
    --to=mcgrof@kernel.org \
    --cc=boris.ostrovsky@oracle.com \
    --cc=bp@alien8.de \
    --cc=david.vrabel@citrix.com \
    --cc=hpa@zytor.com \
    --cc=lguest@lists.ozlabs.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=luto@amacapital.net \
    --cc=mingo@redhat.com \
    --cc=rusty@rustcorp.com.au \
    --cc=tglx@linutronix.de \
    --cc=x86@kernel.org \
    --cc=xen-devel@lists.xensource.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
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).