yeahuh / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone
902636
From 4009f0bcc8004ce481015d088fe335a16b8d7ce1 Mon Sep 17 00:00:00 2001
902636
From: Paolo Bonzini <pbonzini@redhat.com>
902636
Date: Mon, 17 Feb 2020 16:23:12 +0000
902636
Subject: [PATCH 2/9] target/i386: add a ucode-rev property
902636
902636
RH-Author: Paolo Bonzini <pbonzini@redhat.com>
902636
Message-id: <20200217162316.2464-3-pbonzini@redhat.com>
902636
Patchwork-id: 93909
902636
O-Subject: [RHEL-AV-8.2.0 qemu-kvm PATCH 2/6] target/i386: add a ucode-rev property
902636
Bugzilla: 1791648
902636
RH-Acked-by: Eduardo Habkost <ehabkost@redhat.com>
902636
RH-Acked-by: Maxim Levitsky <mlevitsk@redhat.com>
902636
RH-Acked-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
902636
902636
Add the property and plumb it in TCG and HVF (the latter of which
902636
tried to support returning a constant value but used the wrong MSR).
902636
902636
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
902636
Message-Id: <1579544504-3616-3-git-send-email-pbonzini@redhat.com>
902636
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
902636
(cherry picked from commit 4e45aff398cd1542c2a384a2a3b8600f23337d86)
902636
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
902636
---
902636
 target/i386/cpu.c         | 10 ++++++++++
902636
 target/i386/cpu.h         |  3 +++
902636
 target/i386/hvf/x86_emu.c |  4 +---
902636
 target/i386/misc_helper.c |  4 ++++
902636
 4 files changed, 18 insertions(+), 3 deletions(-)
902636
902636
diff --git a/target/i386/cpu.c b/target/i386/cpu.c
902636
index 863192c..e505d3e 100644
902636
--- a/target/i386/cpu.c
902636
+++ b/target/i386/cpu.c
902636
@@ -6325,6 +6325,15 @@ static void x86_cpu_realizefn(DeviceState *dev, Error **errp)
902636
         }
902636
     }
902636
 
902636
+    if (cpu->ucode_rev == 0) {
902636
+        /* The default is the same as KVM's.  */
902636
+        if (IS_AMD_CPU(env)) {
902636
+            cpu->ucode_rev = 0x01000065;
902636
+        } else {
902636
+            cpu->ucode_rev = 0x100000000ULL;
902636
+        }
902636
+    }
902636
+
902636
     /* mwait extended info: needed for Core compatibility */
902636
     /* We always wake on interrupt even if host does not have the capability */
902636
     cpu->mwait.ecx |= CPUID_MWAIT_EMX | CPUID_MWAIT_IBE;
902636
@@ -7008,6 +7017,7 @@ static Property x86_cpu_properties[] = {
902636
     DEFINE_PROP_UINT32("min-level", X86CPU, env.cpuid_min_level, 0),
902636
     DEFINE_PROP_UINT32("min-xlevel", X86CPU, env.cpuid_min_xlevel, 0),
902636
     DEFINE_PROP_UINT32("min-xlevel2", X86CPU, env.cpuid_min_xlevel2, 0),
902636
+    DEFINE_PROP_UINT64("ucode-rev", X86CPU, ucode_rev, 0),
902636
     DEFINE_PROP_BOOL("full-cpuid-auto-level", X86CPU, full_cpuid_auto_level, true),
902636
     DEFINE_PROP_STRING("hv-vendor-id", X86CPU, hyperv_vendor_id),
902636
     DEFINE_PROP_BOOL("cpuid-0xb", X86CPU, enable_cpuid_0xb, true),
902636
diff --git a/target/i386/cpu.h b/target/i386/cpu.h
902636
index cde2a16..4441061 100644
902636
--- a/target/i386/cpu.h
902636
+++ b/target/i386/cpu.h
902636
@@ -348,6 +348,7 @@ typedef enum X86Seg {
902636
 #define MSR_IA32_SPEC_CTRL              0x48
902636
 #define MSR_VIRT_SSBD                   0xc001011f
902636
 #define MSR_IA32_PRED_CMD               0x49
902636
+#define MSR_IA32_UCODE_REV              0x8b
902636
 #define MSR_IA32_CORE_CAPABILITY        0xcf
902636
 
902636
 #define MSR_IA32_ARCH_CAPABILITIES      0x10a
902636
@@ -1621,6 +1622,8 @@ struct X86CPU {
902636
     CPUNegativeOffsetState neg;
902636
     CPUX86State env;
902636
 
902636
+    uint64_t ucode_rev;
902636
+
902636
     uint32_t hyperv_spinlock_attempts;
902636
     char *hyperv_vendor_id;
902636
     bool hyperv_synic_kvm_only;
902636
diff --git a/target/i386/hvf/x86_emu.c b/target/i386/hvf/x86_emu.c
902636
index 3df7672..92ab815 100644
902636
--- a/target/i386/hvf/x86_emu.c
902636
+++ b/target/i386/hvf/x86_emu.c
902636
@@ -664,8 +664,6 @@ static void exec_lods(struct CPUX86State *env, struct x86_decode *decode)
902636
     RIP(env) += decode->len;
902636
 }
902636
 
902636
-#define MSR_IA32_UCODE_REV 0x00000017
902636
-
902636
 void simulate_rdmsr(struct CPUState *cpu)
902636
 {
902636
     X86CPU *x86_cpu = X86_CPU(cpu);
902636
@@ -681,7 +679,7 @@ void simulate_rdmsr(struct CPUState *cpu)
902636
         val = cpu_get_apic_base(X86_CPU(cpu)->apic_state);
902636
         break;
902636
     case MSR_IA32_UCODE_REV:
902636
-        val = (0x100000000ULL << 32) | 0x100000000ULL;
902636
+        val = x86_cpu->ucode_rev;
902636
         break;
902636
     case MSR_EFER:
902636
         val = rvmcs(cpu->hvf_fd, VMCS_GUEST_IA32_EFER);
902636
diff --git a/target/i386/misc_helper.c b/target/i386/misc_helper.c
902636
index 3eff688..aed16fe 100644
902636
--- a/target/i386/misc_helper.c
902636
+++ b/target/i386/misc_helper.c
902636
@@ -229,6 +229,7 @@ void helper_rdmsr(CPUX86State *env)
902636
 #else
902636
 void helper_wrmsr(CPUX86State *env)
902636
 {
902636
+    X86CPU *x86_cpu = env_archcpu(env);
902636
     uint64_t val;
902636
 
902636
     cpu_svm_check_intercept_param(env, SVM_EXIT_MSR, 1, GETPC());
902636
@@ -371,6 +372,9 @@ void helper_wrmsr(CPUX86State *env)
902636
         env->msr_bndcfgs = val;
902636
         cpu_sync_bndcs_hflags(env);
902636
         break;
902636
+     case MSR_IA32_UCODE_REV:
902636
+        val = x86_cpu->ucode_rev;
902636
+        break;
902636
     default:
902636
         if ((uint32_t)env->regs[R_ECX] >= MSR_MC0_CTL
902636
             && (uint32_t)env->regs[R_ECX] < MSR_MC0_CTL +
902636
-- 
902636
1.8.3.1
902636