summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Larson2016-06-24 00:35:17 +0200
committerDavid Gibson2016-06-27 05:12:22 +0200
commit6d18a7a1ff9665ad48a68a692fdf0a61edefcae8 (patch)
tree8c3c5e8121063dd59b68b44d84c948338ab77f50
parentMerge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging (diff)
downloadqemu-6d18a7a1ff9665ad48a68a692fdf0a61edefcae8.tar.gz
qemu-6d18a7a1ff9665ad48a68a692fdf0a61edefcae8.tar.xz
qemu-6d18a7a1ff9665ad48a68a692fdf0a61edefcae8.zip
target-ppc: ppce500_spin.c uses SPR_PIR, should use SPR_BOOKE_PIR
ppce500_spin.c uses SPR_PIR to initialize the spin table, however on Book E processors the correct SPR is SPR_BOOKE_PIR. Signed-off-by: Aaron Larson <alarson@ddci.com> Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
-rw-r--r--hw/ppc/ppce500_spin.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/ppc/ppce500_spin.c b/hw/ppc/ppce500_spin.c
index 76bd78bfd7..225177b5af 100644
--- a/hw/ppc/ppce500_spin.c
+++ b/hw/ppc/ppce500_spin.c
@@ -104,7 +104,7 @@ static void spin_kick(void *data)
hwaddr map_start;
cpu_synchronize_state(cpu);
- stl_p(&curspin->pir, env->spr[SPR_PIR]);
+ stl_p(&curspin->pir, env->spr[SPR_BOOKE_PIR]);
env->nip = ldq_p(&curspin->addr) & (map_size - 1);
env->gpr[3] = ldq_p(&curspin->r3);
env->gpr[4] = 0;