leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

watchdog: renesas_wdt: don't keep timer value during suspend/resume

Browse Source 
After discussing this mail thread [1] again, we concluded that giving
userspace enough time to prepare is our favourite option. So, do not
keep the time value when suspended but reset it when resuming.

[1] https://patchwork.kernel.org/patch/10252209/

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Reviewed-by: Fabrizio Castro <fabrizio.castro@bp.renesas.com>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org>
This commit is contained in:
Wolfram Sang 2018-12-04 13:01:46 +01:00 committed by Wim Van Sebroeck
parent 248e655b45
commit 9077123c68
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/watchdog/renesas_wdt.c
View File

@ -48,7 +48,6 @@ struct rwdt_priv {
void __iomem *base; void __iomem *base;
struct watchdog_device wdev; struct watchdog_device wdev;
unsigned long clk_rate; unsigned long clk_rate;
u16 time_left;
u8 cks; u8 cks;
}; };
@ -268,10 +267,9 @@ static int __maybe_unused rwdt_suspend(struct device *dev)
{ {
struct rwdt_priv *priv = dev_get_drvdata(dev); struct rwdt_priv *priv = dev_get_drvdata(dev);
if (watchdog_active(&priv->wdev)) { if (watchdog_active(&priv->wdev))
priv->time_left = readw(priv->base + RWTCNT);
rwdt_stop(&priv->wdev); rwdt_stop(&priv->wdev);
}
return 0; return 0;
} }
@ -279,10 +277,9 @@ static int __maybe_unused rwdt_resume(struct device *dev)
{ {
struct rwdt_priv *priv = dev_get_drvdata(dev); struct rwdt_priv *priv = dev_get_drvdata(dev);
if (watchdog_active(&priv->wdev)) { if (watchdog_active(&priv->wdev))
rwdt_start(&priv->wdev); rwdt_start(&priv->wdev);
rwdt_write(priv, priv->time_left, RWTCNT);
}
return 0; return 0;
} }