From: "Wang, Peng 1. (NSB - CN/Hangzhou)" <peng.1.wang@nokia-sbell.com>
To: "wim@linux-watchdog.org" <wim@linux-watchdog.org>,
"linux@roeck-us.net" <linux@roeck-us.net>,
"linux-watchdog@vger.kernel.org" <linux-watchdog@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: [PATCH] watchdog: make DesignWare watchdog allow users to set bigger timeout value
Date: Wed, 20 Nov 2019 10:07:57 +0000 [thread overview]
Message-ID: <13477f08400047c1b32030b2680a4241@nokia-sbell.com> (raw)
From 1d051b7c081083751dc0bab97d3ab9efbba0f4a7 Mon Sep 17 00:00:00 2001
From: Peng Wang <peng.1.wang@nokia-sbell.com>
Date: Wed, 20 Nov 2019 15:12:59 +0800
Subject: [PATCH] watchdog: make DesignWare watchdog allow users to set bigger
timeout value
watchdog_dev.c provides means to allow users to set bigger timeout value
than HW can support, make DesignWare watchdog align with this.
Signed-off-by: Peng Wang <peng.1.wang@nokia-sbell.com>
---
drivers/watchdog/dw_wdt.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/drivers/watchdog/dw_wdt.c b/drivers/watchdog/dw_wdt.c
index fef7c61..8911e5e 100644
--- a/drivers/watchdog/dw_wdt.c
+++ b/drivers/watchdog/dw_wdt.c
@@ -113,8 +113,15 @@ static int dw_wdt_set_timeout(struct watchdog_device *wdd, unsigned int top_s)
*/
writel(top_val | top_val << WDOG_TIMEOUT_RANGE_TOPINIT_SHIFT,
dw_wdt->regs + WDOG_TIMEOUT_RANGE_REG_OFFSET);
-
- wdd->timeout = dw_wdt_top_in_seconds(dw_wdt, top_val);
+
+ /*
+ * In case users set bigger timeout value than HW can support,
+ * kernel(watchdog_dev.c) helps to feed watchdog before
+ * wdd->timeout
+ */
+ if ( wdd->timeout * 1000 <= wdd->max_hw_heartbeat_ms ) {
+ wdd->timeout = dw_wdt_top_in_seconds(dw_wdt, top_val);
+ }
return 0;
}
--
1.8.3.1
next reply other threads:[~2019-11-20 10:23 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-20 10:07 Wang, Peng 1. (NSB - CN/Hangzhou) [this message]
2019-11-20 17:15 ` [PATCH] watchdog: make DesignWare watchdog allow users to set bigger timeout value Guenter Roeck
2019-11-21 1:29 ` Wang, Peng 1. (NSB - CN/Hangzhou)
2019-11-21 3:40 ` Guenter Roeck
2019-11-21 8:07 ` Wang, Peng 1. (NSB - CN/Hangzhou)
2019-11-21 9:45 ` Guenter Roeck
2019-11-21 8:21 Wang, Peng 1. (NSB - CN/Hangzhou)
2019-11-21 9:56 ` Guenter Roeck
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=13477f08400047c1b32030b2680a4241@nokia-sbell.com \
--to=peng.1.wang@nokia-sbell.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-watchdog@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=wim@linux-watchdog.org \
/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).