From: Guenter Roeck <linux@roeck-us.net>
To: Tero Kristo <t-kristo@ti.com>
Cc: wim@linux-watchdog.org, linux-watchdog@vger.kernel.org,
linux-kernel@vger.kernel.org, jan.kiszka@siemens.com
Subject: Re: [PATCH 1/2] watchdog: use __watchdog_ping in startup
Date: Tue, 30 Jun 2020 13:36:36 -0700 [thread overview]
Message-ID: <20200630203636.GA20146@roeck-us.net> (raw)
In-Reply-To: <20200624114534.1362-2-t-kristo@ti.com>
On Wed, Jun 24, 2020 at 02:45:33PM +0300, Tero Kristo wrote:
> Current watchdog startup functionality does not respect the minimum hw
> heartbeat setup and the last watchdog ping timeframe when watchdog is
> already running and userspace process attaches to it. Fix this by using
> the __watchdog_ping from the startup also. For this code path, we can
> also let the __watchdog_ping handle the bookkeeping for the worker and
> last keepalive times.
>
> Signed-off-by: Tero Kristo <t-kristo@ti.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
> ---
> drivers/watchdog/watchdog_dev.c | 19 +++++++++++--------
> 1 file changed, 11 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/watchdog/watchdog_dev.c b/drivers/watchdog/watchdog_dev.c
> index 7e4cd34a8c20..bc1cfa288553 100644
> --- a/drivers/watchdog/watchdog_dev.c
> +++ b/drivers/watchdog/watchdog_dev.c
> @@ -275,15 +275,18 @@ static int watchdog_start(struct watchdog_device *wdd)
> set_bit(_WDOG_KEEPALIVE, &wd_data->status);
>
> started_at = ktime_get();
> - if (watchdog_hw_running(wdd) && wdd->ops->ping)
> - err = wdd->ops->ping(wdd);
> - else
> + if (watchdog_hw_running(wdd) && wdd->ops->ping) {
> + err = __watchdog_ping(wdd);
> + if (err == 0)
> + set_bit(WDOG_ACTIVE, &wdd->status);
> + } else {
> err = wdd->ops->start(wdd);
> - if (err == 0) {
> - set_bit(WDOG_ACTIVE, &wdd->status);
> - wd_data->last_keepalive = started_at;
> - wd_data->last_hw_keepalive = started_at;
> - watchdog_update_worker(wdd);
> + if (err == 0) {
> + set_bit(WDOG_ACTIVE, &wdd->status);
> + wd_data->last_keepalive = started_at;
> + wd_data->last_hw_keepalive = started_at;
> + watchdog_update_worker(wdd);
> + }
> }
>
> return err;
next prev parent reply other threads:[~2020-06-30 20:36 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-24 11:45 [PATCH 0/2] watchdog: rti: adjust initial ping for attach Tero Kristo
2020-06-24 11:45 ` [PATCH 1/2] watchdog: use __watchdog_ping in startup Tero Kristo
2020-06-30 20:36 ` Guenter Roeck [this message]
2020-06-24 11:45 ` [PATCH 2/2] watchdog: rti: tweak min_hw_heartbeat_ms to match initial allowed window Tero Kristo
2020-06-24 15:24 ` Jan Kiszka
2020-06-25 8:32 ` Tero Kristo
2020-06-25 10:00 ` Jan Kiszka
2020-06-25 13:35 ` Guenter Roeck
2020-06-25 17:04 ` Tero Kristo
2020-06-30 20:23 ` Guenter Roeck
2020-07-01 5:50 ` Tero Kristo
2020-07-01 13:34 ` Guenter Roeck
2020-07-01 14:36 ` Tero Kristo
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=20200630203636.GA20146@roeck-us.net \
--to=linux@roeck-us.net \
--cc=jan.kiszka@siemens.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-watchdog@vger.kernel.org \
--cc=t-kristo@ti.com \
--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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).