Skip to content

Commit

Permalink
watchdog: iTCO_wdt: Fix detection of SMI-off case
Browse files Browse the repository at this point in the history
Obviously, the test needs to run against the register content, not its
address.

Fixes: cb01104 ("watchdog: iTCO_wdt: Account for rebooting on second timeout")
Cc: [email protected]
Reported-by: Mantas Mikulėnas <[email protected]>
Signed-off-by: Jan Kiszka <[email protected]>
Reviewed-by: Paolo Bonzini <[email protected]>
Reviewed-by: Guenter Roeck <[email protected]>
Tested-by: Mantas Mikulėnas <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Guenter Roeck <[email protected]>
Signed-off-by: Wim Van Sebroeck <[email protected]>
  • Loading branch information
jan-kiszka authored and Wim Van Sebroeck committed Aug 22, 2021
1 parent a4f9581 commit aec4264
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/watchdog/iTCO_wdt.c
Original file line number Diff line number Diff line change
Expand Up @@ -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: */
Expand Down

0 comments on commit aec4264

Please sign in to comment.