From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.2 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9E993C433EF for ; Tue, 7 Sep 2021 20:24:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8A31061131 for ; Tue, 7 Sep 2021 20:24:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346394AbhIGUZG (ORCPT ); Tue, 7 Sep 2021 16:25:06 -0400 Received: from infomag.iguana.be ([185.87.124.46]:42222 "EHLO infomag.iguana.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232456AbhIGUZE (ORCPT ); Tue, 7 Sep 2021 16:25:04 -0400 X-Greylist: delayed 565 seconds by postgrey-1.27 at vger.kernel.org; Tue, 07 Sep 2021 16:25:03 EDT Received: by infomag.iguana.be (Postfix, from userid 1001) id 1408D603CACE; Tue, 7 Sep 2021 22:14:29 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 infomag.iguana.be 1408D603CACE DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=iguana.be; s=infomag-20180602; t=1631045669; bh=Wq1Ut3kmDA4Qs1MUa9QhyW5dfF/rigDOl+Eh9VKTXik=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=swsLaixR7nTIu8HccvB8qTzPt89gCreJJaG+BOPsOl0p/RPbkRFuB8Z5fPidYJZlt idzkIvBFM5IdATAWY3xfEPBCarsU90heHYzxVQjO7JnzpfRhYU31Vym1OyuTbR9c9S Ska3mtf0sSKvu3JLmlvv0Lr8yMBEw7vH5/3bZc8k= Date: Tue, 7 Sep 2021 22:14:29 +0200 From: Wim Van Sebroeck To: Guenter Roeck Cc: Jan Kiszka , Wim Van Sebroeck , linux-watchdog@vger.kernel.org, Linux Kernel Mailing List , Paolo Bonzini , Christian Storm , Andy Shevchenko , Mantas =?utf-8?Q?Mikul=C4=97nas?= Subject: Re: [PATCH] watchdog: iTCO_wdt: Fix detection of SMI-off case Message-ID: <20210907201428.GA1109@infomag.iguana.be> References: <1444efd5-b778-949b-34e8-99d2541350e9@siemens.com> <85c2c85e-147c-b54e-e84d-10b989610979@siemens.com> <904ea225-e7de-a11a-419a-0c7ac05e9b6e@roeck-us.net> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <904ea225-e7de-a11a-419a-0c7ac05e9b6e@roeck-us.net> User-Agent: Mutt/1.5.21 (2010-09-15) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi All, > On 8/30/21 12:47 PM, Jan Kiszka wrote: > >On 20.08.21 15:45, Jan Kiszka wrote: > >>On 26.07.21 13:46, Jan Kiszka wrote: > >>>From: Jan Kiszka > >>> > >>>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 > >>>Signed-off-by: Jan Kiszka > >>>--- > >>> 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. > > > > I had it in my own watchdog-next branch for about a month. > Usually Wim picks it up from there or from the mainling list; > he handles all upstreaming. Wim ? This one is in linux-watchdog-next since 22 Aug. Working on getting it upstream now. Kind regards, Wim.