From: Rasmus Villemoes <rasmus.villemoes@prevas.dk>
To: Wim Van Sebroeck <wim@iguana.be>,
Guenter Roeck <linux@roeck-us.net>,
Jonathan Corbet <corbet@lwn.net>
Cc: Sylvain Lemieux <slemieux.tyco@gmail.com>,
Rasmus Villemoes <rasmus.villemoes@prevas.dk>,
<linux-watchdog@vger.kernel.org>, <linux-doc@vger.kernel.org>,
<linux-kernel@vger.kernel.org>
Subject: [PATCH v4 3/3] watchdog: introduce CONFIG_WATCHDOG_OPEN_TIMEOUT
Date: Mon, 9 Jan 2017 16:02:33 +0100 [thread overview]
Message-ID: <1483974153-466-4-git-send-email-rasmus.villemoes@prevas.dk> (raw)
In-Reply-To: <1483974153-466-1-git-send-email-rasmus.villemoes@prevas.dk>
This allows setting a default value for the watchdog.open_timeout
commandline parameter via Kconfig.
Signed-off-by: Rasmus Villemoes <rasmus.villemoes@prevas.dk>
---
Documentation/watchdog/watchdog-parameters.txt | 9 +++++----
drivers/watchdog/Kconfig | 9 +++++++++
drivers/watchdog/watchdog_dev.c | 2 +-
3 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/Documentation/watchdog/watchdog-parameters.txt b/Documentation/watchdog/watchdog-parameters.txt
index 2ae0fdf..a688028 100644
--- a/Documentation/watchdog/watchdog-parameters.txt
+++ b/Documentation/watchdog/watchdog-parameters.txt
@@ -12,10 +12,11 @@ The watchdog core currently understands one parameter,
watchdog.open_timeout. This is the maximum time, in milliseconds, for
which the watchdog framework will take care of pinging a hardware
watchdog until userspace opens the corresponding /dev/watchdogN
-device. A value of 0 (the default) means an infinite timeout. Setting
-this to a non-zero value can be useful to ensure that either userspace
-comes up properly, or the board gets reset and allows fallback logic
-in the bootloader to try something else.
+device. The defalt value is CONFIG_WATCHDOG_OPEN_TIMEOUT. A value of 0
+means an infinite timeout. Setting this to a non-zero value can be
+useful to ensure that either userspace comes up properly, or the board
+gets reset and allows fallback logic in the bootloader to try
+something else.
-------------------------------------------------
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index acb00b5..8a847f7 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -52,6 +52,15 @@ config WATCHDOG_SYSFS
Say Y here if you want to enable watchdog device status read through
sysfs attributes.
+config WATCHDOG_OPEN_TIMEOUT
+ int "Timeout value for opening watchdog device"
+ default 0
+ help
+ The maximum time, in milliseconds, for which the watchdog
+ framework takes care of pinging a hardware watchdog. A value
+ of 0 means infinite. The value set here can be overridden by
+ the commandline parameter "watchdog.open_timeout".
+
#
# General Watchdog drivers
#
diff --git a/drivers/watchdog/watchdog_dev.c b/drivers/watchdog/watchdog_dev.c
index 8bc9f24..cc26c4d 100644
--- a/drivers/watchdog/watchdog_dev.c
+++ b/drivers/watchdog/watchdog_dev.c
@@ -81,7 +81,7 @@ static struct watchdog_core_data *old_wd_data;
static struct workqueue_struct *watchdog_wq;
-static unsigned open_timeout;
+static unsigned open_timeout = CONFIG_WATCHDOG_OPEN_TIMEOUT;
module_param(open_timeout, uint, 0644);
static bool watchdog_past_open_deadline(struct watchdog_core_data *data)
--
2.7.4
prev parent reply other threads:[~2017-01-09 15:15 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-09 15:02 [PATCH v4 0/3] watchdog: allow setting deadline for opening /dev/watchdogN Rasmus Villemoes
2017-01-09 15:02 ` [PATCH v4 1/3] watchdog: introduce watchdog_worker_should_ping helper Rasmus Villemoes
2017-01-09 15:02 ` [PATCH v4 2/3] watchdog: introduce watchdog.open_timeout commandline parameter Rasmus Villemoes
2017-01-10 18:08 ` Guenter Roeck
2017-01-11 8:11 ` Rasmus Villemoes
2017-01-11 11:02 ` Guenter Roeck
2017-01-13 9:11 ` Rasmus Villemoes
2017-01-30 10:33 ` Rasmus Villemoes
2017-01-09 15:02 ` Rasmus Villemoes [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1483974153-466-4-git-send-email-rasmus.villemoes@prevas.dk \
--to=rasmus.villemoes@prevas.dk \
--cc=corbet@lwn.net \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-watchdog@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=slemieux.tyco@gmail.com \
--cc=wim@iguana.be \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).