Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 308b135e4fcc00c80c07e0e04e7afa8edf78583c

Authored by Toshi Kani
Committed by Wim Van Sebroeck
1 parent 55d512e245
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

hpwdt: Fix kdump issue in hpwdt 

kdump can be interrupted by watchdog timer when the timer is left
activated on the crash kernel. Changed the hpwdt driver to disable
watchdog timer at boot-time. This assures that watchdog timer is
disabled until /dev/watchdog is opened, and prevents watchdog timer
to be left running on the crash kernel.

Signed-off-by: Toshi Kani <toshi.kani@hp.com>
Tested-by: Lisa Mitchell <lisa.mitchell@hp.com>
Signed-off-by: Thomas Mingarelli <Thomas.Mingarelli@hp.com>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Cc: stable <stable@vger.kernel.org>

Showing 1 changed file with 3 additions and 0 deletions Side-by-side Diff

drivers/watchdog/hpwdt.c
Diff comments   View file @ 308b135
... ... @@ -814,6 +814,9 @@
814 814 hpwdt_timer_reg = pci_mem_addr + 0x70;
815 815 hpwdt_timer_con = pci_mem_addr + 0x72;
816 816  
  817 + /* Make sure that timer is disabled until /dev/watchdog is opened */
  818 + hpwdt_stop();
  819 +
817 820 /* Make sure that we have a valid soft_margin */
818 821 if (hpwdt_change_timer(soft_margin))
819 822 hpwdt_change_timer(DEFAULT_MARGIN);