Re: [PATCH] watchdog: iTCO_wdt: Fix detection of SMI-off case
From: Jan Kiszka <jan.kiszka@siemens.com>
Date: 2021-08-30 19:48:07
Also in:
lkml
On 20.08.21 15:45, Jan Kiszka wrote:
On 26.07.21 13:46, Jan Kiszka wrote:quoted
From: Jan Kiszka <jan.kiszka@siemens.com> Obviously, the test needs to run against the register content, not its address. Fixes: cb011044e34c ("watchdog: iTCO_wdt: Account for rebooting on second timeout") Reported-by: Mantas Mikulėnas <redacted> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> --- drivers/watchdog/iTCO_wdt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)diff --git a/drivers/watchdog/iTCO_wdt.c b/drivers/watchdog/iTCO_wdt.c index b3f604669e2c..643c6c2d0b72 100644 --- a/drivers/watchdog/iTCO_wdt.c +++ b/drivers/watchdog/iTCO_wdt.c@@ -362,7 +362,7 @@ static int iTCO_wdt_set_timeout(struct watchdog_device *wd_dev, unsigned int t) * Otherwise, the BIOS generally reboots when the SMI triggers. */ if (p->smi_res && - (SMI_EN(p) & (TCO_EN | GBL_SMI_EN)) != (TCO_EN | GBL_SMI_EN)) + (inl(SMI_EN(p)) & (TCO_EN | GBL_SMI_EN)) != (TCO_EN | GBL_SMI_EN)) tmrval /= 2; /* from the specs: */Ping, this is still missing in master. Stable kernels had the revert, but 5.14 will need this.
Second reminder: 5.14 is out and now broken. Is the patch queued somewhere? I do not see it in the watchdog staging branch. Jan -- Siemens AG, T RDA IOT Corporate Competence Center Embedded Linux