shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-10 21:07:02 +09:00
Code Issues Packages Projects Releases Wiki Activity

FROMLIST: watchdog: dw: save/restore control and timeout across suspend/resume

Browse Source 
Some platforms lose this state in suspend. It should be safe to do this
unconditionally.

Signed-off-by: Brian Norris <briannorris@chromium.org>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
(am from https://patchwork.kernel.org/patch/10273165/)
Conflicts:
        small context changes

BUG=b:74204857
TEST=force watchdog event before/after suspend/resume on kevin and scarlet;
     check timing

Reviewed-on: https://chromium-review.googlesource.com/958089
Commit-Ready: Brian Norris <briannorris@chromium.org>
Tested-by: Brian Norris <briannorris@chromium.org>
Reviewed-by: Guenter Roeck <groeck@chromium.org>

Change-Id: I7a0e4d6c87ed3eeb3c41d9dcff014fd5f7cddef5
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
This commit is contained in:
Brian Norris
2018-03-09 17:49:21 -08:00
committed by Tao Huang
parent c7acb7de66
commit da72a45cf7
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/watchdog/dw_wdt.c
View File

@@ -68,6 +68,9 @@ static struct {
struct timer_list timer;
int expect_close;
struct notifier_block restart_handler;
/* Save/restore */
u32 control;
u32 timeout;
} dw_wdt;
static inline int dw_wdt_is_enabled(void)
@@ -301,6 +304,9 @@ static int dw_wdt_release(struct inode *inode, struct file *filp)
#ifdef CONFIG_PM_SLEEP
static int dw_wdt_suspend(struct device *dev)
{
dw_wdt.control = readl(dw_wdt.regs + WDOG_CONTROL_REG_OFFSET);
dw_wdt.timeout = readl(dw_wdt.regs + WDOG_TIMEOUT_RANGE_REG_OFFSET);
clk_disable_unprepare(dw_wdt.clk);
return 0;
@@ -313,6 +319,9 @@ static int dw_wdt_resume(struct device *dev)
if (err)
return err;
writel(dw_wdt.timeout, dw_wdt.regs + WDOG_TIMEOUT_RANGE_REG_OFFSET);
writel(dw_wdt.control, dw_wdt.regs + WDOG_CONTROL_REG_OFFSET);
dw_wdt_keepalive();
return 0;