FAILED: patch "[PATCH] watchdog: iTCO_wdt: Fix detection of SMI-off case" failed to apply to 5.4-stable tree
Subsystems (2)
[email protected]
maintainerThe patch below does not apply to the 5.4-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From aec42642d91fc86ddc03e97f0139c6c34ee6b6b1 Mon Sep 17 00:00:00 2001
From: Jan Kiszka <[email protected]>
Date: Mon, 26 Jul 2021 13:46:13 +0200
Subject: [PATCH] watchdog: iTCO_wdt: Fix detection of SMI-off case
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
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 <[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]>
Signed-off-by Guenter Roeck <[email protected]>
Signed-off-by Wim Van Sebroeck <[email protected]>
drivers/watchdog/iTCO_wdt.c +1 -1
@@ -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: */