Commit dbc018eca386b4e2670fc3116feada19f3db664c
Committed by
Wim Van Sebroeck
Wim Van Sebroeck
1 parent
cb7efc02c6
Exists in
master
and in
6 other branches
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>
Showing 1 changed file with 5 additions and 4 deletions Side-by-side Diff
drivers/watchdog/hpwdt.c
| ... | ... | @@ -494,15 +494,16 @@ |
| 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 | + | |
| 498 | + if (allow_kdump) | |
| 499 | + hpwdt_stop(); | |
| 500 | + | |
| 497 | 501 | if (!is_icru) { |
| 498 | 502 | if (cmn_regs.u1.ral == 0) { |
| 499 | - printk(KERN_WARNING "hpwdt: An NMI occurred, " | |
| 503 | + panic("An NMI occurred, " | |
| 500 | 504 | "but unable to determine source.\n"); |
| 501 | 505 | } |
| 502 | 506 | } |
| 503 | - | |
| 504 | - if (allow_kdump) | |
| 505 | - hpwdt_stop(); | |
| 506 | 507 | panic("An NMI occurred, please see the Integrated " |
| 507 | 508 | "Management Log for details.\n"); |
| 508 | 509 |