From: Marc Kleine-Budde <mkl@pengutronix.de>
To: Sascha Hauer <s.hauer@pengutronix.de>,
Barebox List <barebox@lists.infradead.org>
Cc: Andrey Smirnov <andrew.smirnov@gmail.com>
Subject: Re: [PATCH] ARM: i.MX: When SRSR shows wdog then lookup reset source in wdog
Date: Fri, 16 Nov 2018 15:22:59 +0100 [thread overview]
Message-ID: <cd74626d-72ea-ec05-644a-d3f24f1d4541@pengutronix.de> (raw)
In-Reply-To: <20181115141552.26386-1-s.hauer@pengutronix.de>
[-- Attachment #1.1.1: Type: text/plain, Size: 2807 bytes --]
On 11/15/18 3:15 PM, Sascha Hauer wrote:
> On i.MX6 when the watchdog has resetted the system then the SRSR
> register correctly shows that the watchdog has resetted the system.
> This is not the desired result though, a "reset" in barebox or "reboot"
> in Linux should result in "RST" as reset source. So instead of making
> the SRSR register value overwrite the reset source read from the
> watchdog registers, interpret the SRSR value corresponding to watchdog
> reset as "lookup details in the watchdog registers".
>
> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
> Cc: Andrey Smirnov <andrew.smirnov@gmail.com>
> ---
> arch/arm/mach-imx/imx.c | 6 +++---
> drivers/watchdog/imxwd.c | 10 +++++++---
> 2 files changed, 10 insertions(+), 6 deletions(-)
>
> diff --git a/arch/arm/mach-imx/imx.c b/arch/arm/mach-imx/imx.c
> index ad227663dd..f87dd76c75 100644
> --- a/arch/arm/mach-imx/imx.c
> +++ b/arch/arm/mach-imx/imx.c
> @@ -204,9 +204,9 @@ void imx_set_reset_reason(void __iomem *srsr,
> * sure we'll always override info from watchdog driver.
> */
With this change, the above comment doesn't describe the reality anymore.
> reset_source_set_priority(type,
> - RESET_SOURCE_DEFAULT_PRIORITY + 1);
> + RESET_SOURCE_DEFAULT_PRIORITY);
> reset_source_set_instance(type, instance);
>
> - pr_info("i.MX reset reason %s (SRSR: 0x%08x)\n",
> - reset_source_name(), reg);
> + pr_debug("i.MX reset reason %s (SRSR: 0x%08x)\n",
> + reset_source_name(), reg);
> }
> diff --git a/drivers/watchdog/imxwd.c b/drivers/watchdog/imxwd.c
> index a66fae400c..8dba662392 100644
> --- a/drivers/watchdog/imxwd.c
> +++ b/drivers/watchdog/imxwd.c
> @@ -162,19 +162,23 @@ static void __noreturn imxwd_force_soc_reset(struct restart_handler *rst)
> static void imx_watchdog_detect_reset_source(struct imx_wd *priv)
> {
> u16 val = readw(priv->base + IMX21_WDOG_WSTR);
> + int priority = RESET_SOURCE_DEFAULT_PRIORITY;
> +
> + if (reset_source_get() == RESET_WDG)
> + priority++;
>
> if (val & WSTR_COLDSTART) {
> - reset_source_set(RESET_POR);
> + reset_source_set_priority(RESET_POR, priority);
> return;
> }
>
> if (val & (WSTR_HARDRESET | WSTR_WARMSTART)) {
> - reset_source_set(RESET_RST);
> + reset_source_set_priority(RESET_RST, priority);
> return;
> }
>
> if (val & WSTR_WDOG) {
> - reset_source_set(RESET_WDG);
> + reset_source_set_priority(RESET_WDG, priority);
> return;
> }
>
>
Marc
--
Pengutronix e.K. | Marc Kleine-Budde |
Industrial Linux Solutions | Phone: +49-231-2826-924 |
Vertretung West/Dortmund | Fax: +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |
[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
[-- Attachment #2: Type: text/plain, Size: 149 bytes --]
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2018-11-16 14:23 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-15 14:15 Sascha Hauer
2018-11-15 16:16 ` Andrey Smirnov
2018-11-16 7:40 ` Sascha Hauer
2018-11-16 14:22 ` Marc Kleine-Budde [this message]
2018-11-19 8:11 ` 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=cd74626d-72ea-ec05-644a-d3f24f1d4541@pengutronix.de \
--to=mkl@pengutronix.de \
--cc=andrew.smirnov@gmail.com \
--cc=barebox@lists.infradead.org \
--cc=s.hauer@pengutronix.de \
/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