2020-03-26 15:03:36

by Stefan Riedmüller

Subject: [PATCH 3/3] watchdog: da9062: No need to ping manually before setting timeout

There is actually no need to ping the watchdog before disabling it
during timeout change. Disabling the watchdog already takes care of
resetting the counter.

This fixes an issue during boot when the userspace watchdog handler takes
over and the watchdog is already running. Opening the watchdog in this case
leads to the first ping and directly after that without the required
heartbeat delay a second ping issued by the set_timeout call. Due to the
missing delay this resulted in a reset.

Signed-off-by: Stefan Riedmueller <[email protected]>
---
drivers/watchdog/da9062_wdt.c | 5 -----
1 file changed, 5 deletions(-)

diff --git a/drivers/watchdog/da9062_wdt.c b/drivers/watchdog/da9062_wdt.c
index 6d81b1276b87..c5bd075c8b14 100644
--- a/drivers/watchdog/da9062_wdt.c
+++ b/drivers/watchdog/da9062_wdt.c
@@ -66,11 +66,6 @@ static int da9062_wdt_update_timeout_register(struct da9062_watchdog *wdt,
unsigned int regval)
{
struct da9062 *chip = wdt->hw;
- int ret;
-
- ret = da9062_reset_watchdog_timer(wdt);
- if (ret)
- return ret;

regmap_update_bits(chip->regmap,
DA9062AA_CONTROL_D,
--
2.23.0

2020-03-31 16:12:40

by Guenter Roeck

Subject: Re: [PATCH 3/3] watchdog: da9062: No need to ping manually before setting timeout

On 3/26/20 8:02 AM, Stefan Riedmueller wrote:
> There is actually no need to ping the watchdog before disabling it
> during timeout change. Disabling the watchdog already takes care of
> resetting the counter.
>
> This fixes an issue during boot when the userspace watchdog handler takes
> over and the watchdog is already running. Opening the watchdog in this case
> leads to the first ping and directly after that without the required
> heartbeat delay a second ping issued by the set_timeout call. Due to the
> missing delay this resulted in a reset.
>
> Signed-off-by: Stefan Riedmueller <[email protected]>

Makes sense to me.

Reviewed-by: Guenter Roeck <[email protected]>

Guenter

> ---
> drivers/watchdog/da9062_wdt.c | 5 -----
> 1 file changed, 5 deletions(-)
>
> diff --git a/drivers/watchdog/da9062_wdt.c b/drivers/watchdog/da9062_wdt.c
> index 6d81b1276b87..c5bd075c8b14 100644
> --- a/drivers/watchdog/da9062_wdt.c
> +++ b/drivers/watchdog/da9062_wdt.c
> @@ -66,11 +66,6 @@ static int da9062_wdt_update_timeout_register(struct da9062_watchdog *wdt,
> unsigned int regval)
> {
> struct da9062 *chip = wdt->hw;
> - int ret;
> -
> - ret = da9062_reset_watchdog_timer(wdt);
> - if (ret)
> - return ret;
>
> regmap_update_bits(chip->regmap,
> DA9062AA_CONTROL_D,
>

2020-04-01 10:22:12

by Adam Thomson

Subject: RE: [PATCH 3/3] watchdog: da9062: No need to ping manually before setting timeout

On 26 March 2020 15:02, Stefan Riedmueller wrote:

> There is actually no need to ping the watchdog before disabling it
> during timeout change. Disabling the watchdog already takes care of
> resetting the counter.
>
> This fixes an issue during boot when the userspace watchdog handler takes
> over and the watchdog is already running. Opening the watchdog in this case
> leads to the first ping and directly after that without the required
> heartbeat delay a second ping issued by the set_timeout call. Due to the
> missing delay this resulted in a reset.
>
> Signed-off-by: Stefan Riedmueller <[email protected]>

Thanks for the update:

Reviewed-by: Adam Thomson <[email protected]>

> ---
> drivers/watchdog/da9062_wdt.c | 5 -----
> 1 file changed, 5 deletions(-)
>
> diff --git a/drivers/watchdog/da9062_wdt.c b/drivers/watchdog/da9062_wdt.c
> index 6d81b1276b87..c5bd075c8b14 100644
> --- a/drivers/watchdog/da9062_wdt.c
> +++ b/drivers/watchdog/da9062_wdt.c
> @@ -66,11 +66,6 @@ static int da9062_wdt_update_timeout_register(struct
> da9062_watchdog *wdt,
> unsigned int regval)
> {
> struct da9062 *chip = wdt->hw;
> - int ret;
> -
> - ret = da9062_reset_watchdog_timer(wdt);
> - if (ret)
> - return ret;
>
> regmap_update_bits(chip->regmap,
> DA9062AA_CONTROL_D,
> --
> 2.23.0