[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 6/8] i386: Add FEAT_8000_0008_EBX CPUID feature word
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PULL 6/8] i386: Add FEAT_8000_0008_EBX CPUID feature word |
Date: |
Thu, 18 Jan 2018 00:01:55 -0200 |
Add the new feature word and the "ibpb" feature flag.
Based on a patch by Paolo Bonzini.
Signed-off-by: Eduardo Habkost <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>
---
target/i386/cpu.h | 3 +++
target/i386/cpu.c | 19 ++++++++++++++++++-
2 files changed, 21 insertions(+), 1 deletion(-)
diff --git a/target/i386/cpu.h b/target/i386/cpu.h
index d7bae242cd..30cc5628d2 100644
--- a/target/i386/cpu.h
+++ b/target/i386/cpu.h
@@ -472,6 +472,7 @@ typedef enum FeatureWord {
FEAT_8000_0001_EDX, /* CPUID[8000_0001].EDX */
FEAT_8000_0001_ECX, /* CPUID[8000_0001].ECX */
FEAT_8000_0007_EDX, /* CPUID[8000_0007].EDX */
+ FEAT_8000_0008_EBX, /* CPUID[8000_0008].EBX */
FEAT_C000_0001_EDX, /* CPUID[C000_0001].EDX */
FEAT_KVM, /* CPUID[4000_0001].EAX (KVM_CPUID_FEATURES) */
FEAT_HYPERV_EAX, /* CPUID[4000_0003].EAX */
@@ -669,6 +670,8 @@ typedef uint32_t FeatureWordArray[FEATURE_WORDS];
#define CPUID_7_0_EDX_AVX512_4FMAPS (1U << 3) /* AVX512 Multiply Accumulation
Single Precision */
#define CPUID_7_0_EDX_SPEC_CTRL (1U << 26) /* Speculation Control */
+#define CPUID_8000_0008_EBX_IBPB (1U << 12) /* Indirect Branch Prediction
Barrier */
+
#define CPUID_XSAVE_XSAVEOPT (1U << 0)
#define CPUID_XSAVE_XSAVEC (1U << 1)
#define CPUID_XSAVE_XGETBV1 (1U << 2)
diff --git a/target/i386/cpu.c b/target/i386/cpu.c
index 7f815458a5..6fe14362cc 100644
--- a/target/i386/cpu.c
+++ b/target/i386/cpu.c
@@ -483,6 +483,22 @@ static FeatureWordInfo feature_word_info[FEATURE_WORDS] = {
.tcg_features = TCG_APM_FEATURES,
.unmigratable_flags = CPUID_APM_INVTSC,
},
+ [FEAT_8000_0008_EBX] = {
+ .feat_names = {
+ NULL, NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL,
+ "ibpb", NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL,
+ },
+ .cpuid_eax = 0x80000008,
+ .cpuid_reg = R_EBX,
+ .tcg_features = 0,
+ .unmigratable_flags = 0,
+ },
[FEAT_XSAVE] = {
.feat_names = {
"xsaveopt", "xsavec", "xgetbv1", "xsaves",
@@ -3130,7 +3146,7 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index,
uint32_t count,
} else {
*eax = cpu->phys_bits;
}
- *ebx = 0;
+ *ebx = env->features[FEAT_8000_0008_EBX];
*ecx = 0;
*edx = 0;
if (cs->nr_cores * cs->nr_threads > 1) {
@@ -3593,6 +3609,7 @@ static void x86_cpu_expand_features(X86CPU *cpu, Error
**errp)
x86_cpu_adjust_feat_level(cpu, FEAT_8000_0001_EDX);
x86_cpu_adjust_feat_level(cpu, FEAT_8000_0001_ECX);
x86_cpu_adjust_feat_level(cpu, FEAT_8000_0007_EDX);
+ x86_cpu_adjust_feat_level(cpu, FEAT_8000_0008_EBX);
x86_cpu_adjust_feat_level(cpu, FEAT_C000_0001_EDX);
x86_cpu_adjust_feat_level(cpu, FEAT_SVM);
x86_cpu_adjust_feat_level(cpu, FEAT_XSAVE);
--
2.14.3
- [Qemu-devel] [PULL 0/8] x86 queue, 2018-01-17, Eduardo Habkost, 2018/01/17
- [Qemu-devel] [PULL 1/8] pc: add 2.12 machine types, Eduardo Habkost, 2018/01/17
- [Qemu-devel] [PULL 2/8] target/i386: add clflushopt to "Skylake-Server" cpu model, Eduardo Habkost, 2018/01/17
- [Qemu-devel] [PULL 3/8] i386: Change X86CPUDefinition::model_id to const char*, Eduardo Habkost, 2018/01/17
- [Qemu-devel] [PULL 4/8] i386: Add support for SPEC_CTRL MSR, Eduardo Habkost, 2018/01/17
- [Qemu-devel] [PULL 5/8] i386: Add spec-ctrl CPUID bit, Eduardo Habkost, 2018/01/17
- [Qemu-devel] [PULL 8/8] i386: Add EPYC-IBPB CPU model, Eduardo Habkost, 2018/01/17
- [Qemu-devel] [PULL 6/8] i386: Add FEAT_8000_0008_EBX CPUID feature word,
Eduardo Habkost <=
- [Qemu-devel] [PULL 7/8] i386: Add new -IBRS versions of Intel CPU models, Eduardo Habkost, 2018/01/17
- Re: [Qemu-devel] [PULL 0/8] x86 queue, 2018-01-17, Peter Maydell, 2018/01/18
- Re: [Qemu-devel] [PULL 0/8] x86 queue, 2018-01-17, Christian Ehrhardt, 2018/01/23
- Re: [Qemu-devel] [PULL 0/8] x86 queue, 2018-01-17, Christian Borntraeger, 2018/01/23
- Re: [Qemu-devel] [qemu-s390x] [PULL 0/8] x86 queue, 2018-01-17, Cornelia Huck, 2018/01/23
- Re: [Qemu-devel] [PULL 0/8] x86 queue, 2018-01-17, Christian Ehrhardt, 2018/01/23
- Re: [Qemu-devel] [qemu-s390x] [PULL 0/8] x86 queue, 2018-01-17, Cornelia Huck, 2018/01/23
- Re: [Qemu-devel] [qemu-s390x] [PULL 0/8] x86 queue, 2018-01-17, Michael Roth, 2018/01/23
- Re: [Qemu-devel] [PULL 0/8] x86 queue, 2018-01-17, Peter Maydell, 2018/01/23
- Re: [Qemu-devel] [qemu-s390x] [PULL 0/8] x86 queue, 2018-01-17, David Hildenbrand, 2018/01/23