thebeanogamer / rpms / qemu-kvm

Forked from rpms/qemu-kvm 5 months ago
Clone
4ec855
From 839e9376bc82933ccacb26b660f1d3adf62aaf05 Mon Sep 17 00:00:00 2001
4ec855
From: "plai@redhat.com" <plai@redhat.com>
4ec855
Date: Mon, 1 Jul 2019 16:17:31 +0100
4ec855
Subject: [PATCH 02/39] i386: Update stepping of Cascadelake-Server
4ec855
4ec855
RH-Author: plai@redhat.com
4ec855
Message-id: <1561997854-9646-3-git-send-email-plai@redhat.com>
4ec855
Patchwork-id: 89329
4ec855
O-Subject: [RHEL8.1 qemu-kvm PATCH v6 2/5] i386: Update stepping of Cascadelake-Server
4ec855
Bugzilla: 1629906
4ec855
RH-Acked-by: Eduardo Habkost <ehabkost@redhat.com>
4ec855
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
4ec855
RH-Acked-by: Bandan Das <bsd@redhat.com>
4ec855
4ec855
From: Tao Xu <tao3.xu@intel.com>
4ec855
4ec855
Update the stepping from 5 to 6, in order that
4ec855
the Cascadelake-Server CPU model can support AVX512VNNI
4ec855
and MSR based features exposed by ARCH_CAPABILITIES.
4ec855
4ec855
Signed-off-by: Tao Xu <tao3.xu@intel.com>
4ec855
Message-Id: <20181227024304.12182-2-tao3.xu@intel.com>
4ec855
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
4ec855
(cherry picked from commit b0a1980384fc265d91de7e09aa5fe531a69e6288)
4ec855
Signed-off-by: Paul Lai <plai@redhat.com>
4ec855
4ec855
Resolved Conflicts:
4ec855
	hw/i386/pc.c changes to include/hw/i386/pc.h
4ec855
4ec855
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
4ec855
---
4ec855
 include/hw/i386/pc.h | 4 ++++
4ec855
 target/i386/cpu.c    | 2 +-
4ec855
 2 files changed, 5 insertions(+), 1 deletion(-)
4ec855
4ec855
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
4ec855
index 244d7b5..88ffd40 100644
4ec855
--- a/include/hw/i386/pc.h
4ec855
+++ b/include/hw/i386/pc.h
4ec855
@@ -318,6 +318,10 @@ bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *);
4ec855
         .driver   = "Skylake-Server" "-" TYPE_X86_CPU,\
4ec855
         .property = "clflushopt",\
4ec855
         .value    = "off",\
4ec855
+    },{\
4ec855
+        .driver   = "Cascadelake-Server" "-" TYPE_X86_CPU,\
4ec855
+        .property = "stepping",\
4ec855
+        .value    = "5",\
4ec855
     },
4ec855
 
4ec855
 #define PC_COMPAT_2_10 \
4ec855
diff --git a/target/i386/cpu.c b/target/i386/cpu.c
4ec855
index 9ba5288..c4b31eb 100644
4ec855
--- a/target/i386/cpu.c
4ec855
+++ b/target/i386/cpu.c
4ec855
@@ -2488,7 +2488,7 @@ static X86CPUDefinition builtin_x86_defs[] = {
4ec855
         .vendor = CPUID_VENDOR_INTEL,
4ec855
         .family = 6,
4ec855
         .model = 85,
4ec855
-        .stepping = 5,
4ec855
+        .stepping = 6,
4ec855
         .features[FEAT_1_EDX] =
4ec855
             CPUID_VME | CPUID_SSE2 | CPUID_SSE | CPUID_FXSR | CPUID_MMX |
4ec855
             CPUID_CLFLUSH | CPUID_PSE36 | CPUID_PAT | CPUID_CMOV | CPUID_MCA |
4ec855
-- 
4ec855
1.8.3.1
4ec855