Commit 308b135e authored Aug 27, 2012 by Toshi Kani Committed by Wim Van Sebroeck Sep 10, 2012

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>

parent 55d512e2

drivers/watchdog/hpwdt.c

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -814,6 +814,9 @@ static int __devinit hpwdt_init_one(struct pci_dev *dev,
	hpwdt_timer_reg = pci_mem_addr + 0x70;		hpwdt_timer_reg = pci_mem_addr + 0x70;
	hpwdt_timer_con = pci_mem_addr + 0x72;		hpwdt_timer_con = pci_mem_addr + 0x72;

			/* Make sure that timer is disabled until /dev/watchdog is opened */
			hpwdt_stop();

	/* Make sure that we have a valid soft_margin */		/* Make sure that we have a valid soft_margin */
	if (hpwdt_change_timer(soft_margin))		if (hpwdt_change_timer(soft_margin))
	hpwdt_change_timer(DEFAULT_MARGIN);		hpwdt_change_timer(DEFAULT_MARGIN);