powerpc/pseries: Implement NMI IPI with H_SIGNAL_SYS_RESET

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

diff --git a/arch/powerpc/platforms/pseries/ras.c b/arch/powerpc/platforms/pseries/ras.c
index 904a677208d1fc47188f4329a3bafdd6b31cda89..bb70b26334f071da6ea7a504c1929a7a7aa165a6 100644 (file)
--- a/arch/powerpc/platforms/pseries/ras.c
+++ b/arch/powerpc/platforms/pseries/ras.c
@@ -386,6 +386,10 @@ int pSeries_system_reset_exception(struct pt_regs *regs)
                }
                fwnmi_release_errinfo();
        }
+
+       if (smp_handle_nmi_ipi(regs))
+               return 1;
+
        return 0; /* need to perform reset */
 }
 

diff --git a/arch/powerpc/platforms/pseries/smp.c b/arch/powerpc/platforms/pseries/smp.c
index 0925ac396b107ba11d692dd08ac1bd732a9fd7f7..52ca6b311d44e913c755ba2b592a7e16a14ffe54 100644 (file)
--- a/arch/powerpc/platforms/pseries/smp.c
+++ b/arch/powerpc/platforms/pseries/smp.c
@@ -189,6 +189,27 @@ static void smp_pseries_cause_ipi(int cpu)
        icp_ops->cause_ipi(cpu);
 }
 
+static int pseries_cause_nmi_ipi(int cpu)
+{
+       int hwcpu;
+
+       if (cpu == NMI_IPI_ALL_OTHERS) {
+               hwcpu = H_SIGNAL_SYS_RESET_ALL_OTHERS;
+       } else {
+               if (cpu < 0) {
+                       WARN_ONCE(true, "incorrect cpu parameter %d", cpu);
+                       return 0;
+               }
+
+               hwcpu = get_hard_smp_processor_id(cpu);
+       }
+
+       if (plapr_signal_sys_reset(hwcpu) == H_SUCCESS)
+               return 1;
+
+       return 0;
+}
+
 static __init void pSeries_smp_probe(void)
 {
        xics_smp_probe();
@@ -202,7 +223,7 @@ static __init void pSeries_smp_probe(void)
 static struct smp_ops_t pseries_smp_ops = {
        .message_pass   = NULL, /* Use smp_muxed_ipi_message_pass */
        .cause_ipi      = NULL, /* Filled at runtime by pSeries_smp_probe() */
-       .cause_nmi_ipi  = NULL,
+       .cause_nmi_ipi  = pseries_cause_nmi_ipi,
        .probe          = pSeries_smp_probe,
        .kick_cpu       = smp_pSeries_kick_cpu,
        .setup_cpu      = smp_setup_cpu,