From: Alexandre Belloni <alexandre.belloni@bootlin.com>
To: Guenter Roeck <linux@roeck-us.net>
Cc: Vladimir Zapolskiy <vz@mleia.com>,
Wim Van Sebroeck <wim@linux-watchdog.org>,
Sylvain Lemieux <slemieux.tyco@gmail.com>,
Gregory Clement <gregory.clement@bootlin.com>,
linux-arm-kernel@lists.infradead.org,
linux-watchdog@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] watchdog: pnx4008: readout watchddog state
Date: Thu, 11 Apr 2019 18:13:39 +0200 [thread overview]
Message-ID: <20190411161339.GL3578@piout.net> (raw)
In-Reply-To: <20190411160305.GA27530@roeck-us.net>
On 11/04/2019 09:03:05-0700, Guenter Roeck wrote:
> Hi Alexandre,
>
> On Thu, Apr 11, 2019 at 05:36:46PM +0200, Alexandre Belloni wrote:
> > Readout the enabled state so it is possible to get the pre-userspace
> > handler working. Also, avoid disabling the watchdog when nowayout is set to
> > ensure the watchdog continues working and triggers if there is an issue
> > later in the boot or if userspace fails to start.
> >
> > Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
> > ---
> > drivers/watchdog/pnx4008_wdt.c | 6 +++++-
> > 1 file changed, 5 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/watchdog/pnx4008_wdt.c b/drivers/watchdog/pnx4008_wdt.c
> > index 8e261799c84e..9e3714e3814c 100644
> > --- a/drivers/watchdog/pnx4008_wdt.c
> > +++ b/drivers/watchdog/pnx4008_wdt.c
> > @@ -209,7 +209,11 @@ static int pnx4008_wdt_probe(struct platform_device *pdev)
> > watchdog_set_nowayout(&pnx4008_wdd, nowayout);
> > watchdog_set_restart_priority(&pnx4008_wdd, 128);
> >
> > - pnx4008_wdt_stop(&pnx4008_wdd); /* disable for now */
> > + if (readl(WDTIM_CTRL(wdt_base)) & COUNT_ENAB)
> > + set_bit(WDOG_HW_RUNNING, &pnx4008_wdd.status);
> > +
> > + if (!nowayout)
> > + pnx4008_wdt_stop(&pnx4008_wdd); /* disable for now */
>
> I don't see the point of stopping the watchdog here, even though that is the
> old behavior. If it is possible to detect that the watchdog is running, we
> can let the core handle pings until the watchdog device is opened. The code
> above does that, but only if nowayout is set. That seems inconsistent and
> unnecessary. Is there a downside to doing that unconditionally ?
>
I guess the downside is the change of behaviour. I don't think many will
be affected but they will have to ensure the core pings the watchdog
until the device is open. WATCHDOG_HANDLE_BOOT_ENABLED is y by default
so that should be fine for most.
Honestly, I would just never disable the watchdog, that is the whole
point of this patch. If you are fine with that, I will just remove the
line.
> Nitpick: s/watchddog/watchdog/ in subject line.
>
I'll fix it.
--
Alexandre Belloni, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
next prev parent reply other threads:[~2019-04-11 16:13 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-11 15:36 [PATCH] watchdog: pnx4008: readout watchddog state Alexandre Belloni
2019-04-11 16:03 ` Guenter Roeck
2019-04-11 16:13 ` Alexandre Belloni [this message]
2019-04-11 16:37 ` Guenter Roeck
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=20190411161339.GL3578@piout.net \
--to=alexandre.belloni@bootlin.com \
--cc=gregory.clement@bootlin.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-watchdog@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=slemieux.tyco@gmail.com \
--cc=vz@mleia.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).