Commit ffaba674 authored by David S. Miller's avatar David S. Miller

sparc64: Fix reset hangs on Niagara systems.

Hypervisor versions older than version 1.6.1 cannot handle
leaving the profile counter overflow interrupt chirping
when the system does a soft reset.

So use a reboot notifier to shut off the NMI watchdog.
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 07d43ba9
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/kprobes.h> #include <linux/kprobes.h>
#include <linux/kernel_stat.h> #include <linux/kernel_stat.h>
#include <linux/reboot.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/kdebug.h> #include <linux/kdebug.h>
#include <linux/delay.h> #include <linux/delay.h>
...@@ -206,13 +207,33 @@ void nmi_adjust_hz(unsigned int new_hz) ...@@ -206,13 +207,33 @@ void nmi_adjust_hz(unsigned int new_hz)
} }
EXPORT_SYMBOL_GPL(nmi_adjust_hz); EXPORT_SYMBOL_GPL(nmi_adjust_hz);
static int nmi_shutdown(struct notifier_block *nb, unsigned long cmd, void *p)
{
on_each_cpu(stop_watchdog, NULL, 1);
return 0;
}
static struct notifier_block nmi_reboot_notifier = {
.notifier_call = nmi_shutdown,
};
int __init nmi_init(void) int __init nmi_init(void)
{ {
int err;
nmi_usable = 1; nmi_usable = 1;
on_each_cpu(start_watchdog, NULL, 1); on_each_cpu(start_watchdog, NULL, 1);
return check_nmi_watchdog(); err = check_nmi_watchdog();
if (!err) {
err = register_reboot_notifier(&nmi_reboot_notifier);
if (err) {
nmi_usable = 0;
on_each_cpu(stop_watchdog, NULL, 1);
}
}
return err;
} }
static int __init setup_nmi_watchdog(char *str) static int __init setup_nmi_watchdog(char *str)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment