summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeoff Levand <geoffrey.levand@am.sony.com>2008-02-08 23:52:48 +0100
committerPaul Mackerras <paulus@samba.org>2008-02-14 12:11:01 +0100
commite5a21dd87312b842fe1cc23cbca8e28d69fe055b (patch)
tree88e569cb9178fd88f988ecf25e85585dff3e2748
parent[POWERPC] PS3: Fix reading pm interval in logical performance monitor (diff)
downloadlinux-e5a21dd87312b842fe1cc23cbca8e28d69fe055b.tar.xz
linux-e5a21dd87312b842fe1cc23cbca8e28d69fe055b.zip
[POWERPC] PS3: Fix bootwrapper hang bug
Fix a bug in the lv1_get_repository_node_value() routine of the PS3 bootwrapper. Changes in the PS3 system firmware 2.20 cause this bug to hang the system when branching from the bootwrapper to the kernel _start. Since the video system has not yet been enabled at the time the bug is hit, the system hangs with a blank screen. Earlier firmwares don't cause such a catastrophic failure, and so this bug went undetected. Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
-rw-r--r--arch/powerpc/boot/ps3-hvcall.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/boot/ps3-hvcall.S b/arch/powerpc/boot/ps3-hvcall.S
index 585965f7e6a8..d6068f1829ca 100644
--- a/arch/powerpc/boot/ps3-hvcall.S
+++ b/arch/powerpc/boot/ps3-hvcall.S
@@ -145,7 +145,7 @@
.macro STORE_REGS_5_2
lwz r11, 16(r1)
std r4, 0(r11)
- lwz r11, 24(r1)
+ lwz r11, 20(r1)
std r5, 0(r11)
.endm