[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 11/12] i386: Enable TOPOEXT feature on AMD EPYC CPU
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PULL 11/12] i386: Enable TOPOEXT feature on AMD EPYC CPU |
Date: |
Mon, 25 Jun 2018 19:25:23 -0300 |
From: Babu Moger <address@hidden>
Enable TOPOEXT feature on EPYC CPU. This is required to support
hyperthreading on VM guests. Also extend xlevel to 0x8000001E.
Disable topoext on PC_COMPAT_2_12 and keep xlevel 0x8000000a.
Signed-off-by: Babu Moger <address@hidden>
Message-Id: <address@hidden>
[ehabkost: Added EPYC-IBPB.xlevel to PC_COMPAT_2_12]
Signed-off-by: Eduardo Habkost <address@hidden>
---
include/hw/i386/pc.h | 12 ++++++++++++
target/i386/cpu.c | 10 ++++++----
2 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
index fc8dedca12..316230e570 100644
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -303,6 +303,18 @@ bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *);
.driver = TYPE_X86_CPU,\
.property = "legacy-cache",\
.value = "on",\
+ },{\
+ .driver = TYPE_X86_CPU,\
+ .property = "topoext",\
+ .value = "off",\
+ },{\
+ .driver = "EPYC-" TYPE_X86_CPU,\
+ .property = "xlevel",\
+ .value = stringify(0x8000000a),\
+ },{\
+ .driver = "EPYC-IBPB" TYPE_X86_CPU,\
+ .property = "xlevel",\
+ .value = stringify(0x8000000a),\
},
#define PC_COMPAT_2_11 \
diff --git a/target/i386/cpu.c b/target/i386/cpu.c
index 130391c840..d6ed29b484 100644
--- a/target/i386/cpu.c
+++ b/target/i386/cpu.c
@@ -2579,7 +2579,8 @@ static X86CPUDefinition builtin_x86_defs[] = {
.features[FEAT_8000_0001_ECX] =
CPUID_EXT3_OSVW | CPUID_EXT3_3DNOWPREFETCH |
CPUID_EXT3_MISALIGNSSE | CPUID_EXT3_SSE4A | CPUID_EXT3_ABM |
- CPUID_EXT3_CR8LEG | CPUID_EXT3_SVM | CPUID_EXT3_LAHF_LM,
+ CPUID_EXT3_CR8LEG | CPUID_EXT3_SVM | CPUID_EXT3_LAHF_LM |
+ CPUID_EXT3_TOPOEXT,
.features[FEAT_7_0_EBX] =
CPUID_7_0_EBX_FSGSBASE | CPUID_7_0_EBX_BMI1 | CPUID_7_0_EBX_AVX2 |
CPUID_7_0_EBX_SMEP | CPUID_7_0_EBX_BMI2 | CPUID_7_0_EBX_RDSEED |
@@ -2594,7 +2595,7 @@ static X86CPUDefinition builtin_x86_defs[] = {
CPUID_XSAVE_XGETBV1,
.features[FEAT_6_EAX] =
CPUID_6_EAX_ARAT,
- .xlevel = 0x8000000A,
+ .xlevel = 0x8000001E,
.model_id = "AMD EPYC Processor",
.cache_info = &epyc_cache_info,
},
@@ -2624,7 +2625,8 @@ static X86CPUDefinition builtin_x86_defs[] = {
.features[FEAT_8000_0001_ECX] =
CPUID_EXT3_OSVW | CPUID_EXT3_3DNOWPREFETCH |
CPUID_EXT3_MISALIGNSSE | CPUID_EXT3_SSE4A | CPUID_EXT3_ABM |
- CPUID_EXT3_CR8LEG | CPUID_EXT3_SVM | CPUID_EXT3_LAHF_LM,
+ CPUID_EXT3_CR8LEG | CPUID_EXT3_SVM | CPUID_EXT3_LAHF_LM |
+ CPUID_EXT3_TOPOEXT,
.features[FEAT_8000_0008_EBX] =
CPUID_8000_0008_EBX_IBPB,
.features[FEAT_7_0_EBX] =
@@ -2641,7 +2643,7 @@ static X86CPUDefinition builtin_x86_defs[] = {
CPUID_XSAVE_XGETBV1,
.features[FEAT_6_EAX] =
CPUID_6_EAX_ARAT,
- .xlevel = 0x8000000A,
+ .xlevel = 0x8000001E,
.model_id = "AMD EPYC Processor (with IBPB)",
.cache_info = &epyc_cache_info,
},
--
2.18.0.rc1.1.g3f1ff2140
- [Qemu-devel] [PULL 01/12] i386: Add support for CPUID_8000_001E for AMD, (continued)
- [Qemu-devel] [PULL 01/12] i386: Add support for CPUID_8000_001E for AMD, Eduardo Habkost, 2018/06/25
- [Qemu-devel] [PULL 02/12] i386: improve alignment of CPU model listing, Eduardo Habkost, 2018/06/25
- [Qemu-devel] [PULL 03/12] i386: improve sorting of CPU model names, Eduardo Habkost, 2018/06/25
- [Qemu-devel] [PULL 04/12] i386: display known CPUID features linewrapped, in alphabetical order, Eduardo Habkost, 2018/06/25
- [Qemu-devel] [PULL 05/12] i386: Remove osxsave CPUID flag name, Eduardo Habkost, 2018/06/25
- [Qemu-devel] [PULL 06/12] i386: Remove ospke CPUID flag name, Eduardo Habkost, 2018/06/25
- [Qemu-devel] [PULL 07/12] i386: define the AMD 'amd-ssbd' CPUID feature bit, Eduardo Habkost, 2018/06/25
- [Qemu-devel] [PULL 08/12] i386: Define AMD's no SSB mitigation needed., Eduardo Habkost, 2018/06/25
- [Qemu-devel] [PULL 09/12] i386: Allow TOPOEXT to be enabled on older kernels, Eduardo Habkost, 2018/06/25
- [Qemu-devel] [PULL 10/12] i386: Fix up the Node id for CPUID_8000_001E, Eduardo Habkost, 2018/06/25
- [Qemu-devel] [PULL 11/12] i386: Enable TOPOEXT feature on AMD EPYC CPU,
Eduardo Habkost <=
- [Qemu-devel] [PULL 12/12] i386: Remove generic SMT thread check, Eduardo Habkost, 2018/06/25
- Re: [Qemu-devel] [PULL 00/12] x86 queue, 2018-06-25, Peter Maydell, 2018/06/26