i386: Update stepping of Cascadelake-Server

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 <[email protected]>
Message-Id: <20181227024304[email protected]>
Signed-off-by: Eduardo Habkost <[email protected]>

diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index 747548b7aa04fa9b7440661e3720d2bcb9db8d6c..94ac9dee3d2c1b0ca7b723e302b398aaad50d5de 100644 (file)
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -122,6 +122,7 @@ GlobalProperty pc_compat_3_1[] = {
     { "Cascadelake-Server" "-" TYPE_X86_CPU,  "mpx", "on" },
     { "Icelake-Client" "-" TYPE_X86_CPU,      "mpx", "on" },
     { "Icelake-Server" "-" TYPE_X86_CPU,      "mpx", "on" },
+    { "Cascadelake-Server" "-" TYPE_X86_CPU, "stepping", "5" },
 };
 const size_t pc_compat_3_1_len = G_N_ELEMENTS(pc_compat_3_1);
 

diff --git a/target/i386/cpu.c b/target/i386/cpu.c
index 2f5412592d30ea7a24810f3bf6a8c7d4b035a0f9..43df8133271cf16812d1829f5bcc6898a89bff5c 100644 (file)
--- a/target/i386/cpu.c
+++ b/target/i386/cpu.c
@@ -2503,7 +2503,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 |