From: "Leonard Göhrs" <l.goehrs@pengutronix.de>
To: barebox@lists.infradead.org
Cc: "Leonard Göhrs" <l.goehrs@pengutronix.de>
Subject: [PATCH] watchdog: prevent the STPMIC1 watchdog probe from modifying the global turn-OFF behaviour
Date: Thu, 11 Feb 2021 16:03:48 +0100 [thread overview]
Message-ID: <20210211150348.3670852-1-l.goehrs@pengutronix.de> (raw)
According to Table 12 in the STPMIC1-datasheet (Rev 7 - December 2020)
there are the following turn-OFF conditions:
- Software switch-OFF*
- PONKEYn long key press*
- Thermal shutdown
- Overcurrent protection
- Watchdog*
- VIN_OK_Fall*
The conditions marked with an * can be re-configured from turn-Off conditions
to restart requests using the RREQ_EN-bit in the CR register
(Called RESTART_REQUEST_ENABLED in Linux/Barebox).
The watchdog code enabled this bit in it's probe function to trigger a restart
on a watchdog event. This may however result in unexpected behaviour,
like a long-press of the PONKEY resulting in a restart instead of a turn-off
when the watchdog is enabled vs. when it is not.
This change does not affect the restart and poweroff functionality provided by
the wdt driver, as the restart-/poweroff-handlers explicitly set/clear the
RESTART_REQUEST_ENABLED flag when triggering a software turn-OFF.
To prevent unexpected behaviour of the PONKEYn and other turn-OFF sources the
RESTART_REQUEST_ENABLED configuration in the probe function can and should thus be removed.
Signed-off-by: Leonard Göhrs <l.goehrs@pengutronix.de>
---
drivers/watchdog/stpmic1_wdt.c | 4 ----
1 file changed, 4 deletions(-)
diff --git a/drivers/watchdog/stpmic1_wdt.c b/drivers/watchdog/stpmic1_wdt.c
index 12280f144..105ba39fb 100644
--- a/drivers/watchdog/stpmic1_wdt.c
+++ b/drivers/watchdog/stpmic1_wdt.c
@@ -174,10 +174,6 @@ static int stpmic1_wdt_probe(struct device_d *dev)
wdd->set_timeout = stpmic1_wdt_set_timeout;
wdd->timeout_max = PMIC_WDT_MAX_TIMEOUT;
- /* have the watchdog reset, not power-off the system */
- regmap_write_bits(wdt->regmap, SWOFF_PWRCTRL_CR,
- RESTART_REQUEST_ENABLED, RESTART_REQUEST_ENABLED);
-
ret = watchdog_register(wdd);
if (ret) {
dev_err(dev, "Failed to register watchdog device\n");
--
2.20.1
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next reply other threads:[~2021-02-11 15:04 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-11 15:03 Leonard Göhrs [this message]
2021-02-11 15:32 ` Leonard Goehrs
2021-02-11 15:35 ` Ahmad Fatoum
2021-02-12 8:50 ` Sascha Hauer
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=20210211150348.3670852-1-l.goehrs@pengutronix.de \
--to=l.goehrs@pengutronix.de \
--cc=barebox@lists.infradead.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