Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754023Ab2H0S6J (ORCPT ); Mon, 27 Aug 2012 14:58:09 -0400 Received: from g1t0029.austin.hp.com ([15.216.28.36]:41698 "EHLO g1t0029.austin.hp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750971Ab2H0S6H (ORCPT ); Mon, 27 Aug 2012 14:58:07 -0400 From: Toshi Kani To: wim@iguana.be, linux-watchdog@vger.kernel.org Cc: linux-kernel@vger.kernel.org, thomas.mingarelli@hp.com, Toshi Kani , stable@vger.kernel.org Subject: [PATCH] hpwdt: Fix kdump issue in hpwdt Date: Mon, 27 Aug 2012 12:52:24 -0600 Message-Id: <1346093544-12007-1-git-send-email-toshi.kani@hp.com> X-Mailer: git-send-email 1.7.7.6 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1315 Lines: 35 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 Tested-by: Lisa Mitchell Cc: stable@vger.kernel.org --- drivers/watchdog/hpwdt.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/drivers/watchdog/hpwdt.c b/drivers/watchdog/hpwdt.c index 1eff743..ae60406 100644 --- a/drivers/watchdog/hpwdt.c +++ b/drivers/watchdog/hpwdt.c @@ -814,6 +814,9 @@ static int __devinit hpwdt_init_one(struct pci_dev *dev, hpwdt_timer_reg = pci_mem_addr + 0x70; 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 */ if (hpwdt_change_timer(soft_margin)) hpwdt_change_timer(DEFAULT_MARGIN); -- 1.7.7.6 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/