From: minyard@acm.org To: Guenter Roeck <linux@roeck-us.net>, Wim Van Sebroeck <wim@linux-watchdog.org> Cc: linux-watchdog@vger.kernel.org, Gabriele Paoloni <gabriele.paoloni@intel.com>, Corey Minyard <cminyard@mvista.com> Subject: [PATCH 6/6] watchdog:softdog: Convert to a millisecond watchdog Date: Sat, 20 Jun 2020 12:33:51 -0500 Message-ID: <20200620173351.18752-7-minyard@acm.org> (raw) In-Reply-To: <20200620173351.18752-1-minyard@acm.org> From: Corey Minyard <cminyard@mvista.com> Use milliseconds for the softdog timer to support a higher resolution timeout. Signed-off-by: Corey Minyard <cminyard@mvista.com> --- drivers/watchdog/softdog.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/drivers/watchdog/softdog.c b/drivers/watchdog/softdog.c index 3e4885c1545e..794f552db53b 100644 --- a/drivers/watchdog/softdog.c +++ b/drivers/watchdog/softdog.c @@ -82,13 +82,13 @@ static int softdog_ping(struct watchdog_device *w) { if (!hrtimer_active(&softdog_ticktock)) __module_get(THIS_MODULE); - hrtimer_start(&softdog_ticktock, ktime_set(w->timeout, 0), + hrtimer_start(&softdog_ticktock, ms_to_ktime(w->timeout), HRTIMER_MODE_REL); if (IS_ENABLED(CONFIG_SOFT_WATCHDOG_PRETIMEOUT)) { if (w->pretimeout) hrtimer_start(&softdog_preticktock, - ktime_set(w->timeout - w->pretimeout, 0), + ms_to_ktime(w->timeout - w->pretimeout), HRTIMER_MODE_REL); else hrtimer_cancel(&softdog_preticktock); @@ -110,7 +110,8 @@ static int softdog_stop(struct watchdog_device *w) static struct watchdog_info softdog_info = { .identity = "Software Watchdog", - .options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING | WDIOF_MAGICCLOSE, + .options = (WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING | WDIOF_MAGICCLOSE | + WDIOF_MSECTIMER), }; static const struct watchdog_ops softdog_ops = { @@ -123,15 +124,15 @@ static struct watchdog_device softdog_dev = { .info = &softdog_info, .ops = &softdog_ops, .min_timeout = 1, - .max_timeout = 65535, - .timeout = TIMER_MARGIN, + .max_timeout = 65535000, + .timeout = TIMER_MARGIN * 1000, }; static int __init softdog_init(void) { int ret; - watchdog_init_timeout(&softdog_dev, soft_margin, NULL); + watchdog_init_timeout(&softdog_dev, soft_margin * 1000, NULL); watchdog_set_nowayout(&softdog_dev, nowayout); watchdog_stop_on_reboot(&softdog_dev); -- 2.17.1
prev parent reply index Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-06-20 17:33 [PATCH 0/6] watchdog: Add millisecond-level capabilities minyard 2020-06-20 17:33 ` [PATCH 1/6] watchdog: Allow a driver to use milliseconds instead of seconds minyard 2020-06-26 23:10 ` Guenter Roeck 2020-06-27 2:18 ` Corey Minyard 2020-06-27 4:08 ` Guenter Roeck 2020-06-28 14:54 ` Guenter Roeck 2020-06-28 17:56 ` Corey Minyard 2020-12-01 22:54 ` Corey Minyard 2020-12-01 23:43 ` Guenter Roeck 2020-06-20 17:33 ` [PATCH 2/6] watchdog: Add ioctls for millisecond timeout handling minyard 2020-06-20 17:33 ` [PATCH 3/6] watchdog: Add millisecond precision device attributes minyard 2020-06-20 17:33 ` [PATCH 4/6] watchdog: Add documentation for millisecond interfaces minyard 2020-06-20 17:33 ` [PATCH 5/6] watchdog:i6300: Convert to a millisecond watchdog device minyard 2020-06-20 17:33 ` minyard [this message]
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200620173351.18752-7-minyard@acm.org \ --to=minyard@acm.org \ --cc=cminyard@mvista.com \ --cc=gabriele.paoloni@intel.com \ --cc=linux-watchdog@vger.kernel.org \ --cc=linux@roeck-us.net \ --cc=wim@linux-watchdog.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
Linux-Watchdog Archive on lore.kernel.org Archives are clonable: git clone --mirror https://lore.kernel.org/linux-watchdog/0 linux-watchdog/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 linux-watchdog linux-watchdog/ https://lore.kernel.org/linux-watchdog \ linux-watchdog@vger.kernel.org public-inbox-index linux-watchdog Example config snippet for mirrors Newsgroup available over NNTP: nntp://nntp.lore.kernel.org/org.kernel.vger.linux-watchdog AGPL code for this site: git clone https://public-inbox.org/public-inbox.git