From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758123Ab2IJSxw (ORCPT ); Mon, 10 Sep 2012 14:53:52 -0400 Received: from g1t0029.austin.hp.com ([15.216.28.36]:15959 "EHLO g1t0029.austin.hp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754347Ab2IJSxv (ORCPT ); Mon, 10 Sep 2012 14:53:51 -0400 Message-ID: <1347302891.4732.257.camel@misato.fc.hp.com> Subject: Re: [PATCH] hpwdt: Fix kdump issue in hpwdt From: Toshi Kani To: Wim Van Sebroeck Cc: linux-watchdog@vger.kernel.org, linux-kernel@vger.kernel.org, thomas.mingarelli@hp.com, stable@vger.kernel.org, lisa.mitchell@hp.com Date: Mon, 10 Sep 2012 12:48:11 -0600 In-Reply-To: <20120910184847.GC27604@spo001.leaseweb.com> References: <1346093544-12007-1-git-send-email-toshi.kani@hp.com> <20120910184847.GC27604@spo001.leaseweb.com> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.2.3 (3.2.3-1.fc16) Content-Transfer-Encoding: 7bit Mime-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, 2012-09-10 at 20:48 +0200, Wim Van Sebroeck wrote: > Hi Toshi, > > > 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); > > Added to linux-watchdog-next . Great! Thanks Wim! -Toshi > > Kind regards, > Wim. >