david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

x86: Properly reset PAT MSR

Browse Source 
Conforming to the Intel spec, set the power-on value of PAT also on
reset, but save it across INIT.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
This commit is contained in:
Jan Kiszka 2011-03-15 12:26:21 +01:00 committed by Marcelo Tosatti
parent d841b6c4f1
commit ebda377f8c
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
target-i386/cpu.h
View File

@ -685,8 +685,6 @@ typedef struct CPUX86State {
uint64_t tsc; uint64_t tsc;
uint64_t pat;
uint64_t mcg_status; uint64_t mcg_status;
/* exception/interrupt handling */ /* exception/interrupt handling */
@ -707,6 +705,8 @@ typedef struct CPUX86State {
CPU_COMMON CPU_COMMON
uint64_t pat;
/* processor features (e.g. for CPUID insn) */ /* processor features (e.g. for CPUID insn) */
uint32_t cpuid_level; uint32_t cpuid_level;
uint32_t cpuid_vendor1; uint32_t cpuid_vendor1;

1
target-i386/cpuid.c
View File

@ -847,7 +847,6 @@ int cpu_x86_register (CPUX86State *env, const char *cpu_model)
env->cpuid_version |= ((def->model & 0xf) << 4) | ((def->model >> 4) << 16); env->cpuid_version |= ((def->model & 0xf) << 4) | ((def->model >> 4) << 16);
env->cpuid_version |= def->stepping; env->cpuid_version |= def->stepping;
env->cpuid_features = def->features; env->cpuid_features = def->features;
env->pat = 0x0007040600070406ULL;
env->cpuid_ext_features = def->ext_features; env->cpuid_ext_features = def->ext_features;
env->cpuid_ext2_features = def->ext2_features; env->cpuid_ext2_features = def->ext2_features;
env->cpuid_ext3_features = def->ext3_features; env->cpuid_ext3_features = def->ext3_features;

5
target-i386/helper.c
View File

@ -99,6 +99,8 @@ void cpu_reset(CPUX86State *env)
env->mxcsr = 0x1f80; env->mxcsr = 0x1f80;
env->pat = 0x0007040600070406ULL;
memset(env->dr, 0, sizeof(env->dr)); memset(env->dr, 0, sizeof(env->dr));
env->dr[6] = DR6_FIXED_1; env->dr[6] = DR6_FIXED_1;
env->dr[7] = DR7_FIXED_1; env->dr[7] = DR7_FIXED_1;
@ -1280,8 +1282,11 @@ CPUX86State *cpu_x86_init(const char *cpu_model)
void do_cpu_init(CPUState *env) void do_cpu_init(CPUState *env)
{ {
int sipi = env->interrupt_request & CPU_INTERRUPT_SIPI; int sipi = env->interrupt_request & CPU_INTERRUPT_SIPI;
uint64_t pat = env->pat;
cpu_reset(env); cpu_reset(env);
env->interrupt_request = sipi; env->interrupt_request = sipi;
env->pat = pat;
apic_init_reset(env->apic_state); apic_init_reset(env->apic_state);
env->halted = !cpu_is_bsp(env); env->halted = !cpu_is_bsp(env);
} }