From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from bh-25.webhostbox.net ([208.91.199.152]:34359 "EHLO bh-25.webhostbox.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752381AbbAXQcT (ORCPT ); Sat, 24 Jan 2015 11:32:19 -0500 Received: from mailnull by bh-25.webhostbox.net with sa-checked (Exim 4.82) (envelope-from ) id 1YF3dC-001nNR-Qm for linux-watchdog@vger.kernel.org; Sat, 24 Jan 2015 16:32:18 +0000 Message-ID: <54C3C90B.1060503@roeck-us.net> Date: Sat, 24 Jan 2015 08:32:11 -0800 From: Guenter Roeck MIME-Version: 1.0 To: =?UTF-8?B?UmFmYcWCIE1pxYJlY2tp?= , Wim Van Sebroeck CC: linux-watchdog@vger.kernel.org, Hauke Mehrtens Subject: Re: [PATCH] watchdog: bcm47xx_wdt.c: add restart handler support References: <1422107244-32097-1-git-send-email-zajec5@gmail.com> In-Reply-To: <1422107244-32097-1-git-send-email-zajec5@gmail.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Sender: linux-watchdog-owner@vger.kernel.org List-Id: linux-watchdog@vger.kernel.org On 01/24/2015 05:47 AM, Rafał Miłecki wrote: > Just like in case of other watchdog drivers, use the new kernel core > API to provide restart support. > > Signed-off-by: Rafał Miłecki > --- > drivers/watchdog/bcm47xx_wdt.c | 22 ++++++++++++++++++++-- > 1 file changed, 20 insertions(+), 2 deletions(-) > > diff --git a/drivers/watchdog/bcm47xx_wdt.c b/drivers/watchdog/bcm47xx_wdt.c > index 9816485..dac3c5d 100644 > --- a/drivers/watchdog/bcm47xx_wdt.c > +++ b/drivers/watchdog/bcm47xx_wdt.c > @@ -169,6 +169,17 @@ static int bcm47xx_wdt_notify_sys(struct notifier_block *this, > return NOTIFY_DONE; > } > > +static int bcm47xx_wdt_restart(struct notifier_block *this, unsigned long mode, > + void *cmd) > +{ > + struct bcm47xx_wdt *wdt; > + > + wdt = container_of(this, struct bcm47xx_wdt, restart_handler); > + wdt->timer_set(wdt, 1); > + > + return NOTIFY_DONE; > +} > + > static struct watchdog_ops bcm47xx_wdt_soft_ops = { > .owner = THIS_MODULE, > .start = bcm47xx_wdt_soft_start, > @@ -204,20 +215,27 @@ static int bcm47xx_wdt_probe(struct platform_device *pdev) > watchdog_set_nowayout(&wdt->wdd, nowayout); > > wdt->notifier.notifier_call = &bcm47xx_wdt_notify_sys; > - > ret = register_reboot_notifier(&wdt->notifier); > if (ret) > goto err_timer; > > - ret = watchdog_register_device(&wdt->wdd); > + wdt->restart_handler.notifier_call = &bcm47xx_wdt_restart; > + wdt->restart_handler.priority = 128; This should be low priority since it doesn't immediately restart the system but uses a watchdog timeout. Thanks, Guenter