From 839e9376bc82933ccacb26b660f1d3adf62aaf05 Mon Sep 17 00:00:00 2001

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

Date: Mon, 1 Jul 2019 16:17:31 +0100

Subject: [PATCH 02/39] i386: Update stepping of Cascadelake-Server

RH-Author: plai@redhat.com

Message-id: <1561997854-9646-3-git-send-email-plai@redhat.com>

Patchwork-id: 89329

O-Subject: [RHEL8.1 qemu-kvm PATCH v6 2/5] i386: Update stepping of Cascadelake-Server

Bugzilla: 1629906

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

RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>

RH-Acked-by: Bandan Das <bsd@redhat.com>

From: Tao Xu <tao3.xu@intel.com>

Update the stepping from 5 to 6, in order that

the Cascadelake-Server CPU model can support AVX512VNNI

and MSR based features exposed by ARCH_CAPABILITIES.

Signed-off-by: Tao Xu <tao3.xu@intel.com>

Message-Id: <20181227024304.12182-2-tao3.xu@intel.com>

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

(cherry picked from commit b0a1980384fc265d91de7e09aa5fe531a69e6288)

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

Resolved Conflicts:

	hw/i386/pc.c changes to include/hw/i386/pc.h

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

---

 include/hw/i386/pc.h | 4 ++++

 target/i386/cpu.c    | 2 +-

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

diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h

index 244d7b5..88ffd40 100644

--- a/include/hw/i386/pc.h

+++ b/include/hw/i386/pc.h

@@ -318,6 +318,10 @@ bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *);

         .driver   = "Skylake-Server" "-" TYPE_X86_CPU,\

         .property = "clflushopt",\

         .value    = "off",\

+    },{\

+        .driver   = "Cascadelake-Server" "-" TYPE_X86_CPU,\

+        .property = "stepping",\

+        .value    = "5",\

     },

 #define PC_COMPAT_2_10 \

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

index 9ba5288..c4b31eb 100644

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

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

@@ -2488,7 +2488,7 @@ static X86CPUDefinition builtin_x86_defs[] = {

         .vendor = CPUID_VENDOR_INTEL,

         .family = 6,

         .model = 85,

-        .stepping = 5,

+        .stepping = 6,

         .features[FEAT_1_EDX] =

             CPUID_VME | CPUID_SSE2 | CPUID_SSE | CPUID_FXSR | CPUID_MMX |

             CPUID_CLFLUSH | CPUID_PSE36 | CPUID_PAT | CPUID_CMOV | CPUID_MCA |

-- 

1.8.3.1