powerpc: Replace RFI by rfi on book3s/32 and booke

For book3s/32 and for booke, RFI is just an rfi.
Only 40x has a non trivial RFI.
CONFIG_PPC_RTAS is never selected by 40x platforms.

Make it more explicit by replacing RFI by rfi wherever possible.

Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/b901ddfdeb8a0a3b7cb59999599cdfde1bbfe834.1604854583.git.christophe.leroy@csgroup.eu

diff --git a/arch/powerpc/kernel/entry_32.S b/arch/powerpc/kernel/entry_32.S
index 8cdc8bc..e10e116 100644 (file)
--- a/arch/powerpc/kernel/entry_32.S
+++ b/arch/powerpc/kernel/entry_32.S
@@ -1027,7 +1027,7 @@ exc_exit_restart:
        lwz     r1,GPR1(r1)
        .globl exc_exit_restart_end
 exc_exit_restart_end:
-       RFI
+       rfi
 _ASM_NOKPROBE_SYMBOL(exc_exit_restart)
 _ASM_NOKPROBE_SYMBOL(exc_exit_restart_end)
 
@@ -1356,7 +1356,7 @@ _GLOBAL(enter_rtas)
        stw     r7, THREAD + RTAS_SP(r2)
        mtspr   SPRN_SRR0,r8
        mtspr   SPRN_SRR1,r9
-       RFI
+       rfi
 1:     tophys_novmstack r9, r1
 #ifdef CONFIG_VMAP_STACK
        li      r0, MSR_KERNEL & ~MSR_IR        /* can take DTLB miss */
@@ -1371,6 +1371,6 @@ _GLOBAL(enter_rtas)
        stw     r0, THREAD + RTAS_SP(r7)
        mtspr   SPRN_SRR0,r8
        mtspr   SPRN_SRR1,r9
-       RFI                     /* return to caller */
+       rfi                     /* return to caller */
 _ASM_NOKPROBE_SYMBOL(enter_rtas)
 #endif /* CONFIG_PPC_RTAS */

diff --git a/arch/powerpc/kernel/head_book3s_32.S b/arch/powerpc/kernel/head_book3s_32.S
index 5eb9eed..40e8c8c 100644 (file)
--- a/arch/powerpc/kernel/head_book3s_32.S
+++ b/arch/powerpc/kernel/head_book3s_32.S
@@ -206,7 +206,7 @@ turn_on_mmu:
        lis     r0,start_here@h
        ori     r0,r0,start_here@l
        mtspr   SPRN_SRR0,r0
-       RFI                             /* enables MMU */
+       rfi                             /* enables MMU */
 
 /*
  * We need __secondary_hold as a place to hold the other cpus on
@@ -769,13 +769,13 @@ fast_hash_page_return:
        mtcr    r11
        lwz     r11, THR11(r10)
        mfspr   r10, SPRN_SPRG_SCRATCH0
-       RFI
+       rfi
 
 1:     /* ISI */
        mtcr    r11
        mfspr   r11, SPRN_SPRG_SCRATCH1
        mfspr   r10, SPRN_SPRG_SCRATCH0
-       RFI
+       rfi
 
 stack_overflow:
        vmap_stack_overflow_exception
@@ -910,7 +910,7 @@ __secondary_start:
        ori     r3,r3,start_secondary@l
        mtspr   SPRN_SRR0,r3
        mtspr   SPRN_SRR1,r4
-       RFI
+       rfi
 #endif /* CONFIG_SMP */
 
 #ifdef CONFIG_KVM_BOOK3S_HANDLER
@@ -1038,7 +1038,7 @@ start_here:
        .align  4
        mtspr   SPRN_SRR0,r4
        mtspr   SPRN_SRR1,r3
-       RFI
+       rfi
 /* Load up the kernel context */
 2:     bl      load_up_mmu
 
@@ -1062,7 +1062,7 @@ start_here:
        ori     r3,r3,start_kernel@l
        mtspr   SPRN_SRR0,r3
        mtspr   SPRN_SRR1,r4
-       RFI
+       rfi
 
 /*
  * void switch_mmu_context(struct mm_struct *prev, struct mm_struct *next);
@@ -1177,7 +1177,7 @@ _ENTRY(update_bats)
        .align  4
        mtspr   SPRN_SRR0, r4
        mtspr   SPRN_SRR1, r3
-       RFI
+       rfi
 1:     bl      clear_bats
        lis     r3, BATS@ha
        addi    r3, r3, BATS@l
@@ -1196,7 +1196,7 @@ END_MMU_FTR_SECTION_IFSET(MMU_FTR_USE_HIGH_BATS)
        mtmsr   r3
        mtspr   SPRN_SRR0, r7
        mtspr   SPRN_SRR1, r6
-       RFI
+       rfi
 
 flush_tlbs:
        lis     r10, 0x40
@@ -1217,7 +1217,7 @@ mmu_off:
        mtspr   SPRN_SRR0,r4
        mtspr   SPRN_SRR1,r3
        sync
-       RFI
+       rfi
 
 /* We use one BAT to map up to 256M of RAM at _PAGE_OFFSET */
 initial_bats:

diff --git a/arch/powerpc/kernel/head_booke.h b/arch/powerpc/kernel/head_booke.h
index 71c359d..e26d35d 100644 (file)
--- a/arch/powerpc/kernel/head_booke.h
+++ b/arch/powerpc/kernel/head_booke.h
@@ -176,7 +176,7 @@ ALT_FTR_SECTION_END_IFSET(CPU_FTR_EMB_HV)
 #endif
        mtspr   SPRN_SRR1,r10
        mtspr   SPRN_SRR0,r11
-       RFI                             /* jump to handler, enable MMU */
+       rfi                             /* jump to handler, enable MMU */
 99:    b       ret_from_kernel_syscall
 .endm
 

diff --git a/arch/powerpc/kvm/book3s_rmhandlers.S b/arch/powerpc/kvm/book3s_rmhandlers.S
index 3dc129a..b45b750 100644 (file)
--- a/arch/powerpc/kvm/book3s_rmhandlers.S
+++ b/arch/powerpc/kvm/book3s_rmhandlers.S
@@ -36,8 +36,8 @@
 
 #define FUNC(name)             name
 
-#define RFI_TO_KERNEL  RFI
-#define RFI_TO_GUEST   RFI
+#define RFI_TO_KERNEL  rfi
+#define RFI_TO_GUEST   rfi
 
 .macro INTERRUPT_TRAMPOLINE intno