From: Jan Kiszka <jan.kiszka@siemens.com>
To: Wim Van Sebroeck <wim@linux-watchdog.org>,
Guenter Roeck <linux@roeck-us.net>
Cc: linux-watchdog@vger.kernel.org,
"Linux Kernel Mailing List" <linux-kernel@vger.kernel.org>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Christian Storm" <christian.storm@siemens.com>,
"Andy Shevchenko" <andy.shevchenko@gmail.com>,
"Mantas Mikulėnas" <grawity@gmail.com>
Subject: Re: [PATCH] watchdog: iTCO_wdt: Fix detection of SMI-off case
Date: Mon, 30 Aug 2021 21:47:44 +0200 [thread overview]
Message-ID: <85c2c85e-147c-b54e-e84d-10b989610979@siemens.com> (raw)
In-Reply-To: <1444efd5-b778-949b-34e8-99d2541350e9@siemens.com>
On 20.08.21 15:45, Jan Kiszka wrote:
> On 26.07.21 13:46, Jan Kiszka wrote:
>> 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 <grawity@gmail.com>
>> 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
next prev parent reply other threads:[~2021-08-30 19:48 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-26 11:46 [PATCH] watchdog: iTCO_wdt: Fix detection of SMI-off case Jan Kiszka
2021-07-26 12:01 ` Andy Shevchenko
2021-07-26 12:04 ` Jan Kiszka
2021-07-26 13:40 ` Andy Shevchenko
2021-07-26 13:59 ` Guenter Roeck
2021-07-26 14:05 ` Jan Kiszka
2021-07-26 14:51 ` Andy Shevchenko
2021-07-26 17:10 ` Jan Kiszka
2021-07-26 21:45 ` Andy Shevchenko
2021-07-26 12:03 ` Paolo Bonzini
2021-07-26 12:05 ` Jan Kiszka
2021-07-26 13:51 ` Guenter Roeck
2021-07-26 13:44 ` Guenter Roeck
2021-07-26 16:59 ` Mantas Mikulėnas
2021-08-20 13:45 ` Jan Kiszka
2021-08-30 19:47 ` Jan Kiszka [this message]
2021-08-30 20:00 ` Guenter Roeck
2021-09-07 20:14 ` Wim Van Sebroeck
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=85c2c85e-147c-b54e-e84d-10b989610979@siemens.com \
--to=jan.kiszka@siemens.com \
--cc=andy.shevchenko@gmail.com \
--cc=christian.storm@siemens.com \
--cc=grawity@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-watchdog@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=pbonzini@redhat.com \
--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;
as well as URLs for NNTP newsgroup(s).