Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Fri, 7 Oct 2022 18:33:44 +0200
From:   Henning Schild <henning.schild@siemens.com>
To:     Guenter Roeck <linux@roeck-us.net>
Cc:     Wim Van Sebroeck <wim@linux-watchdog.org>,
        linux-watchdog@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH v2] watchdog: w83627hf_wdt: add bootstatus support
Message-ID: <20221007183344.3c5be2fd@md1za8fc.ad001.siemens.net>
In-Reply-To: <5262ef1c-ca81-f25e-e072-d39e9f5c9e53@roeck-us.net>
References: <20220824152448.7736-1-henning.schild@siemens.com>
        <20221007173607.5c15c18f@md1za8fc.ad001.siemens.net>
        <5262ef1c-ca81-f25e-e072-d39e9f5c9e53@roeck-us.net>
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?FYMRRESc7FQvJx2dYdb+E1GqkR3U9Pnb7wdJHO1jdkPRaJ+uPVsLknlhRr1d?=
 =?us-ascii?Q?OQr42UP1NhCoWOJkkI55a+8JDnK1qmv8vMgHBnyWF22dlmso5MdcgnfxlMWY?=
 =?us-ascii?Q?ArAEk8ZRPynNLh/3XMf0Ty9dM4BA/QI8UGvwCWlbdjaRJrgZecnNxehaz3Hq?=
 =?us-ascii?Q?6RGc7PfLGwtar7waQ4MbbedHPdthGmlEBmooHTRXOH1MYcMUsUyXIZetfWDG?=
 =?us-ascii?Q?MxZCp78EJnMahOAvvHq/7yNton6swwoia+UcKr72hUARovm8GxMQJIis9AIQ?=
 =?us-ascii?Q?iE3ULs/5Q9wz+V9PeR5sjDWq6OJPThIzo2QjFR0AEf9Pq6NOEoVC1H1KKGFt?=
 =?us-ascii?Q?qtHZFf1hg1O9jNjTdtpKPot7h5vCbFIJFGvvWft5zARUv2+XjdjXCV1rwTTp?=
 =?us-ascii?Q?tKuYkIpwlJa8aRl7RsRfXSHPQw+1I9GzM4dLPw9fu09AH0gs8j5iL4StAiT4?=
 =?us-ascii?Q?EG42cXxmrOCWaIzo3pk1WQplcg6zGzVnoEpi+Bu1o5aT0Mc8mSaeSWd98o5h?=
 =?us-ascii?Q?T2BnamjMRYogRzXCA6cOlnGhvFSXtKQG5qNefP0xhZuG760CCxxtT2QMV6kZ?=
 =?us-ascii?Q?+0gz/H4GMTEC3y/1kP7vjED7Awn39TiFs56o+OkO7oHr7jlQvTQjcujyI16F?=
 =?us-ascii?Q?vGC31eVP4LlJfUcU39Vtrrns4klSe1me8IFACaN/3kKSRnsWeayZpXYb9zlm?=
 =?us-ascii?Q?L1BHwK5uZ0dRBpnszagueKGr99kpqpxQtHKzSaxzMOAuGwKl3hxrWAowvodd?=
 =?us-ascii?Q?LuX5EAdZ33QuNTsHSVmBOnbHq27Y9TF2jBrz87bxBRiLqfsDtamEfWAr8NMu?=
 =?us-ascii?Q?QMakno6hDPwvahRejOY9/Em+tQo+kHYSgGnbAnBFaKAR+rE4RNryPn6TMLx4?=
 =?us-ascii?Q?/wD4V9p4KwG+Y1fyqGAqw96uI6Yzhfe/qGZUyghcmKV0hu+oT4ph32D7u12j?=
 =?us-ascii?Q?66Mq2fvhhej5evOMX2HE8Zy3APNep9Qx3Fgi2nehtjnfJqw4e/6CteoPtQeO?=
 =?us-ascii?Q?5hBMCZs9kR4eal4BLJuMW08E545EoqefMMHq0sp0uqqqZgpCPtzWqelfai8M?=
 =?us-ascii?Q?fDnr7c3qWmZjLjma0tJ8T0Fuq6lsLBi8rpEBTUB2FQtMNYRNSjGZCBz8RFAd?=
 =?us-ascii?Q?iiIyYhcupdXhuJEA95uCqmUK4ZpjoJkVcKgDRQ5mAvzMigKtVhsMy11xujrS?=
 =?us-ascii?Q?HdRfXriOzdy9UkNZI162R+peoFMxh4ovNDwYxV/dbQUC7beHmKr3e9IqBJ/e?=
 =?us-ascii?Q?J60z3BCv/UjobprTCaS0zC6nHlFCpk5MDZxiCus0V1E5lVXV8sTtTq1jnrQO?=
 =?us-ascii?Q?CwLbG5l4R0Vuz5FFqxKYhlOIXX+k7E/YsHuKjyq/gPoFR6xMJQzOnLf/ObhG?=
 =?us-ascii?Q?o3JpIisAd3gZrmt4sPxI5dVVr7fTbAOS6DvC7E/P4hnXNQGwGj2PfT2JmBvx?=
 =?us-ascii?Q?4MD2hWzTzJxyBUzP5xlPyA0/37NgxaUTAegAP8c1qdyHPRdhTHsjaUtnrET0?=
 =?us-ascii?Q?dilCT7h21PvPQ9ca9x0pv0WXsERrzhe9DAKOqGYoAzuSXBz108h4wMDkbcc8?=
 =?us-ascii?Q?i7srfl+eZnI8zQWaxNXN2RkSjkbVELD/jtYB3TNLIkNR/36hIO5URXYZlIiK?=
 =?us-ascii?Q?mw=3D=3D?=
X-OriginatorOrg: siemens.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 5aa84620-68f0-4b24-03a4-08daa881c07e
X-MS-Exchange-CrossTenant-AuthSource: PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Oct 2022 16:34:06.1327
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: zfKiU3M/NWbk7hhgEG0sWefO1PYq1ourvNskno1yfTUjDaF5B6h4FX9xS+zkunnIuK9fgBOSdRHC+UlPh3tLw7BWBhys3h4xd1C3nlkpGmY=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8PR10MB3912
X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIMWL_WL_MED,
        DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO,
        RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_NONE
        autolearn=no autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Am Fri, 7 Oct 2022 08:51:05 -0700
schrieb Guenter Roeck <linux@roeck-us.net>:

> On 10/7/22 08:36, Henning Schild wrote:
> > Ping.
> >   
> 
> The patch is queued in my watchdog-next branch. We'll see
> if Wim will pick it up in his pull request for 6.1. If not,
> try again after the commit window closes.

Thanks for the update.

regards,
Henning

> Guenter
> 
> > Henning
> > 
> > Am Wed, 24 Aug 2022 17:24:48 +0200
> > schrieb Henning Schild <henning.schild@siemens.com>:
> >   
> >> The status bit in the status and control register can tell us
> >> whether the last reboot was caused by the watchdog. Make sure to
> >> take that into the bootstatus before clearing it.
> >>
> >> Reviewed-by: Guenter Roeck <linux@roeck-us.net>
> >> Signed-off-by: Henning Schild <henning.schild@siemens.com>
> >> ---
> >>   drivers/watchdog/w83627hf_wdt.c | 12 ++++++++++--
> >>   1 file changed, 10 insertions(+), 2 deletions(-)
> >>
> >> diff --git a/drivers/watchdog/w83627hf_wdt.c
> >> b/drivers/watchdog/w83627hf_wdt.c index 56a4a4030ca9..bc33b63c5a5d
> >> 100644 --- a/drivers/watchdog/w83627hf_wdt.c
> >> +++ b/drivers/watchdog/w83627hf_wdt.c
> >> @@ -113,6 +113,10 @@ MODULE_PARM_DESC(early_disable, "Disable
> >> watchdog at boot time (default=0)"); #define W836X7HF_WDT_CSR
> >> 0xf7 #define NCT6102D_WDT_CSR	0xf2
> >>   
> >> +#define WDT_CSR_STATUS		0x10
> >> +#define WDT_CSR_KBD		0x40
> >> +#define WDT_CSR_MOUSE		0x80
> >> +
> >>   static void superio_outb(int reg, int val)
> >>   {
> >>   	outb(reg, WDT_EFER);
> >> @@ -244,8 +248,12 @@ static int w83627hf_init(struct
> >> watchdog_device *wdog, enum chips chip) t =
> >> superio_inb(cr_wdt_control) & ~0x0C; superio_outb(cr_wdt_control,
> >> t); 
> >> -	/* reset trigger, disable keyboard & mouse turning off
> >> watchdog */
> >> -	t = superio_inb(cr_wdt_csr) & ~0xD0;
> >> +	t = superio_inb(cr_wdt_csr);
> >> +	if (t & WDT_CSR_STATUS)
> >> +		wdog->bootstatus |= WDIOF_CARDRESET;
> >> +
> >> +	/* reset status, disable keyboard & mouse turning off
> >> watchdog */
> >> +	t &= ~(WDT_CSR_STATUS | WDT_CSR_KBD | WDT_CSR_MOUSE);
> >>   	superio_outb(cr_wdt_csr, t);
> >>   
> >>   	superio_exit();  
> >   
>