* [PATCH] Rename "trigger" reset reason "hw watchdog"
@ 2016-02-26 16:05 Martyn Welch
2016-02-27 1:45 ` Guenter Roeck
2016-03-04 19:40 ` Wim Van Sebroeck
0 siblings, 2 replies; 3+ messages in thread
From: Martyn Welch @ 2016-02-26 16:05 UTC (permalink / raw)
To: Wim Van Sebroeck, Guenter Roeck
Cc: linux-watchdog, linux-kernel, Martyn Welch
The Zodiac watchdog is implemented on a microcontoller. The reset reason
currently labelled "trigger" is not to detect when the watchdog has
triggered (as had been initially understood and suggested by the naming),
but to inform the reader that the watchdog, which in fact has it's own
hardware watchdog, has been reset because the hardware watchdog has
triggered. Renaming to "hw watchdog".
Signed-off-by: Martyn Welch <martyn.welch@collabora.co.uk>
---
drivers/watchdog/ziirave_wdt.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/watchdog/ziirave_wdt.c b/drivers/watchdog/ziirave_wdt.c
index 0c7cb73..cbe373de 100644
--- a/drivers/watchdog/ziirave_wdt.c
+++ b/drivers/watchdog/ziirave_wdt.c
@@ -36,7 +36,7 @@
#define ZIIRAVE_STATE_OFF 0x1
#define ZIIRAVE_STATE_ON 0x2
-static char *ziirave_reasons[] = {"power cycle", "triggered", NULL, NULL,
+static char *ziirave_reasons[] = {"power cycle", "hw watchdog", NULL, NULL,
"host request", NULL, "illegal configuration",
"illegal instruction", "illegal trap",
"unknown"};
--
2.1.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] Rename "trigger" reset reason "hw watchdog"
2016-02-26 16:05 [PATCH] Rename "trigger" reset reason "hw watchdog" Martyn Welch
@ 2016-02-27 1:45 ` Guenter Roeck
2016-03-04 19:40 ` Wim Van Sebroeck
1 sibling, 0 replies; 3+ messages in thread
From: Guenter Roeck @ 2016-02-27 1:45 UTC (permalink / raw)
To: Martyn Welch, Wim Van Sebroeck; +Cc: linux-watchdog, linux-kernel
On 02/26/2016 08:05 AM, Martyn Welch wrote:
> The Zodiac watchdog is implemented on a microcontoller. The reset reason
> currently labelled "trigger" is not to detect when the watchdog has
> triggered (as had been initially understood and suggested by the naming),
> but to inform the reader that the watchdog, which in fact has it's own
> hardware watchdog, has been reset because the hardware watchdog has
> triggered. Renaming to "hw watchdog".
>
> Signed-off-by: Martyn Welch <martyn.welch@collabora.co.uk>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
> ---
> drivers/watchdog/ziirave_wdt.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/watchdog/ziirave_wdt.c b/drivers/watchdog/ziirave_wdt.c
> index 0c7cb73..cbe373de 100644
> --- a/drivers/watchdog/ziirave_wdt.c
> +++ b/drivers/watchdog/ziirave_wdt.c
> @@ -36,7 +36,7 @@
> #define ZIIRAVE_STATE_OFF 0x1
> #define ZIIRAVE_STATE_ON 0x2
>
> -static char *ziirave_reasons[] = {"power cycle", "triggered", NULL, NULL,
> +static char *ziirave_reasons[] = {"power cycle", "hw watchdog", NULL, NULL,
> "host request", NULL, "illegal configuration",
> "illegal instruction", "illegal trap",
> "unknown"};
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] Rename "trigger" reset reason "hw watchdog"
2016-02-26 16:05 [PATCH] Rename "trigger" reset reason "hw watchdog" Martyn Welch
2016-02-27 1:45 ` Guenter Roeck
@ 2016-03-04 19:40 ` Wim Van Sebroeck
1 sibling, 0 replies; 3+ messages in thread
From: Wim Van Sebroeck @ 2016-03-04 19:40 UTC (permalink / raw)
To: Martyn Welch; +Cc: Guenter Roeck, linux-watchdog, linux-kernel
Hi Martyn,
> The Zodiac watchdog is implemented on a microcontoller. The reset reason
> currently labelled "trigger" is not to detect when the watchdog has
> triggered (as had been initially understood and suggested by the naming),
> but to inform the reader that the watchdog, which in fact has it's own
> hardware watchdog, has been reset because the hardware watchdog has
> triggered. Renaming to "hw watchdog".
>
> Signed-off-by: Martyn Welch <martyn.welch@collabora.co.uk>
> ---
> drivers/watchdog/ziirave_wdt.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/watchdog/ziirave_wdt.c b/drivers/watchdog/ziirave_wdt.c
> index 0c7cb73..cbe373de 100644
> --- a/drivers/watchdog/ziirave_wdt.c
> +++ b/drivers/watchdog/ziirave_wdt.c
> @@ -36,7 +36,7 @@
> #define ZIIRAVE_STATE_OFF 0x1
> #define ZIIRAVE_STATE_ON 0x2
>
> -static char *ziirave_reasons[] = {"power cycle", "triggered", NULL, NULL,
> +static char *ziirave_reasons[] = {"power cycle", "hw watchdog", NULL, NULL,
> "host request", NULL, "illegal configuration",
> "illegal instruction", "illegal trap",
> "unknown"};
> --
> 2.1.4
>
Patch has been added to linux-watchdog-next.
Kind regards,
Wim.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-03-04 19:40 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-02-26 16:05 [PATCH] Rename "trigger" reset reason "hw watchdog" Martyn Welch
2016-02-27 1:45 ` Guenter Roeck
2016-03-04 19:40 ` Wim Van Sebroeck
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).