aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/kernel/reloc_32.S
diff options
context:
space:
mode:
authorKevin Hao <haokexin@gmail.com>2013-06-27 09:09:43 +0800
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2013-07-01 11:10:34 +1000
commit348c2298a6fd2b145e789739808d5e7598e275fc (patch)
tree987f8ab221d1a3172212605b4f17dc4e8da7485d /arch/powerpc/kernel/reloc_32.S
parentpowerpc/windfarm: Fix overtemperature clearing (diff)
downloadlinux-dev-348c2298a6fd2b145e789739808d5e7598e275fc.tar.xz
linux-dev-348c2298a6fd2b145e789739808d5e7598e275fc.zip
powerpc: Don't flush/invalidate the d/icache for an unknown relocation type
For an unknown relocation type since the value of r4 is just the 8bit relocation type, the sum of r4 and r7 may yield an invalid memory address. For example: In normal case: r4 = c00xxxxx r7 = 40000000 r4 + r7 = 000xxxxx For an unknown relocation type: r4 = 000000xx r7 = 40000000 r4 + r7 = 400000xx 400000xx is an invalid memory address for a board which has just 512M memory. And for operations such as dcbst or icbi may cause bus error for an invalid memory address on some platforms and then cause the board reset. So we should skip the flush/invalidate the d/icache for an unknown relocation type. Signed-off-by: Kevin Hao <haokexin@gmail.com> Acked-by: Suzuki K. Poulose <suzuki@in.ibm.com> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/kernel/reloc_32.S')
-rw-r--r--arch/powerpc/kernel/reloc_32.S3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/reloc_32.S b/arch/powerpc/kernel/reloc_32.S
index ef46ba6e094f..f366fedb0872 100644
--- a/arch/powerpc/kernel/reloc_32.S
+++ b/arch/powerpc/kernel/reloc_32.S
@@ -166,7 +166,7 @@ ha16:
/* R_PPC_ADDR16_LO */
lo16:
cmpwi r4, R_PPC_ADDR16_LO
- bne nxtrela
+ bne unknown_type
lwz r4, 0(r9) /* r_offset */
lwz r0, 8(r9) /* r_addend */
add r0, r0, r3
@@ -191,6 +191,7 @@ nxtrela:
dcbst r4,r7
sync /* Ensure the data is flushed before icbi */
icbi r4,r7
+unknown_type:
cmpwi r8, 0 /* relasz = 0 ? */
ble done
add r9, r9, r6 /* move to next entry in the .rela table */