[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 6/6] target-i386: Enable CPUID[0x8000000A] if SVM
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PATCH v2 6/6] target-i386: Enable CPUID[0x8000000A] if SVM is enabled |
Date: |
Thu, 22 Sep 2016 11:53:49 -0300 |
SVM needs CPUID[0x8000000A] to be available. So if SVM is enabled
in a CPU model or explicitly in the command-line, adjust CPUID
xlevel to expose the CPUID[0x8000000A] leaf.
Signed-off-by: Eduardo Habkost <address@hidden>
---
Changes v1 -> v2:
* Coding style changes (split long lines)
* Refresh after cpuid_max_xlevel field was removed
and full_cpuid_auto_level field was added
---
target-i386/cpu.c | 4 ++++
tests/test-x86-cpuid-compat.c | 15 ++++++++++-----
2 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/target-i386/cpu.c b/target-i386/cpu.c
index 24893d2..7a5da99 100644
--- a/target-i386/cpu.c
+++ b/target-i386/cpu.c
@@ -3047,6 +3047,10 @@ static void x86_cpu_realizefn(DeviceState *dev, Error
**errp)
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);
+ /* SVM requires CPUID[0x8000000A] */
+ if (env->features[FEAT_8000_0001_ECX] & CPUID_EXT3_SVM) {
+ x86_cpu_adjust_level(cpu, &env->cpuid_min_xlevel, 0x8000000A);
+ }
}
/* Set cpuid_*level* based on cpuid_min_*level, if not explicitly set */
diff --git a/tests/test-x86-cpuid-compat.c b/tests/test-x86-cpuid-compat.c
index 83f1c80..83162a4 100644
--- a/tests/test-x86-cpuid-compat.c
+++ b/tests/test-x86-cpuid-compat.c
@@ -83,6 +83,8 @@ int main(int argc, char **argv)
"-cpu core2duo", "xlevel", 0x80000008);
add_cpuid_test("x86/cpuid/phenom/xlevel",
"-cpu phenom", "xlevel", 0x8000001A);
+ add_cpuid_test("x86/cpuid/athlon/xlevel",
+ "-cpu athlon", "xlevel", 0x80000008);
/* If level is not large enough, it should increase automatically: */
/* CPUID[6].EAX: */
@@ -112,6 +114,9 @@ int main(int argc, char **argv)
/* CPUID[C000_0001].EDX: */
add_cpuid_test("x86/cpuid/auto-xlevel2/phenom/xstore",
"-cpu phenom,+xstore", "xlevel2", 0xC0000001);
+ /* SVM needs CPUID[0x8000000A] */
+ add_cpuid_test("x86/cpuid/auto-xlevel/athlon/svm",
+ "-cpu athlon,+svm", "xlevel", 0x8000000A);
/* If level is already large enough, it shouldn't change: */
@@ -131,17 +136,17 @@ int main(int argc, char **argv)
/* if xlevel is already large enough, it shouldn't change: */
add_cpuid_test("x86/cpuid/auto-xlevel/phenom/3dnow",
- "-cpu phenom,+3dnow,+sse4a,+invtsc,+npt",
+ "-cpu phenom,+3dnow,+sse4a,+invtsc,+npt,+svm",
"xlevel", 0x8000001A);
/* If xlevel is explicitly set, it shouldn't change: */
add_cpuid_test("x86/cpuid/auto-xlevel/486/fixed/80000002",
- "-cpu 486,xlevel=0x80000002,+3dnow,+sse4a,+invtsc,+npt",
+ "-cpu
486,xlevel=0x80000002,+3dnow,+sse4a,+invtsc,+npt,+svm",
"xlevel", 0x80000002);
add_cpuid_test("x86/cpuid/auto-xlevel/486/fixed/8000001A",
- "-cpu 486,xlevel=0x8000001A,+3dnow,+sse4a,+invtsc,+npt",
+ "-cpu
486,xlevel=0x8000001A,+3dnow,+sse4a,+invtsc,+npt,+svm",
"xlevel", 0x8000001A);
add_cpuid_test("x86/cpuid/auto-xlevel/phenom/fixed/0",
- "-cpu 486,xlevel=0,+3dnow,+sse4a,+invtsc,+npt",
+ "-cpu 486,xlevel=0,+3dnow,+sse4a,+invtsc,+npt,+svm",
"xlevel", 0);
/* if xlevel2 is already large enough, it shouldn't change: */
@@ -156,7 +161,7 @@ int main(int argc, char **argv)
"-machine pc-i440fx-2.7 -cpu
486,+arat,+avx512vbmi,+xsaveopt",
"level", 1);
add_cpuid_test("x86/cpuid/auto-xlevel/pc-2.7",
- "-machine pc-i440fx-2.7 -cpu
486,+3dnow,+sse4a,+invtsc,+npt",
+ "-machine pc-i440fx-2.7 -cpu
486,+3dnow,+sse4a,+invtsc,+npt,+svm",
"xlevel", 0);
add_cpuid_test("x86/cpuid/auto-xlevel2/pc-2.7",
"-machine pc-i440fx-2.7 -cpu 486,+xstore",
--
2.7.4
- [Qemu-devel] [PATCH v2 0/6] target-i386: Increase CPUID level/xlevel/xlevel2 automatically, Eduardo Habkost, 2016/09/22
- [Qemu-devel] [PATCH v2 2/6] target-i386: Add a marker to end of the region zeroed on reset, Eduardo Habkost, 2016/09/22
- [Qemu-devel] [PATCH v2 1/6] target-i386: Remove unused X86CPUDefinition::xlevel2 field, Eduardo Habkost, 2016/09/22
- [Qemu-devel] [PATCH v2 4/6] tests: Test CPUID level handling for old machines, Eduardo Habkost, 2016/09/22
- [Qemu-devel] [PATCH v2 3/6] tests: Add test code for CPUID level/xlevel handling, Eduardo Habkost, 2016/09/22
- [Qemu-devel] [PATCH v2 6/6] target-i386: Enable CPUID[0x8000000A] if SVM is enabled,
Eduardo Habkost <=
- [Qemu-devel] [PATCH v2 5/6] target-i386: Automatically set level/xlevel/xlevel2 when needed, Eduardo Habkost, 2016/09/22
- Re: [Qemu-devel] [PATCH v2 0/6] target-i386: Increase CPUID level/xlevel/xlevel2 automatically, Richard Henderson, 2016/09/22
- Re: [Qemu-devel] [PATCH v2 0/6] target-i386: Increase CPUID level/xlevel/xlevel2 automatically, Eduardo Habkost, 2016/09/27