openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

x86: nmi - fix incorrect NMI watchdog used by default 

The commit

	commit 4b82b27770
	Author: Cyrill Gorcunov <gorcunov@gmail.com>
	Date:   Sat May 24 19:36:35 2008 +0400

set nmi_watchdog to NMI_IO_APIC as by default. This causes hangs on some
machines with buggy watchdogs. Fix it - i.e. restore old behaviour.

Thanks to Sitsofe Wheeler and Adrian Bunk for catching the problem
and Maciej W. Rozycki for explanation what is going on there.

Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
CC: Maciej W. Rozycki <macro@linux-mips.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Cyrill Gorcunov 2008-05-28 23:00:47 +04:00 committed by Ingo Molnar
parent 1798bc22b2
commit 19ec673ced
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
arch/x86/kernel/nmi.c
View File

@ -84,20 +84,15 @@ static inline unsigned int get_timer_irqs(int cpu)
#endif #endif
} }
#ifdef CONFIG_X86_64
/* Run after command line and cpu_init init, but before all other checks */ /* Run after command line and cpu_init init, but before all other checks */
void nmi_watchdog_default(void) void nmi_watchdog_default(void)
{ {
if (nmi_watchdog != NMI_DEFAULT) if (nmi_watchdog != NMI_DEFAULT)
return; return;
#ifdef CONFIG_X86_64
nmi_watchdog = NMI_NONE; nmi_watchdog = NMI_NONE;
#else
if (lapic_watchdog_ok())
nmi_watchdog = NMI_LOCAL_APIC;
else
nmi_watchdog = NMI_IO_APIC;
#endif
} }
#endif
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
/* /*
@ -488,8 +483,15 @@ int proc_nmi_enabled(struct ctl_table *table, int write, struct file *file,
return -EIO; return -EIO;
} }
#ifdef CONFIG_X86_64
/* if nmi_watchdog is not set yet, then set it */ /* if nmi_watchdog is not set yet, then set it */
nmi_watchdog_default(); nmi_watchdog_default();
#else
if (lapic_watchdog_ok())
nmi_watchdog = NMI_LOCAL_APIC;
else
nmi_watchdog = NMI_IO_APIC;
#endif
if (nmi_watchdog == NMI_LOCAL_APIC) { if (nmi_watchdog == NMI_LOCAL_APIC) {
if (nmi_watchdog_enabled) if (nmi_watchdog_enabled)

4
include/asm-x86/nmi.h
View File

@ -38,9 +38,11 @@ static inline void unset_nmi_pm_callback(struct pm_dev *dev)
#ifdef CONFIG_X86_64 #ifdef CONFIG_X86_64
extern void default_do_nmi(struct pt_regs *); extern void default_do_nmi(struct pt_regs *);
extern void nmi_watchdog_default(void);
#else
#define nmi_watchdog_default(void) do {} while (0)
#endif #endif
extern void nmi_watchdog_default(void);
extern void die_nmi(char *str, struct pt_regs *regs, int do_panic); extern void die_nmi(char *str, struct pt_regs *regs, int do_panic);
extern int check_nmi_watchdog(void); extern int check_nmi_watchdog(void);
extern int nmi_watchdog_enabled; extern int nmi_watchdog_enabled;