From 1e661277e83c9b2e29bf5e2e77f358355aa11c8a Mon Sep 17 00:00:00 2001

From: "plai@redhat.com" <plai@redhat.com>

Date: Wed, 3 Apr 2019 15:54:28 +0100

Subject: [PATCH 04/10] i386: Add CPUID bit for WBNOINVD

RH-Author: plai@redhat.com

Message-id: <1554306874-28796-5-git-send-email-plai@redhat.com>

Patchwork-id: 85382

O-Subject: [RHEL8.1 qemu-kvm PATCH resend 04/10] i386: Add CPUID bit for WBNOINVD

Bugzilla: 1561761

RH-Acked-by: Eduardo Habkost <ehabkost@redhat.com>

RH-Acked-by: Igor Mammedov <imammedo@redhat.com>

RH-Acked-by: Michael S. Tsirkin <mst@redhat.com>

From: Robert Hoo <robert.hu@linux.intel.com>

WBNOINVD: Write back and do not invalidate cache, enumerated by

CPUID.(EAX=80000008H, ECX=0):EBX[bit 9].

Signed-off-by: Robert Hoo <robert.hu@linux.intel.com>

Message-Id: <1530781798-183214-5-git-send-email-robert.hu@linux.intel.com>

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>

(cherry picked from commit 59a80a19ca31a6fff9fdbb6b4cf55a5a0767c3bc)

Signed-off-by: Paul Lai <plai@redhat.com>

Resolved Conflicts:

	target/i386/cpu.h

Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>

---

 target/i386/cpu.c | 2 +-

 target/i386/cpu.h | 2 ++

 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/target/i386/cpu.c b/target/i386/cpu.c

index fec39bd..8b9a9f6 100644

--- a/target/i386/cpu.c

+++ b/target/i386/cpu.c

@@ -1036,7 +1036,7 @@ static FeatureWordInfo feature_word_info[FEATURE_WORDS] = {

         .feat_names = {

             NULL, NULL, NULL, NULL,

             NULL, NULL, NULL, NULL,

-            NULL, NULL, NULL, NULL,

+            NULL, "wbnoinvd", NULL, NULL,

             "ibpb", NULL, NULL, NULL,

             NULL, NULL, NULL, NULL,

             NULL, NULL, NULL, NULL,

diff --git a/target/i386/cpu.h b/target/i386/cpu.h

index 3b2ea97..dd4493e 100644

--- a/target/i386/cpu.h

+++ b/target/i386/cpu.h

@@ -693,6 +693,8 @@ typedef uint32_t FeatureWordArray[FEATURE_WORDS];

 #define KVM_HINTS_DEDICATED (1U << 0)

+#define CPUID_8000_0008_EBX_WBNOINVD  (1U << 9)  /* Write back and

+                                                                             do not invalidate cache */

 #define CPUID_8000_0008_EBX_IBPB    (1U << 12) /* Indirect Branch Prediction Barrier */

 #define CPUID_XSAVE_XSAVEOPT   (1U << 0)

-- 

1.8.3.1