powerpc/64s: Clean up machine check recovery flushing

Use the flush function introduced with the POWER9 machine check handler
for POWER7 and 8, rather than open coding it multiple times in callers.

There is a specific ERAT flush type introduced for POWER9, but the
POWER7-8 ERAT errors continue to do SLB flushing (which also flushes
ERAT), so as not to introduce functional changes with this cleanup
patch.

Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

diff --git a/arch/powerpc/kernel/mce_power.c b/arch/powerpc/kernel/mce_power.c
index 763d6f58caa8ca140c8afb1260555b0ea1c1d2a0..0f35a88e36556654f43fde98e8809d0f30946a51 100644 (file)
--- a/arch/powerpc/kernel/mce_power.c
+++ b/arch/powerpc/kernel/mce_power.c
@@ -161,81 +161,27 @@ static int mce_handle_flush_derrors(uint64_t dsisr, uint64_t slb, uint64_t tlb,
        return 1;
 }
 
-static long mce_handle_derror(uint64_t dsisr, uint64_t slb_error_bits)
-{
-       long handled = 1;
-
-       /*
-        * flush and reload SLBs for SLB errors and flush TLBs for TLB errors.
-        * reset the error bits whenever we handle them so that at the end
-        * we can check whether we handled all of them or not.
-        * */
-#ifdef CONFIG_PPC_STD_MMU_64
-       if (dsisr & slb_error_bits) {
-               flush_and_reload_slb();
-               /* reset error bits */
-               dsisr &= ~(slb_error_bits);
-       }
-       if (dsisr & P7_DSISR_MC_TLB_MULTIHIT_MFTLB) {
-               if (cur_cpu_spec && cur_cpu_spec->flush_tlb)
-                       cur_cpu_spec->flush_tlb(TLB_INVAL_SCOPE_GLOBAL);
-               /* reset error bits */
-               dsisr &= ~P7_DSISR_MC_TLB_MULTIHIT_MFTLB;
-       }
-#endif
-       /* Any other errors we don't understand? */
-       if (dsisr & 0xffffffffUL)
-               handled = 0;
-
-       return handled;
-}
-
 static long mce_handle_derror_p7(uint64_t dsisr)
 {
-       return mce_handle_derror(dsisr, P7_DSISR_MC_SLB_ERRORS);
+       return mce_handle_flush_derrors(dsisr,
+                       P7_DSISR_MC_SLB_ERRORS,
+                       P7_DSISR_MC_TLB_MULTIHIT_MFTLB,
+                       0);
 }
 
-static long mce_handle_common_ierror(uint64_t srr1)
+static long mce_handle_ierror_p7(uint64_t srr1)
 {
-       long handled = 0;
-
        switch (P7_SRR1_MC_IFETCH(srr1)) {
-       case 0:
-               break;
-#ifdef CONFIG_PPC_STD_MMU_64
        case P7_SRR1_MC_IFETCH_SLB_PARITY:
        case P7_SRR1_MC_IFETCH_SLB_MULTIHIT:
-               /* flush and reload SLBs for SLB errors. */
-               flush_and_reload_slb();
-               handled = 1;
-               break;
+       case P7_SRR1_MC_IFETCH_SLB_BOTH:
+               return mce_flush(MCE_FLUSH_SLB);
+
        case P7_SRR1_MC_IFETCH_TLB_MULTIHIT:
-               if (cur_cpu_spec && cur_cpu_spec->flush_tlb) {
-                       cur_cpu_spec->flush_tlb(TLB_INVAL_SCOPE_GLOBAL);
-                       handled = 1;
-               }
-               break;
-#endif
+               return mce_flush(MCE_FLUSH_TLB);
        default:
-               break;
-       }
-
-       return handled;
-}
-
-static long mce_handle_ierror_p7(uint64_t srr1)
-{
-       long handled = 0;
-
-       handled = mce_handle_common_ierror(srr1);
-
-#ifdef CONFIG_PPC_STD_MMU_64
-       if (P7_SRR1_MC_IFETCH(srr1) == P7_SRR1_MC_IFETCH_SLB_BOTH) {
-               flush_and_reload_slb();
-               handled = 1;
+               return 0;
        }
-#endif
-       return handled;
 }
 
 static void mce_get_common_ierror(struct mce_error_info *mce_err, uint64_t srr1)
@@ -376,22 +322,25 @@ static void mce_get_derror_p8(struct mce_error_info *mce_err, uint64_t dsisr)
 
 static long mce_handle_ierror_p8(uint64_t srr1)
 {
-       long handled = 0;
-
-       handled = mce_handle_common_ierror(srr1);
+       switch (P7_SRR1_MC_IFETCH(srr1)) {
+       case P7_SRR1_MC_IFETCH_SLB_PARITY:
+       case P7_SRR1_MC_IFETCH_SLB_MULTIHIT:
+       case P8_SRR1_MC_IFETCH_ERAT_MULTIHIT:
+               return mce_flush(MCE_FLUSH_SLB);
 
-#ifdef CONFIG_PPC_STD_MMU_64
-       if (P7_SRR1_MC_IFETCH(srr1) == P8_SRR1_MC_IFETCH_ERAT_MULTIHIT) {
-               flush_and_reload_slb();
-               handled = 1;
+       case P7_SRR1_MC_IFETCH_TLB_MULTIHIT:
+               return mce_flush(MCE_FLUSH_TLB);
+       default:
+               return 0;
        }
-#endif
-       return handled;
 }
 
 static long mce_handle_derror_p8(uint64_t dsisr)
 {
-       return mce_handle_derror(dsisr, P8_DSISR_MC_SLB_ERRORS);
+       return mce_handle_flush_derrors(dsisr,
+                       P8_DSISR_MC_SLB_ERRORS,
+                       P7_DSISR_MC_TLB_MULTIHIT_MFTLB,
+                       0);
 }
 
 long __machine_check_early_realmode_p8(struct pt_regs *regs)