openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

target-i386: emulate CPUID level of real hardware 

W10 insider has a bug where it ignores CPUID level and interprets
CPUID.(EAX=07H, ECX=0H) incorrectly, because CPUID in fact returned
CPUID.(EAX=04H, ECX=0H);  this resulted in execution of unsupported
instructions.

While it's a Windows bug, there is no reason to emulate incorrect level.

I used http://instlatx64.atw.hu/ as a source of CPUID and checked that
it matches Penryn Xeon X5472, Westmere Xeon W3520, SandyBridge i5-2540M,
and Haswell i5-4670T.

kvm64 and qemu64 were bumped to 0xD to allow all available features for
them (and to avoid the same Windows bug).

Signed-off-by: Radim Krčmář <rkrcmar@redhat.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
This commit is contained in:
Radim Krčmář 2015-07-09 21:07:39 +02:00 committed by Eduardo Habkost
parent d461a44ca4
commit 3046bb5deb
2 changed files with 86 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
include/hw/i386/pc.h
View File

@ -298,6 +298,74 @@ bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *);
.driver = TYPE_X86_CPU,\ .driver = TYPE_X86_CPU,\
.property = "arat",\ .property = "arat",\
.value = "off",\ .value = "off",\
},{\
.driver = "qemu64" "-" TYPE_X86_CPU,\
.property = "level",\
.value = stringify(4),\
},{\
.driver = "kvm64" "-" TYPE_X86_CPU,\
.property = "level",\
.value = stringify(5),\
},{\
.driver = "pentium3" "-" TYPE_X86_CPU,\
.property = "level",\
.value = stringify(2),\
},{\
.driver = "n270" "-" TYPE_X86_CPU,\
.property = "level",\
.value = stringify(5),\
},{\
.driver = "Conroe" "-" TYPE_X86_CPU,\
.property = "level",\
.value = stringify(4),\
},{\
.driver = "Penryn" "-" TYPE_X86_CPU,\
.property = "level",\
.value = stringify(4),\
},{\
.driver = "Nehalem" "-" TYPE_X86_CPU,\
.property = "level",\
.value = stringify(4),\
},{\
.driver = "n270" "-" TYPE_X86_CPU,\
.property = "xlevel",\
.value = stringify(0x8000000a),\
},{\
.driver = "Penryn" "-" TYPE_X86_CPU,\
.property = "xlevel",\
.value = stringify(0x8000000a),\
},{\
.driver = "Conroe" "-" TYPE_X86_CPU,\
.property = "xlevel",\
.value = stringify(0x8000000a),\
},{\
.driver = "Nehalem" "-" TYPE_X86_CPU,\
.property = "xlevel",\
.value = stringify(0x8000000a),\
},{\
.driver = "Westmere" "-" TYPE_X86_CPU,\
.property = "xlevel",\
.value = stringify(0x8000000a),\
},{\
.driver = "SandyBridge" "-" TYPE_X86_CPU,\
.property = "xlevel",\
.value = stringify(0x8000000a),\
},{\
.driver = "Haswell" "-" TYPE_X86_CPU,\
.property = "xlevel",\
.value = stringify(0x8000000a),\
},{\
.driver = "Haswell-noTSX" "-" TYPE_X86_CPU,\
.property = "xlevel",\
.value = stringify(0x8000000a),\
},{\
.driver = "Broadwell" "-" TYPE_X86_CPU,\
.property = "xlevel",\
.value = stringify(0x8000000a),\
},{\
.driver = "Broadwell-noTSX" "-" TYPE_X86_CPU,\
.property = "xlevel",\
.value = stringify(0x8000000a),\
}, },
#define PC_COMPAT_2_2 \ #define PC_COMPAT_2_2 \

37
target-i386/cpu.c
View File

@ -695,7 +695,7 @@ struct X86CPUDefinition {
static X86CPUDefinition builtin_x86_defs[] = { static X86CPUDefinition builtin_x86_defs[] = {
{ {
.name = "qemu64", .name = "qemu64",
.level = 4, .level = 0xd,
.vendor = CPUID_VENDOR_AMD, .vendor = CPUID_VENDOR_AMD,
.family = 6, .family = 6,
.model = 6, .model = 6,
@ -771,7 +771,7 @@ static X86CPUDefinition builtin_x86_defs[] = {
}, },
{ {
.name = "kvm64", .name = "kvm64",
.level = 5, .level = 0xd,
.vendor = CPUID_VENDOR_INTEL, .vendor = CPUID_VENDOR_INTEL,
.family = 15, .family = 15,
.model = 6, .model = 6,
@ -882,7 +882,7 @@ static X86CPUDefinition builtin_x86_defs[] = {
}, },
{ {
.name = "pentium3", .name = "pentium3",
.level = 2, .level = 3,
.vendor = CPUID_VENDOR_INTEL, .vendor = CPUID_VENDOR_INTEL,
.family = 6, .family = 6,
.model = 7, .model = 7,
@ -907,8 +907,7 @@ static X86CPUDefinition builtin_x86_defs[] = {
}, },
{ {
.name = "n270", .name = "n270",
/* original is on level 10 */ .level = 10,
.level = 5,
.vendor = CPUID_VENDOR_INTEL, .vendor = CPUID_VENDOR_INTEL,
.family = 6, .family = 6,
.model = 28, .model = 28,
@ -928,12 +927,12 @@ static X86CPUDefinition builtin_x86_defs[] = {
CPUID_EXT2_NX, CPUID_EXT2_NX,
.features[FEAT_8000_0001_ECX] = .features[FEAT_8000_0001_ECX] =
CPUID_EXT3_LAHF_LM, CPUID_EXT3_LAHF_LM,
.xlevel = 0x8000000A, .xlevel = 0x80000008,
.model_id = "Intel(R) Atom(TM) CPU N270 @ 1.60GHz", .model_id = "Intel(R) Atom(TM) CPU N270 @ 1.60GHz",
}, },
{ {
.name = "Conroe", .name = "Conroe",
.level = 4, .level = 10,
.vendor = CPUID_VENDOR_INTEL, .vendor = CPUID_VENDOR_INTEL,
.family = 6, .family = 6,
.model = 15, .model = 15,
@ -950,12 +949,12 @@ static X86CPUDefinition builtin_x86_defs[] = {
CPUID_EXT2_LM | CPUID_EXT2_NX | CPUID_EXT2_SYSCALL, CPUID_EXT2_LM | CPUID_EXT2_NX | CPUID_EXT2_SYSCALL,
.features[FEAT_8000_0001_ECX] = .features[FEAT_8000_0001_ECX] =
CPUID_EXT3_LAHF_LM, CPUID_EXT3_LAHF_LM,
.xlevel = 0x8000000A, .xlevel = 0x80000008,
.model_id = "Intel Celeron_4x0 (Conroe/Merom Class Core 2)", .model_id = "Intel Celeron_4x0 (Conroe/Merom Class Core 2)",
}, },
{ {
.name = "Penryn", .name = "Penryn",
.level = 4, .level = 10,
.vendor = CPUID_VENDOR_INTEL, .vendor = CPUID_VENDOR_INTEL,
.family = 6, .family = 6,
.model = 23, .model = 23,
@ -973,12 +972,12 @@ static X86CPUDefinition builtin_x86_defs[] = {
CPUID_EXT2_LM | CPUID_EXT2_NX | CPUID_EXT2_SYSCALL, CPUID_EXT2_LM | CPUID_EXT2_NX | CPUID_EXT2_SYSCALL,
.features[FEAT_8000_0001_ECX] = .features[FEAT_8000_0001_ECX] =
CPUID_EXT3_LAHF_LM, CPUID_EXT3_LAHF_LM,
.xlevel = 0x8000000A, .xlevel = 0x80000008,
.model_id = "Intel Core 2 Duo P9xxx (Penryn Class Core 2)", .model_id = "Intel Core 2 Duo P9xxx (Penryn Class Core 2)",
}, },
{ {
.name = "Nehalem", .name = "Nehalem",
.level = 4, .level = 11,
.vendor = CPUID_VENDOR_INTEL, .vendor = CPUID_VENDOR_INTEL,
.family = 6, .family = 6,
.model = 26, .model = 26,
@ -996,7 +995,7 @@ static X86CPUDefinition builtin_x86_defs[] = {
CPUID_EXT2_LM | CPUID_EXT2_SYSCALL | CPUID_EXT2_NX, CPUID_EXT2_LM | CPUID_EXT2_SYSCALL | CPUID_EXT2_NX,
.features[FEAT_8000_0001_ECX] = .features[FEAT_8000_0001_ECX] =
CPUID_EXT3_LAHF_LM, CPUID_EXT3_LAHF_LM,
.xlevel = 0x8000000A, .xlevel = 0x80000008,
.model_id = "Intel Core i7 9xx (Nehalem Class Core i7)", .model_id = "Intel Core i7 9xx (Nehalem Class Core i7)",
}, },
{ {
@ -1022,7 +1021,7 @@ static X86CPUDefinition builtin_x86_defs[] = {
CPUID_EXT3_LAHF_LM, CPUID_EXT3_LAHF_LM,
.features[FEAT_6_EAX] = .features[FEAT_6_EAX] =
CPUID_6_EAX_ARAT, CPUID_6_EAX_ARAT,
.xlevel = 0x8000000A, .xlevel = 0x80000008,
.model_id = "Westmere E56xx/L56xx/X56xx (Nehalem-C)", .model_id = "Westmere E56xx/L56xx/X56xx (Nehalem-C)",
}, },
{ {
@ -1053,7 +1052,7 @@ static X86CPUDefinition builtin_x86_defs[] = {
CPUID_XSAVE_XSAVEOPT, CPUID_XSAVE_XSAVEOPT,
.features[FEAT_6_EAX] = .features[FEAT_6_EAX] =
CPUID_6_EAX_ARAT, CPUID_6_EAX_ARAT,
.xlevel = 0x8000000A, .xlevel = 0x80000008,
.model_id = "Intel Xeon E312xx (Sandy Bridge)", .model_id = "Intel Xeon E312xx (Sandy Bridge)",
}, },
{ {
@ -1087,7 +1086,7 @@ static X86CPUDefinition builtin_x86_defs[] = {
CPUID_XSAVE_XSAVEOPT, CPUID_XSAVE_XSAVEOPT,
.features[FEAT_6_EAX] = .features[FEAT_6_EAX] =
CPUID_6_EAX_ARAT, CPUID_6_EAX_ARAT,
.xlevel = 0x8000000A, .xlevel = 0x80000008,
.model_id = "Intel Xeon E3-12xx v2 (Ivy Bridge)", .model_id = "Intel Xeon E3-12xx v2 (Ivy Bridge)",
}, },
{ {
@ -1123,7 +1122,7 @@ static X86CPUDefinition builtin_x86_defs[] = {
CPUID_XSAVE_XSAVEOPT, CPUID_XSAVE_XSAVEOPT,
.features[FEAT_6_EAX] = .features[FEAT_6_EAX] =
CPUID_6_EAX_ARAT, CPUID_6_EAX_ARAT,
.xlevel = 0x8000000A, .xlevel = 0x80000008,
.model_id = "Intel Core Processor (Haswell, no TSX)", .model_id = "Intel Core Processor (Haswell, no TSX)",
}, { }, {
.name = "Haswell", .name = "Haswell",
@ -1159,7 +1158,7 @@ static X86CPUDefinition builtin_x86_defs[] = {
CPUID_XSAVE_XSAVEOPT, CPUID_XSAVE_XSAVEOPT,
.features[FEAT_6_EAX] = .features[FEAT_6_EAX] =
CPUID_6_EAX_ARAT, CPUID_6_EAX_ARAT,
.xlevel = 0x8000000A, .xlevel = 0x80000008,
.model_id = "Intel Core Processor (Haswell)", .model_id = "Intel Core Processor (Haswell)",
}, },
{ {
@ -1197,7 +1196,7 @@ static X86CPUDefinition builtin_x86_defs[] = {
CPUID_XSAVE_XSAVEOPT, CPUID_XSAVE_XSAVEOPT,
.features[FEAT_6_EAX] = .features[FEAT_6_EAX] =
CPUID_6_EAX_ARAT, CPUID_6_EAX_ARAT,
.xlevel = 0x8000000A, .xlevel = 0x80000008,
.model_id = "Intel Core Processor (Broadwell, no TSX)", .model_id = "Intel Core Processor (Broadwell, no TSX)",
}, },
{ {
@ -1235,7 +1234,7 @@ static X86CPUDefinition builtin_x86_defs[] = {
CPUID_XSAVE_XSAVEOPT, CPUID_XSAVE_XSAVEOPT,
.features[FEAT_6_EAX] = .features[FEAT_6_EAX] =
CPUID_6_EAX_ARAT, CPUID_6_EAX_ARAT,
.xlevel = 0x8000000A, .xlevel = 0x80000008,
.model_id = "Intel Core Processor (Broadwell)", .model_id = "Intel Core Processor (Broadwell)",
}, },
{ {