[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <0e37c448-26cc-7f4a-4f1a-598c595ce07e@siemens.com>
Date: Mon, 26 Jul 2021 14:05:39 +0200
From: Jan Kiszka <jan.kiszka@...mens.com>
To: Paolo Bonzini <pbonzini@...hat.com>,
Wim Van Sebroeck <wim@...ux-watchdog.org>,
Guenter Roeck <linux@...ck-us.net>
Cc: linux-watchdog@...r.kernel.org,
Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
Christian Storm <christian.storm@...mens.com>,
Andy Shevchenko <andy.shevchenko@...il.com>,
Mantas Mikulėnas <grawity@...il.com>,
stable <stable@...r.kernel.org>
Subject: Re: [PATCH] watchdog: iTCO_wdt: Fix detection of SMI-off case
On 26.07.21 14:03, Paolo Bonzini wrote:
> On 26/07/21 13:46, Jan Kiszka wrote:
>> From: Jan Kiszka <jan.kiszka@...mens.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@...il.com>
>> Signed-off-by: Jan Kiszka <jan.kiszka@...mens.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: */
>>
>
> Reviewed-by: Paolo Bonzini <pbonzini@...hat.com>
> Cc: stable@...r.kernel.org
>
> (the latter because cb011044e34c has been picked up by stable kernels
> already).
>
Thanks. Originally wanted to add stable myself, but I'm still unsure
whether this is the privilege of the subsystem maintainer or should also
be done by contributors.
Jan
--
Siemens AG, T RDA IOT
Corporate Competence Center Embedded Linux
Powered by blists - more mailing lists