summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOleksij Rempel <o.rempel@pengutronix.de>2018-03-13 09:33:27 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2018-03-23 07:35:25 +0100
commit10e3166076f7de31126761aa0e271415d9b9a023 (patch)
tree0eb045271fbd9c804b9ddd87b3dac3ed7d9ccf57
parente22f2aa1671159b2a5dfc276f2bd913aa3e1022e (diff)
downloadbarebox-10e3166076f7de31126761aa0e271415d9b9a023.tar.gz
barebox-10e3166076f7de31126761aa0e271415d9b9a023.tar.xz
watchdog: provide timeout_cur value
timeout_cur will be used for watchdog poller. Provided values should be good enough for most users and still can be changed for separate projects and fit to needed requirements. Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r--drivers/watchdog/wd_core.c18
-rw-r--r--include/watchdog.h1
2 files changed, 19 insertions, 0 deletions
diff --git a/drivers/watchdog/wd_core.c b/drivers/watchdog/wd_core.c
index 845234114d..425e78551a 100644
--- a/drivers/watchdog/wd_core.c
+++ b/drivers/watchdog/wd_core.c
@@ -31,6 +31,16 @@ static const char *watchdog_name(struct watchdog *wd)
return "unknown";
}
+static int watchdog_set_cur(struct param_d *param, void *priv)
+{
+ struct watchdog *wd = priv;
+
+ if (wd->timeout_cur > wd->timeout_max)
+ return -EINVAL;
+
+ return 0;
+}
+
static int watchdog_register_dev(struct watchdog *wd, const char *name, int id)
{
wd->dev.parent = wd->hwdev;
@@ -63,11 +73,19 @@ int watchdog_register(struct watchdog *wd)
if (!wd->timeout_max)
wd->timeout_max = 60 * 60 * 24;
+ if (!wd->timeout_cur || wd->timeout_cur > wd->timeout_max)
+ wd->timeout_cur = wd->timeout_max;
+
p = dev_add_param_uint32_ro(&wd->dev, "timeout_max",
&wd->timeout_max, "%u");
if (IS_ERR(p))
return PTR_ERR(p);
+ p = dev_add_param_uint32(&wd->dev, "timeout_cur", watchdog_set_cur, NULL,
+ &wd->timeout_cur, "%u", wd);
+ if (IS_ERR(p))
+ return PTR_ERR(p);
+
list_add_tail(&wd->list, &watchdog_list);
pr_debug("registering watchdog %s with priority %d\n", watchdog_name(wd),
diff --git a/include/watchdog.h b/include/watchdog.h
index a2459d2551..2f1874c196 100644
--- a/include/watchdog.h
+++ b/include/watchdog.h
@@ -20,6 +20,7 @@ struct watchdog {
struct device_d dev;
unsigned int priority;
unsigned int timeout_max;
+ unsigned int timeout_cur;
struct list_head list;
};