lupyuen/local-nuttx-update
1
0
Fork 0
forked from nuttx/nuttx-update
Code Pull requests Activity

timers/watchdog: configable keep alive interval

Browse source 
Change-Id: I519f5f9e0a8ab7ca298f834af20f7ad437ef92a4
Signed-off-by: chao.an <anchao@xiaomi.com>
This commit is contained in:
chao.an 2020-09-15 10:07:44 +08:00 committed by Xiang Xiao
parent 78005a4ba0
commit 8f52d4536c
2 changed files with 25 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/timers/Kconfig
View file

@ -326,6 +326,14 @@ config WATCHDOG_AUTOMONITOR_TIMEOUT
int "Auto-monitor reset timeout(second)"
default 60
config WATCHDOG_AUTOMONITOR_PING_INTERVAL
int "Auto-monitor keep a live interval"
default WATCHDOG_AUTOMONITOR_TIMEOUT
range 1 WATCHDOG_AUTOMONITOR_TIMEOUT
---help---
If the interval is same as WATCHDOG_AUTOMONITOR_TIMEOUT
the default value will change to (WATCHDOG_AUTOMONITOR_TIMEOUT / 2).
choice
prompt "Auto-monitor keepalive by"
default WATCHDOG_AUTOMONITOR_BY_TIMER

23
drivers/timers/watchdog.c
View file

@ -63,10 +63,21 @@
* Pre-processor Definitions
****************************************************************************/
#ifdef CONFIG_WATCHDOG_AUTOMONITOR
#define WATCHDOG_AUTOMONITOR_TIMEOUT_MSEC \
(1000 * CONFIG_WATCHDOG_AUTOMONITOR_TIMEOUT)
#define WATCHDOG_AUTOMONITOR_TIMEOUT_TICK \
SEC2TICK(CONFIG_WATCHDOG_AUTOMONITOR_TIMEOUT)
#if (CONFIG_WATCHDOG_AUTOMONITOR_TIMEOUT == \
CONFIG_WATCHDOG_AUTOMONITOR_PING_INTERVAL)
#define WATCHDOG_AUTOMONITOR_PING_INTERVAL \
SEC2TICK(CONFIG_WATCHDOG_AUTOMONITOR_TIMEOUT / 2)
#else
#define WATCHDOG_AUTOMONITOR_PING_INTERVAL \
SEC2TICK(CONFIG_WATCHDOG_AUTOMONITOR_PING_INTERVAL)
#endif
#endif
/****************************************************************************
* Private Type Definitions
@ -151,7 +162,7 @@ static void watchdog_automonitor_timer(wdparm_t arg)
if (upper->monitor)
{
lower->ops->keepalive(lower);
wd_start(&upper->wdog, WATCHDOG_AUTOMONITOR_TIMEOUT_TICK / 2,
wd_start(&upper->wdog, WATCHDOG_AUTOMONITOR_PING_INTERVAL,
watchdog_automonitor_timer, (wdparm_t)upper);
}
}
@ -165,7 +176,7 @@ static void watchdog_automonitor_worker(FAR void *arg)
{
lower->ops->keepalive(lower);
work_queue(LPWORK, &upper->work, watchdog_automonitor_worker,
upper, WATCHDOG_AUTOMONITOR_TIMEOUT_TICK / 2);
upper, WATCHDOG_AUTOMONITOR_PING_INTERVAL);
}
}
#elif defined(CONFIG_WATCHDOG_AUTOMONITOR_BY_IDLE)
@ -194,11 +205,11 @@ static void watchdog_automonitor_start(FAR struct watchdog_upperhalf_s
#if defined(CONFIG_WATCHDOG_AUTOMONITOR_BY_CAPTURE)
lower->ops->capture(lower, watchdog_automonitor_capture);
#elif defined(CONFIG_WATCHDOG_AUTOMONITOR_BY_TIMER)
wd_start(&upper->wdog, WATCHDOG_AUTOMONITOR_TIMEOUT_TICK / 2,
wd_start(&upper->wdog, WATCHDOG_AUTOMONITOR_PING_INTERVAL,
watchdog_automonitor_timer, (wdparm_t)upper);
#elif defined(CONFIG_WATCHDOG_AUTOMONITOR_BY_WORKER)
work_queue(LPWORK, &upper->work, watchdog_automonitor_worker,
upper, WATCHDOG_AUTOMONITOR_TIMEOUT_TICK / 2);
upper, WATCHDOG_AUTOMONITOR_PING_INTERVAL);
#elif defined(CONFIG_WATCHDOG_AUTOMONITOR_BY_IDLE)
upper->idle.notify = watchdog_automonitor_idle;
pm_register(&upper->idle);