1 files changed, 23 insertions, 0 deletions

diff --git a/target-arm/cpu.c b/target-arm/cpu.c
index dc1de5395c..cfe4cd6512 100644
--- a/target-arm/cpu.c
+++ b/target-arm/cpu.c
@@ -48,6 +48,7 @@ static void arm_cpu_reset(CPUState *c)
     env->vfp.xregs[ARM_VFP_FPSID] = cpu->reset_fpsid;
     env->vfp.xregs[ARM_VFP_MVFR0] = cpu->mvfr0;
     env->vfp.xregs[ARM_VFP_MVFR1] = cpu->mvfr1;
+    env->cp15.c0_cachetype = cpu->ctr;
 
 #if defined(CONFIG_USER_ONLY)
     env->uncached_cpsr = ARM_CPU_MODE_USR;
@@ -171,6 +172,7 @@ static void arm926_initfn(Object *obj)
     set_feature(&cpu->env, ARM_FEATURE_VFP);
     cpu->env.cp15.c0_cpuid = 0x41069265;
     cpu->reset_fpsid = 0x41011090;
+    cpu->ctr = 0x1dd20d2;
     arm_cpu_postconfig_init(cpu);
 }
 
@@ -180,6 +182,7 @@ static void arm946_initfn(Object *obj)
     set_feature(&cpu->env, ARM_FEATURE_V5);
     set_feature(&cpu->env, ARM_FEATURE_MPU);
     cpu->env.cp15.c0_cpuid = 0x41059461;
+    cpu->ctr = 0x0f004006;
     arm_cpu_postconfig_init(cpu);
 }
 
@@ -191,6 +194,7 @@ static void arm1026_initfn(Object *obj)
     set_feature(&cpu->env, ARM_FEATURE_AUXCR);
     cpu->env.cp15.c0_cpuid = 0x4106a262;
     cpu->reset_fpsid = 0x410110a0;
+    cpu->ctr = 0x1dd20d2;
     arm_cpu_postconfig_init(cpu);
 }
 
@@ -203,6 +207,7 @@ static void arm1136_r2_initfn(Object *obj)
     cpu->reset_fpsid = 0x410120b4;
     cpu->mvfr0 = 0x11111111;
     cpu->mvfr1 = 0x00000000;
+    cpu->ctr = 0x1dd20d2;
     arm_cpu_postconfig_init(cpu);
 }
 
@@ -216,6 +221,7 @@ static void arm1136_initfn(Object *obj)
     cpu->reset_fpsid = 0x410120b4;
     cpu->mvfr0 = 0x11111111;
     cpu->mvfr1 = 0x00000000;
+    cpu->ctr = 0x1dd20d2;
     arm_cpu_postconfig_init(cpu);
 }
 
@@ -229,6 +235,7 @@ static void arm1176_initfn(Object *obj)
     cpu->reset_fpsid = 0x410120b5;
     cpu->mvfr0 = 0x11111111;
     cpu->mvfr1 = 0x00000000;
+    cpu->ctr = 0x1dd20d2;
     arm_cpu_postconfig_init(cpu);
 }
 
@@ -242,6 +249,7 @@ static void arm11mpcore_initfn(Object *obj)
     cpu->reset_fpsid = 0x410120b4;
     cpu->mvfr0 = 0x11111111;
     cpu->mvfr1 = 0x00000000;
+    cpu->ctr = 0x1dd20d2;
     arm_cpu_postconfig_init(cpu);
 }
 
@@ -265,6 +273,7 @@ static void cortex_a8_initfn(Object *obj)
     cpu->reset_fpsid = 0x410330c0;
     cpu->mvfr0 = 0x11110222;
     cpu->mvfr1 = 0x00011100;
+    cpu->ctr = 0x82048004;
     arm_cpu_postconfig_init(cpu);
 }
 
@@ -285,6 +294,7 @@ static void cortex_a9_initfn(Object *obj)
     cpu->reset_fpsid = 0x41033090;
     cpu->mvfr0 = 0x11110222;
     cpu->mvfr1 = 0x01111111;
+    cpu->ctr = 0x80038003;
     arm_cpu_postconfig_init(cpu);
 }
 
@@ -303,6 +313,7 @@ static void cortex_a15_initfn(Object *obj)
     cpu->reset_fpsid = 0x410430f0;
     cpu->mvfr0 = 0x10110222;
     cpu->mvfr1 = 0x11111111;
+    cpu->ctr = 0x8444c004;
     arm_cpu_postconfig_init(cpu);
 }
 
@@ -312,6 +323,7 @@ static void ti925t_initfn(Object *obj)
     set_feature(&cpu->env, ARM_FEATURE_V4T);
     set_feature(&cpu->env, ARM_FEATURE_OMAPCP);
     cpu->env.cp15.c0_cpuid = 0x41069265;
+    cpu->ctr = 0x5109149;
     arm_cpu_postconfig_init(cpu);
 }
 
@@ -337,6 +349,7 @@ static void pxa250_initfn(Object *obj)
     set_feature(&cpu->env, ARM_FEATURE_V5);
     set_feature(&cpu->env, ARM_FEATURE_XSCALE);
     cpu->env.cp15.c0_cpuid = 0x69052100;
+    cpu->ctr = 0xd172172;
     arm_cpu_postconfig_init(cpu);
 }
 
@@ -346,6 +359,7 @@ static void pxa255_initfn(Object *obj)
     set_feature(&cpu->env, ARM_FEATURE_V5);
     set_feature(&cpu->env, ARM_FEATURE_XSCALE);
     cpu->env.cp15.c0_cpuid = 0x69052d00;
+    cpu->ctr = 0xd172172;
     arm_cpu_postconfig_init(cpu);
 }
 
@@ -355,6 +369,7 @@ static void pxa260_initfn(Object *obj)
     set_feature(&cpu->env, ARM_FEATURE_V5);
     set_feature(&cpu->env, ARM_FEATURE_XSCALE);
     cpu->env.cp15.c0_cpuid = 0x69052903;
+    cpu->ctr = 0xd172172;
     arm_cpu_postconfig_init(cpu);
 }
 
@@ -364,6 +379,7 @@ static void pxa261_initfn(Object *obj)
     set_feature(&cpu->env, ARM_FEATURE_V5);
     set_feature(&cpu->env, ARM_FEATURE_XSCALE);
     cpu->env.cp15.c0_cpuid = 0x69052d05;
+    cpu->ctr = 0xd172172;
     arm_cpu_postconfig_init(cpu);
 }
 
@@ -373,6 +389,7 @@ static void pxa262_initfn(Object *obj)
     set_feature(&cpu->env, ARM_FEATURE_V5);
     set_feature(&cpu->env, ARM_FEATURE_XSCALE);
     cpu->env.cp15.c0_cpuid = 0x69052d06;
+    cpu->ctr = 0xd172172;
     arm_cpu_postconfig_init(cpu);
 }
 
@@ -383,6 +400,7 @@ static void pxa270a0_initfn(Object *obj)
     set_feature(&cpu->env, ARM_FEATURE_XSCALE);
     set_feature(&cpu->env, ARM_FEATURE_IWMMXT);
     cpu->env.cp15.c0_cpuid = 0x69054110;
+    cpu->ctr = 0xd172172;
     arm_cpu_postconfig_init(cpu);
 }
 
@@ -393,6 +411,7 @@ static void pxa270a1_initfn(Object *obj)
     set_feature(&cpu->env, ARM_FEATURE_XSCALE);
     set_feature(&cpu->env, ARM_FEATURE_IWMMXT);
     cpu->env.cp15.c0_cpuid = 0x69054111;
+    cpu->ctr = 0xd172172;
     arm_cpu_postconfig_init(cpu);
 }
 
@@ -403,6 +422,7 @@ static void pxa270b0_initfn(Object *obj)
     set_feature(&cpu->env, ARM_FEATURE_XSCALE);
     set_feature(&cpu->env, ARM_FEATURE_IWMMXT);
     cpu->env.cp15.c0_cpuid = 0x69054112;
+    cpu->ctr = 0xd172172;
     arm_cpu_postconfig_init(cpu);
 }
 
@@ -413,6 +433,7 @@ static void pxa270b1_initfn(Object *obj)
     set_feature(&cpu->env, ARM_FEATURE_XSCALE);
     set_feature(&cpu->env, ARM_FEATURE_IWMMXT);
     cpu->env.cp15.c0_cpuid = 0x69054113;
+    cpu->ctr = 0xd172172;
     arm_cpu_postconfig_init(cpu);
 }
 
@@ -423,6 +444,7 @@ static void pxa270c0_initfn(Object *obj)
     set_feature(&cpu->env, ARM_FEATURE_XSCALE);
     set_feature(&cpu->env, ARM_FEATURE_IWMMXT);
     cpu->env.cp15.c0_cpuid = 0x69054114;
+    cpu->ctr = 0xd172172;
     arm_cpu_postconfig_init(cpu);
 }
 
@@ -437,6 +459,7 @@ static void pxa270c5_initfn(Object *obj)
     set_feature(&cpu->env, ARM_FEATURE_ARM_DIV);
     set_feature(&cpu->env, ARM_FEATURE_V7MP);
     cpu->env.cp15.c0_cpuid = 0x69054117;
+    cpu->ctr = 0xd172172;
     arm_cpu_postconfig_init(cpu);
 }