powerpc/powernv: Always stop secondaries before reboot/shutdown

Currently powernv reboot and shutdown requests just leave secondaries
to do their own things. This is undesirable because they can trigger
any number of watchdogs while waiting for reboot, but also we don't
know what else they might be doing -- they might be causing trouble,
trampling memory, etc.

The opal scheduled flash update code already ran into watchdog problems
due to flashing taking a long time, and it was fixed with 2196c6f1ed
("powerpc/powernv: Return secondary CPUs to firmware before FW update"),
which returns secondaries to opal. It's been found that regular reboots
can take over 10 seconds, which can result in the hard lockup watchdog
firing,

  reboot: Restarting system
  [  360.038896709,5] OPAL: Reboot request...
  Watchdog CPU:0 Hard LOCKUP
  Watchdog CPU:44 detected Hard LOCKUP other CPUS:16
  Watchdog CPU:16 Hard LOCKUP
  watchdog: BUG: soft lockup - CPU#16 stuck for 3s! [swapper/16:0]

This patch removes the special case for flash update, and calls
smp_send_stop in all cases before calling reboot/shutdown.

smp_send_stop could return CPUs to OPAL, the main reason not to is
that the request could come from a NMI that interrupts OPAL code,
so re-entry to OPAL can cause a number of problems. Putting
secondaries into simple spin loops improves the chances of a
successful reboot.

Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Reviewed-by:  Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

diff --git a/arch/powerpc/include/asm/opal.h b/arch/powerpc/include/asm/opal.h
index dde60089d0d424ff1840f0c658c0417f1dac9007..7159e1a6a61aa7afdea367cc5c36ef2dddef2c9b 100644 (file)
--- a/arch/powerpc/include/asm/opal.h
+++ b/arch/powerpc/include/asm/opal.h
@@ -325,7 +325,7 @@ struct rtc_time;
 extern unsigned long opal_get_boot_time(void);
 extern void opal_nvram_init(void);
 extern void opal_flash_update_init(void);
-extern void opal_flash_term_callback(void);
+extern void opal_flash_update_print_message(void);
 extern int opal_elog_init(void);
 extern void opal_platform_dump_init(void);
 extern void opal_sys_param_init(void);

diff --git a/arch/powerpc/platforms/powernv/opal-flash.c b/arch/powerpc/platforms/powernv/opal-flash.c
index 1cb0b895a236eef025478a3c4da2fe789ac6a3a5..b37015101bf61d976e9d11cecd144c60f3b60f2b 100644 (file)
--- a/arch/powerpc/platforms/powernv/opal-flash.c
+++ b/arch/powerpc/platforms/powernv/opal-flash.c
@@ -303,26 +303,9 @@ invalid_img:
        return rc;
 }
 
-/* Return CPUs to OPAL before starting FW update */
-static void flash_return_cpu(void *info)
-{
-       int cpu = smp_processor_id();
-
-       if (!cpu_online(cpu))
-               return;
-
-       /* Disable IRQ */
-       hard_irq_disable();
-
-       /* Return the CPU to OPAL */
-       opal_return_cpu();
-}
-
 /* This gets called just before system reboots */
-void opal_flash_term_callback(void)
+void opal_flash_update_print_message(void)
 {
-       struct cpumask mask;
-
        if (update_flash_data.status != FLASH_IMG_READY)
                return;
 
@@ -333,15 +316,6 @@ void opal_flash_term_callback(void)
 
        /* Small delay to help getting the above message out */
        msleep(500);
-
-       /* Return secondary CPUs to firmware */
-       cpumask_copy(&mask, cpu_online_mask);
-       cpumask_clear_cpu(smp_processor_id(), &mask);
-       if (!cpumask_empty(&mask))
-               smp_call_function_many(&mask,
-                                      flash_return_cpu, NULL, false);
-       /* Hard disable interrupts */
-       hard_irq_disable();
 }
 
 /*

diff --git a/arch/powerpc/platforms/powernv/setup.c b/arch/powerpc/platforms/powernv/setup.c
index 5f963286232f76bda9390aa67d0f19a8a18e0663..ef8c9ce53a616910d264f4875b9ec72311a110a8 100644 (file)
--- a/arch/powerpc/platforms/powernv/setup.c
+++ b/arch/powerpc/platforms/powernv/setup.c
@@ -201,17 +201,12 @@ static void pnv_prepare_going_down(void)
         */
        opal_event_shutdown();
 
-       /* Soft disable interrupts */
-       local_irq_disable();
+       /* Print flash update message if one is scheduled. */
+       opal_flash_update_print_message();
 
-       /*
-        * Return secondary CPUs to firwmare if a flash update
-        * is pending otherwise we will get all sort of error
-        * messages about CPU being stuck etc.. This will also
-        * have the side effect of hard disabling interrupts so
-        * past this point, the kernel is effectively dead.
-        */
-       opal_flash_term_callback();
+       smp_send_stop();
+
+       hard_irq_disable();
 }
 
 static void  __noreturn pnv_restart(char *cmd)