aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/kernel/head_32.h
diff options
context:
space:
mode:
authorChristophe Leroy <christophe.leroy@csgroup.eu>2020-11-08 16:57:37 +0000
committerMichael Ellerman <mpe@ellerman.id.au>2020-11-19 16:56:55 +1100
commit62182e6c0faf75117f8d1719c118bb5fc8574012 (patch)
tree99ff8165f1d6a1f11712188bea342a7794784a36 /arch/powerpc/kernel/head_32.h
parentpowerpc: Replace RFI by rfi on book3s/32 and booke (diff)
downloadlinux-dev-62182e6c0faf75117f8d1719c118bb5fc8574012.tar.xz
linux-dev-62182e6c0faf75117f8d1719c118bb5fc8574012.zip
powerpc: Remove RFI macro
RFI macro is just there to add an infinite loop past rfi in order to avoid prefetch on 40x in half a dozen of places in entry_32 and head_32. Those places are already full of #ifdefs, so just add a few more to explicitely show those loops and remove RFI. Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Link: https://lore.kernel.org/r/f7e9cb9e9240feec63cb330abf40b67d1aad852f.1604854583.git.christophe.leroy@csgroup.eu
Diffstat (limited to 'arch/powerpc/kernel/head_32.h')
-rw-r--r--arch/powerpc/kernel/head_32.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/head_32.h b/arch/powerpc/kernel/head_32.h
index 7c767765071d..232000742c9a 100644
--- a/arch/powerpc/kernel/head_32.h
+++ b/arch/powerpc/kernel/head_32.h
@@ -222,7 +222,10 @@
#endif
mtspr SPRN_SRR1,r10
mtspr SPRN_SRR0,r11
- RFI /* jump to handler, enable MMU */
+ rfi /* jump to handler, enable MMU */
+#ifdef CONFIG_40x
+ b . /* Prevent prefetch past rfi */
+#endif
99: b ret_from_kernel_syscall
.endm