LKML Archive on lore.kernel.org
 help / color / Atom feed
From: "Luis R. Rodriguez" <mcgrof@kernel.org>
To: bp@alien8.de
Cc: x86@kernel.org, linux-kernel@vger.kernel.org,
	luto@amacapital.net, boris.ostrovsky@oracle.com,
	rusty@rustcorp.com.au, david.vrabel@citrix.com,
	konrad.wilk@oracle.com, xen-devel@lists.xensource.com,
	"Luis R. Rodriguez" <mcgrof@kernel.org>
Subject: [PATCH 7/9] x86/cpu/intel: replace paravirt_enabled() for f00f work around
Date: Fri, 19 Feb 2016 05:08:34 -0800
Message-ID: <1455887316-9223-8-git-send-email-mcgrof@kernel.org> (raw)
In-Reply-To: <1455887316-9223-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().

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

diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c
index 565648bc1a0a..26d8c496c909 100644
--- a/arch/x86/kernel/cpu/intel.c
+++ b/arch/x86/kernel/cpu/intel.c
@@ -220,7 +220,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 index

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-02-19 13:08 [PATCH 0/9] x86/init: replace paravirt_enabled() were possible Luis R. Rodriguez
2016-02-19 13:08 ` [PATCH 1/9] x86/boot: enumerate documentation for the x86 hardware_subarch Luis R. Rodriguez
2016-02-19 13:19   ` [Xen-devel] " Juergen Gross
2016-02-19 13:40   ` David Vrabel
2016-02-19 14:40     ` Luis R. Rodriguez
2016-02-19 13:08 ` [PATCH 2/9] tools/lguest: make lguest launcher use X86_SUBARCH_LGUEST explicitly Luis R. Rodriguez
2016-02-19 13:08 ` [PATCH 3/9] x86/xen: use X86_SUBARCH_XEN for PV guest boots Luis R. Rodriguez
2016-02-19 13:08 ` [PATCH 4/9] x86/init: make ebda depend on PC subarch Luis R. Rodriguez
2016-02-19 13:08 ` [PATCH 5/9] apm32: remove paravirt_enabled() use Luis R. Rodriguez
2016-02-19 15:08   ` Boris Ostrovsky
2016-02-19 20:58     ` Luis R. Rodriguez
2016-02-19 22:17       ` Boris Ostrovsky
2016-02-20  0:42         ` Luis R. Rodriguez
2016-02-22 14:15           ` Boris Ostrovsky
2016-02-19 13:08 ` [PATCH 6/9] x86/tboot: remove paravirt_enabled() Luis R. Rodriguez
2016-02-19 13:08 ` Luis R. Rodriguez [this message]
2016-02-19 13:08 ` [PATCH 8/9] x86/rtc: replace paravirt_enabled() check with subarch check Luis R. Rodriguez
2016-02-19 13:22   ` [Xen-devel] " Juergen Gross
2016-02-19 14:48     ` Luis R. Rodriguez
2016-02-22  6:07       ` Luis R. Rodriguez
2016-02-22 10:27         ` Borislav Petkov
2016-02-22 14:34           ` Boris Ostrovsky
2016-02-22 23:12             ` Luis R. Rodriguez
2016-02-19 13:27   ` David Vrabel
2016-02-19 13:08 ` [PATCH 9/9] pnpbios: replace paravirt_enabled() check with subarch checks Luis R. Rodriguez
2016-02-19 13:34 ` [Xen-devel] [PATCH 0/9] x86/init: replace paravirt_enabled() were possible David Vrabel
2016-02-19 14:36   ` 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=1455887316-9223-8-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=konrad.wilk@oracle.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=luto@amacapital.net \
    --cc=rusty@rustcorp.com.au \
    --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

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
	git clone --mirror https://lore.kernel.org/lkml/7 lkml/git/7.git
	git clone --mirror https://lore.kernel.org/lkml/8 lkml/git/8.git
	git clone --mirror https://lore.kernel.org/lkml/9 lkml/git/9.git
	git clone --mirror https://lore.kernel.org/lkml/10 lkml/git/10.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
	public-inbox-index lkml

Example config snippet for mirrors

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.git