diff options
| author | gonzo <gonzo@FreeBSD.org> | 2013-10-22 05:22:46 +0000 |
|---|---|---|
| committer | gonzo <gonzo@FreeBSD.org> | 2013-10-22 05:22:46 +0000 |
| commit | 4939585cd7eacd0ccb0f9708e5f6e4aad8fa150d (patch) | |
| tree | 97df8d29dbbcc942c8bca29c9c544fb8a28948a9 /sys/arm/allwinner | |
| parent | 10d2c4a76670d6817f4a18a0f2b36c436fc44c11 (diff) | |
| download | FreeBSD-src-4939585cd7eacd0ccb0f9708e5f6e4aad8fa150d.zip FreeBSD-src-4939585cd7eacd0ccb0f9708e5f6e4aad8fa150d.tar.gz | |
Make watchdog function conform watchdog(9):
Set error to 0 when watchdog is armed and disable it when timeout
is too large to be set.
Diffstat (limited to 'sys/arm/allwinner')
| -rw-r--r-- | sys/arm/allwinner/a10_wdog.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/sys/arm/allwinner/a10_wdog.c b/sys/arm/allwinner/a10_wdog.c index 0563601..f951936 100644 --- a/sys/arm/allwinner/a10_wdog.c +++ b/sys/arm/allwinner/a10_wdog.c @@ -150,6 +150,18 @@ a10wd_watchdog_fn(void *private, u_int cmd, int *error) (wd_intervals[i].value << WDOG_MODE_INTVL_SHIFT) | WDOG_MODE_EN | WDOG_MODE_RST_EN); WRITE(sc, WDOG_CTRL, WDOG_CTRL_RESTART); + *error = 0; + } + else { + /* + * Can't arm + * disable watchdog as watchdog(9) requires + */ + device_printf(sc->dev, + "Can't arm, timeout is more than 16 sec\n"); + mtx_unlock(&sc->mtx); + WRITE(sc, WDOG_MODE, 0); + return; } } else |
