2022-08-24 15:40:56

by Henning Schild

Subject: [PATCH v2] watchdog: w83627hf_wdt: add bootstatus support

The status bit in the status and control register can tell us whether
the last reboot was caused by the watchdog. Make sure to take that into
the bootstatus before clearing it.

Reviewed-by: Guenter Roeck <[email protected]>
Signed-off-by: Henning Schild <[email protected]>
---
drivers/watchdog/w83627hf_wdt.c | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/drivers/watchdog/w83627hf_wdt.c b/drivers/watchdog/w83627hf_wdt.c
index 56a4a4030ca9..bc33b63c5a5d 100644
--- a/drivers/watchdog/w83627hf_wdt.c
+++ b/drivers/watchdog/w83627hf_wdt.c
@@ -113,6 +113,10 @@ MODULE_PARM_DESC(early_disable, "Disable watchdog at boot time (default=0)");
#define W836X7HF_WDT_CSR 0xf7
#define NCT6102D_WDT_CSR 0xf2

+#define WDT_CSR_STATUS 0x10
+#define WDT_CSR_KBD 0x40
+#define WDT_CSR_MOUSE 0x80
+
static void superio_outb(int reg, int val)
{
outb(reg, WDT_EFER);
@@ -244,8 +248,12 @@ static int w83627hf_init(struct watchdog_device *wdog, enum chips chip)
t = superio_inb(cr_wdt_control) & ~0x0C;
superio_outb(cr_wdt_control, t);

- /* reset trigger, disable keyboard & mouse turning off watchdog */
- t = superio_inb(cr_wdt_csr) & ~0xD0;
+ t = superio_inb(cr_wdt_csr);
+ if (t & WDT_CSR_STATUS)
+ wdog->bootstatus |= WDIOF_CARDRESET;
+
+ /* reset status, disable keyboard & mouse turning off watchdog */
+ t &= ~(WDT_CSR_STATUS | WDT_CSR_KBD | WDT_CSR_MOUSE);
superio_outb(cr_wdt_csr, t);

superio_exit();
--
2.35.1

2022-08-24 15:42:50

by Henning Schild

Subject: Re: [PATCH v2] watchdog: w83627hf_wdt: add bootstatus support

Diff to v1:
- fixed typo in commit message
- add Reviewed-by tag
- make sure it still applies

Henning

Am Wed, 24 Aug 2022 17:24:48 +0200
schrieb Henning Schild <[email protected]>:

> The status bit in the status and control register can tell us whether
> the last reboot was caused by the watchdog. Make sure to take that
> into the bootstatus before clearing it.
>
> Reviewed-by: Guenter Roeck <[email protected]>
> Signed-off-by: Henning Schild <[email protected]>
> ---
> drivers/watchdog/w83627hf_wdt.c | 12 ++++++++++--
> 1 file changed, 10 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/watchdog/w83627hf_wdt.c
> b/drivers/watchdog/w83627hf_wdt.c index 56a4a4030ca9..bc33b63c5a5d
> 100644 --- a/drivers/watchdog/w83627hf_wdt.c
> +++ b/drivers/watchdog/w83627hf_wdt.c
> @@ -113,6 +113,10 @@ MODULE_PARM_DESC(early_disable, "Disable
> watchdog at boot time (default=0)"); #define W836X7HF_WDT_CSR
> 0xf7 #define NCT6102D_WDT_CSR 0xf2
>
> +#define WDT_CSR_STATUS 0x10
> +#define WDT_CSR_KBD 0x40
> +#define WDT_CSR_MOUSE 0x80
> +
> static void superio_outb(int reg, int val)
> {
> outb(reg, WDT_EFER);
> @@ -244,8 +248,12 @@ static int w83627hf_init(struct watchdog_device
> *wdog, enum chips chip) t = superio_inb(cr_wdt_control) & ~0x0C;
> superio_outb(cr_wdt_control, t);
>
> - /* reset trigger, disable keyboard & mouse turning off
> watchdog */
> - t = superio_inb(cr_wdt_csr) & ~0xD0;
> + t = superio_inb(cr_wdt_csr);
> + if (t & WDT_CSR_STATUS)
> + wdog->bootstatus |= WDIOF_CARDRESET;
> +
> + /* reset status, disable keyboard & mouse turning off
> watchdog */
> + t &= ~(WDT_CSR_STATUS | WDT_CSR_KBD | WDT_CSR_MOUSE);
> superio_outb(cr_wdt_csr, t);
>
> superio_exit();

2022-10-07 15:47:39

by Henning Schild

Subject: Re: [PATCH v2] watchdog: w83627hf_wdt: add bootstatus support

Ping.

Henning

Am Wed, 24 Aug 2022 17:24:48 +0200
schrieb Henning Schild <[email protected]>:

> The status bit in the status and control register can tell us whether
> the last reboot was caused by the watchdog. Make sure to take that
> into the bootstatus before clearing it.
>
> Reviewed-by: Guenter Roeck <[email protected]>
> Signed-off-by: Henning Schild <[email protected]>
> ---
> drivers/watchdog/w83627hf_wdt.c | 12 ++++++++++--
> 1 file changed, 10 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/watchdog/w83627hf_wdt.c
> b/drivers/watchdog/w83627hf_wdt.c index 56a4a4030ca9..bc33b63c5a5d
> 100644 --- a/drivers/watchdog/w83627hf_wdt.c
> +++ b/drivers/watchdog/w83627hf_wdt.c
> @@ -113,6 +113,10 @@ MODULE_PARM_DESC(early_disable, "Disable
> watchdog at boot time (default=0)"); #define W836X7HF_WDT_CSR
> 0xf7 #define NCT6102D_WDT_CSR 0xf2
>
> +#define WDT_CSR_STATUS 0x10
> +#define WDT_CSR_KBD 0x40
> +#define WDT_CSR_MOUSE 0x80
> +
> static void superio_outb(int reg, int val)
> {
> outb(reg, WDT_EFER);
> @@ -244,8 +248,12 @@ static int w83627hf_init(struct watchdog_device
> *wdog, enum chips chip) t = superio_inb(cr_wdt_control) & ~0x0C;
> superio_outb(cr_wdt_control, t);
>
> - /* reset trigger, disable keyboard & mouse turning off
> watchdog */
> - t = superio_inb(cr_wdt_csr) & ~0xD0;
> + t = superio_inb(cr_wdt_csr);
> + if (t & WDT_CSR_STATUS)
> + wdog->bootstatus |= WDIOF_CARDRESET;
> +
> + /* reset status, disable keyboard & mouse turning off
> watchdog */
> + t &= ~(WDT_CSR_STATUS | WDT_CSR_KBD | WDT_CSR_MOUSE);
> superio_outb(cr_wdt_csr, t);
>
> superio_exit();

2022-10-07 16:10:47

by Guenter Roeck

Subject: Re: [PATCH v2] watchdog: w83627hf_wdt: add bootstatus support

On 10/7/22 08:36, Henning Schild wrote:
> Ping.
>

The patch is queued in my watchdog-next branch. We'll see
if Wim will pick it up in his pull request for 6.1. If not,
try again after the commit window closes.

Guenter

> Henning
>
> Am Wed, 24 Aug 2022 17:24:48 +0200
> schrieb Henning Schild <[email protected]>:
>
>> The status bit in the status and control register can tell us whether
>> the last reboot was caused by the watchdog. Make sure to take that
>> into the bootstatus before clearing it.
>>
>> Reviewed-by: Guenter Roeck <[email protected]>
>> Signed-off-by: Henning Schild <[email protected]>
>> ---
>> drivers/watchdog/w83627hf_wdt.c | 12 ++++++++++--
>> 1 file changed, 10 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/watchdog/w83627hf_wdt.c
>> b/drivers/watchdog/w83627hf_wdt.c index 56a4a4030ca9..bc33b63c5a5d
>> 100644 --- a/drivers/watchdog/w83627hf_wdt.c
>> +++ b/drivers/watchdog/w83627hf_wdt.c
>> @@ -113,6 +113,10 @@ MODULE_PARM_DESC(early_disable, "Disable
>> watchdog at boot time (default=0)"); #define W836X7HF_WDT_CSR
>> 0xf7 #define NCT6102D_WDT_CSR 0xf2
>>
>> +#define WDT_CSR_STATUS 0x10
>> +#define WDT_CSR_KBD 0x40
>> +#define WDT_CSR_MOUSE 0x80
>> +
>> static void superio_outb(int reg, int val)
>> {
>> outb(reg, WDT_EFER);
>> @@ -244,8 +248,12 @@ static int w83627hf_init(struct watchdog_device
>> *wdog, enum chips chip) t = superio_inb(cr_wdt_control) & ~0x0C;
>> superio_outb(cr_wdt_control, t);
>>
>> - /* reset trigger, disable keyboard & mouse turning off
>> watchdog */
>> - t = superio_inb(cr_wdt_csr) & ~0xD0;
>> + t = superio_inb(cr_wdt_csr);
>> + if (t & WDT_CSR_STATUS)
>> + wdog->bootstatus |= WDIOF_CARDRESET;
>> +
>> + /* reset status, disable keyboard & mouse turning off
>> watchdog */
>> + t &= ~(WDT_CSR_STATUS | WDT_CSR_KBD | WDT_CSR_MOUSE);
>> superio_outb(cr_wdt_csr, t);
>>
>> superio_exit();
>

2022-10-07 17:01:23

by Henning Schild

Subject: Re: [PATCH v2] watchdog: w83627hf_wdt: add bootstatus support

Am Fri, 7 Oct 2022 08:51:05 -0700
schrieb Guenter Roeck <[email protected]>:

> On 10/7/22 08:36, Henning Schild wrote:
> > Ping.
> >
>
> The patch is queued in my watchdog-next branch. We'll see
> if Wim will pick it up in his pull request for 6.1. If not,
> try again after the commit window closes.

Thanks for the update.

regards,
Henning

> Guenter
>
> > Henning
> >
> > Am Wed, 24 Aug 2022 17:24:48 +0200
> > schrieb Henning Schild <[email protected]>:
> >
> >> The status bit in the status and control register can tell us
> >> whether the last reboot was caused by the watchdog. Make sure to
> >> take that into the bootstatus before clearing it.
> >>
> >> Reviewed-by: Guenter Roeck <[email protected]>
> >> Signed-off-by: Henning Schild <[email protected]>
> >> ---
> >> drivers/watchdog/w83627hf_wdt.c | 12 ++++++++++--
> >> 1 file changed, 10 insertions(+), 2 deletions(-)
> >>
> >> diff --git a/drivers/watchdog/w83627hf_wdt.c
> >> b/drivers/watchdog/w83627hf_wdt.c index 56a4a4030ca9..bc33b63c5a5d
> >> 100644 --- a/drivers/watchdog/w83627hf_wdt.c
> >> +++ b/drivers/watchdog/w83627hf_wdt.c
> >> @@ -113,6 +113,10 @@ MODULE_PARM_DESC(early_disable, "Disable
> >> watchdog at boot time (default=0)"); #define W836X7HF_WDT_CSR
> >> 0xf7 #define NCT6102D_WDT_CSR 0xf2
> >>
> >> +#define WDT_CSR_STATUS 0x10
> >> +#define WDT_CSR_KBD 0x40
> >> +#define WDT_CSR_MOUSE 0x80
> >> +
> >> static void superio_outb(int reg, int val)
> >> {
> >> outb(reg, WDT_EFER);
> >> @@ -244,8 +248,12 @@ static int w83627hf_init(struct
> >> watchdog_device *wdog, enum chips chip) t =
> >> superio_inb(cr_wdt_control) & ~0x0C; superio_outb(cr_wdt_control,
> >> t);
> >> - /* reset trigger, disable keyboard & mouse turning off
> >> watchdog */
> >> - t = superio_inb(cr_wdt_csr) & ~0xD0;
> >> + t = superio_inb(cr_wdt_csr);
> >> + if (t & WDT_CSR_STATUS)
> >> + wdog->bootstatus |= WDIOF_CARDRESET;
> >> +
> >> + /* reset status, disable keyboard & mouse turning off
> >> watchdog */
> >> + t &= ~(WDT_CSR_STATUS | WDT_CSR_KBD | WDT_CSR_MOUSE);
> >> superio_outb(cr_wdt_csr, t);
> >>
> >> superio_exit();
> >
>