From: Liu Xinpeng <liuxp11@chinatelecom.cn>
To: wim@linux-watchdog.org, linux@roeck-us.net
Cc: linux-watchdog@vger.kernel.org, linux-kernel@vger.kernel.org,
Liu Xinpeng <liuxp11@chinatelecom.cn>
Subject: [PATCH v2 1/3] watchdog: wdat_wdg: Using the existed function to check parameter timeout
Date: Mon, 25 Apr 2022 16:22:10 +0800 [thread overview]
Message-ID: <1650874932-18407-2-git-send-email-liuxp11@chinatelecom.cn> (raw)
In-Reply-To: <1650874932-18407-1-git-send-email-liuxp11@chinatelecom.cn>
Setting up min_timeout, and determine if a timeout value is
invalid using watchdog_timeout_invalid.
Signed-off-by: Liu Xinpeng <liuxp11@chinatelecom.cn>
---
drivers/watchdog/wdat_wdt.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/watchdog/wdat_wdt.c b/drivers/watchdog/wdat_wdt.c
index 195c8c004b69..3040a0554055 100644
--- a/drivers/watchdog/wdat_wdt.c
+++ b/drivers/watchdog/wdat_wdt.c
@@ -14,6 +14,7 @@
#include <linux/watchdog.h>
#define MAX_WDAT_ACTIONS ACPI_WDAT_ACTION_RESERVED
+#define WDAT_TIMEOUT_MIN 1
/**
* struct wdat_instruction - Single ACPI WDAT instruction
@@ -344,6 +345,7 @@ static int wdat_wdt_probe(struct platform_device *pdev)
wdat->period = tbl->timer_period;
wdat->wdd.min_hw_heartbeat_ms = wdat->period * tbl->min_count;
wdat->wdd.max_hw_heartbeat_ms = wdat->period * tbl->max_count;
+ wdat->wdd.min_timeout = WDAT_TIMEOUT_MIN;
wdat->stopped_in_sleep = tbl->flags & ACPI_WDAT_STOPPED;
wdat->wdd.info = &wdat_wdt_info;
wdat->wdd.ops = &wdat_wdt_ops;
@@ -450,8 +452,7 @@ static int wdat_wdt_probe(struct platform_device *pdev)
* watchdog properly after it has opened the device. In some cases
* the BIOS default is too short and causes immediate reboot.
*/
- if (timeout * 1000 < wdat->wdd.min_hw_heartbeat_ms ||
- timeout * 1000 > wdat->wdd.max_hw_heartbeat_ms) {
+ if (watchdog_timeout_invalid(&wdat->wdd, timeout)) {
dev_warn(dev, "Invalid timeout %d given, using %d\n",
timeout, WDAT_DEFAULT_TIMEOUT);
timeout = WDAT_DEFAULT_TIMEOUT;
--
2.23.0
next prev parent reply other threads:[~2022-04-25 8:23 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-25 8:22 [PATCH v2 0/3] Impovements about acpi hardware watchdog Liu Xinpeng
2022-04-25 8:22 ` Liu Xinpeng [this message]
2022-04-26 3:04 ` [PATCH v2 1/3] watchdog: wdat_wdg: Using the existed function to check parameter timeout Tzung-Bi Shih
2022-04-26 3:35 ` Guenter Roeck
2022-04-25 8:22 ` [PATCH v2 2/3] watchdog: wdat_wdg: Stop watchdog when rebooting the system Liu Xinpeng
2022-04-25 8:22 ` [PATCH v2 3/3] watchdog: wdat_wdg: Stop watchdog when uninstalling module Liu Xinpeng
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=1650874932-18407-2-git-send-email-liuxp11@chinatelecom.cn \
--to=liuxp11@chinatelecom.cn \
--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
all inboxes | Powered by JetHome®