From: Guenter Roeck <linux@roeck-us.net>
To: Zhu Ling <1536943441@qq.com>, linux-watchdog@vger.kernel.org
Cc: wim@linux-watchdog.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] watchdog: sbsa-gwdt: clamp timeout before updating wdd->timeout
Date: Wed, 17 Dec 2025 20:53:33 -0800 [thread overview]
Message-ID: <6fda7aa7-244a-4650-b120-acd66ca0d1c9@roeck-us.net> (raw)
In-Reply-To: <tencent_E88A86F3126F065BA4E3D4FC9CEB1A9A2406@qq.com>
On 12/17/25 18:31, Zhu Ling wrote:
> sbsa_gwdt_set_timeout() updates wdd->timeout before clamping the user
> requested value to the hardware-supported range. As a result,
> WDIOC_GETTIMEOUT and sysfs may report a timeout larger than what is
> actually programmed into the hardware.
>
> Clamp the timeout first and then update wdd->timeout so that
> userspace-visible values always reflect the effective hardware
> timeout.
>
> Signed-off-by: Zhu Ling <1536943441@qq.com>
> ---
> drivers/watchdog/sbsa_gwdt.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/watchdog/sbsa_gwdt.c b/drivers/watchdog/sbsa_gwdt.c
> index 6ce1bfb39..826469645 100644
> --- a/drivers/watchdog/sbsa_gwdt.c
> +++ b/drivers/watchdog/sbsa_gwdt.c
> @@ -155,8 +155,8 @@ static int sbsa_gwdt_set_timeout(struct watchdog_device *wdd,
> {
> struct sbsa_gwdt *gwdt = watchdog_get_drvdata(wdd);
>
> - wdd->timeout = timeout;
> timeout = clamp_t(unsigned int, timeout, 1, wdd->max_hw_heartbeat_ms / 1000);
> + wdd->timeout = timeout;
>
> if (action)
> sbsa_gwdt_reg_write((u64)gwdt->clk * timeout, gwdt);
This is wrong. With max_hw_heartbeat_ms set, the timeout value is not limited to
the hardware timeout and becomes a virtual timeout. If it is larger than the
maximum hardware timeout, the watchdog core will issue any necessary heartbeats.
The current code is perfectly correct.
NACK.
Guenter
next prev parent reply other threads:[~2025-12-18 4:53 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-12-18 2:31 Zhu Ling
2025-12-18 4:53 ` Guenter Roeck [this message]
[not found] ` <tencent_8FC8A3A9BF39EB3529C9320DFC259E0CE607@qq.com>
2025-12-19 15:41 ` 回复: " 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=6fda7aa7-244a-4650-b120-acd66ca0d1c9@roeck-us.net \
--to=linux@roeck-us.net \
--cc=1536943441@qq.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-watchdog@vger.kernel.org \
--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®