Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

watchdog: hpwdt: prevent multiple "NMI occurred" messages

On platforms with no iCRU support don't print two, (possibly conflicting),
"NMI occurred" messages when the firmware is unable to source the NMI.

Please note that one of the enhancements to the v1.3.0 hpwdt driver is to panic and allow
KDUMP to succeed even on NMIs that are unknown to the platform firmware.

Signed-off-by: Naga Chumbalkar <nagananda.chumbalkar@hp.com>
Reviewed-by: Thomas Mingarelli <thomas.mingarelli@hp.com>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>

authored by

Naga Chumbalkar and committed by
Wim Van Sebroeck
dbc018ec cb7efc02

+7 -6
+7 -6
drivers/watchdog/hpwdt.c
··· 494 494 asminline_call(&cmn_regs, cru_rom_addr); 495 495 die_nmi_called = 1; 496 496 spin_unlock_irqrestore(&rom_lock, rom_pl); 497 - if (!is_icru) { 498 - if (cmn_regs.u1.ral == 0) { 499 - printk(KERN_WARNING "hpwdt: An NMI occurred, " 500 - "but unable to determine source.\n"); 501 - } 502 - } 503 497 504 498 if (allow_kdump) 505 499 hpwdt_stop(); 500 + 501 + if (!is_icru) { 502 + if (cmn_regs.u1.ral == 0) { 503 + panic("An NMI occurred, " 504 + "but unable to determine source.\n"); 505 + } 506 + } 506 507 panic("An NMI occurred, please see the Integrated " 507 508 "Management Log for details.\n"); 508 509