From patchwork Fri Nov 25 22:12:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Patchwork-Id: 26148 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp4321910wrr; Fri, 25 Nov 2022 14:22:21 -0800 (PST) X-Google-Smtp-Source: AA0mqf5ilDqULuvix52WH6+N5poooK4d1nSc05f7Ma7y4bzV9y+b1uEEhV1BddA8Twkjapqx+0lO X-Received: by 2002:a63:1345:0:b0:476:f92f:69f0 with SMTP id 5-20020a631345000000b00476f92f69f0mr36271721pgt.463.1669414941066; Fri, 25 Nov 2022 14:22:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669414941; cv=none; d=google.com; s=arc-20160816; b=aA4NItySm8+J4gH+obB+B+xcyaBbgsueTpB2Et6MWlswKWVDWcIuhEfBGJvammkiu+ 2yKqJPeZBBGiV9OwLdUTaFc+b+SIcAQOqvJr6KfDa5srGJM4OQUnpav1cFyvAzLM5wOs RYFaa732xgsBUxWOj/bRTeWp7Gs+Yt4G5u5OvrXbMflhUGECsJYRAPqCeUQXnoWRIrMo QcPSDz3grWtztgNBb+tDK2I9IzqunXe2Q5rYxuIQ4vPUtXsl4s+3O38ZUWNaGma38h50 41fF3tL1CK+vBvIRqs2VX8n33DCSY5vlASNFP/G/yqcLmZ40iBjZTRRUePR8erqxiDYw fKhA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:dkim-signature:from; bh=K4IAKf2TpGopTLeNyOmD9WECvpGwdoIr0gOMyySpGfo=; b=PobGKhn4CKIsSLBXKKTEjHrAzjDhYGFsRCGpsrbz9x6DMFRlFkgUBaJ3y886MydqgY 9JO5xPMTNrVtFMu1dhaA84OkE022+rCkDR/i7Q/FF0zshe1Cw9yTtSYbuVs4ouSZdTHO gqMLrCQBExZFAWfnAZNkkazOkvDcWzmzXmQHMk6bQ82SKqKtL4RPz84/uFmPreErvLWW NvdcJo8y/QYoPcdg1HWJOayw3aMvCfX0c9KOrkvxMiXkfTYsq7evFU/22VfV6JwSDiiY hM+r5Lf8tHwjljFJDDaIrIoEMNCeXH3mNa/RLOLqNEjd042L6Oq01FNvNDxhFl5xsycl PV6Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@weissschuh.net header.s=mail header.b=WWd7lWBv; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id iz19-20020a170902ef9300b00186ff4b98a1si4636472plb.208.2022.11.25.14.22.07; Fri, 25 Nov 2022 14:22:21 -0800 (PST) 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; Authentication-Results: mx.google.com; dkim=fail header.i=@weissschuh.net header.s=mail header.b=WWd7lWBv; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229981AbiKYWNK (ORCPT + 99 others); Fri, 25 Nov 2022 17:13:10 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34052 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229582AbiKYWNH (ORCPT ); Fri, 25 Nov 2022 17:13:07 -0500 Received: from todd.t-8ch.de (todd.t-8ch.de [159.69.126.157]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1517842F44; Fri, 25 Nov 2022 14:13:06 -0800 (PST) From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=weissschuh.net; s=mail; t=1669414385; bh=NfUto/kzlGw7QHSzrLivwzsVm6hp5+hYlxlAfPABAnI=; h=From:To:Cc:Subject:Date:From; b=WWd7lWBvowcsIikThTmnOXlnYwynrPcLwnppPw0yImf4GvfuduUsJmDn1kgCbJznt J/ZeY3tMTsq+tIwbOnDIb2cXevzqfubexuvT3Mhq3IbFPUVCblF+VuAq0t0Qg4PU7W xQoLKWYMMbQkO4XZsC1ccGowNBsGwlkkGftG/C04= To: Wim Van Sebroeck , Guenter Roeck Cc: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= , linux-watchdog@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] watchdog: iTCO_wdt: Report firmware_version Date: Fri, 25 Nov 2022 23:12:40 +0100 Message-Id: <20221125221240.2818-1-linux@weissschuh.net> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1669414358; l=1055; i=linux@weissschuh.net; s=20211113; h=from:subject; bh=NfUto/kzlGw7QHSzrLivwzsVm6hp5+hYlxlAfPABAnI=; b=uNXqCS0UWqAIrG2vVVtC5eltvZg0V3ncodM13d8rBmRdDxpQNf0X7CfA59zsC/6N2t/Fa019XPT6 pw1sOeKCAv42JnYEjiklvvL84B8Vrg6cbIxWNoV7AtiR2lzLEuTA X-Developer-Key: i=linux@weissschuh.net; a=ed25519; pk=9LP6KM4vD/8CwHW7nouRBhWLyQLcK1MkP6aTZbzUlj4= X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham 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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1750508440875691733?= X-GMAIL-MSGID: =?utf-8?q?1750508440875691733?= Synchronize the reported information in dmesg and the watchdog APIs. Signed-off-by: Thomas Weißschuh Reviewed-by: Guenter Roeck --- drivers/watchdog/iTCO_wdt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) base-commit: 0b1dcc2cf55ae6523c6fbd0d741b3ac28c9f4536 diff --git a/drivers/watchdog/iTCO_wdt.c b/drivers/watchdog/iTCO_wdt.c index 34693f11385f..9b3c9f8b0b93 100644 --- a/drivers/watchdog/iTCO_wdt.c +++ b/drivers/watchdog/iTCO_wdt.c @@ -437,11 +437,10 @@ static void iTCO_wdt_set_running(struct iTCO_wdt_private *p) * Kernel Interfaces */ -static const struct watchdog_info ident = { +static struct watchdog_info ident = { .options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING | WDIOF_MAGICCLOSE, - .firmware_version = 0, .identity = DRV_NAME, }; @@ -562,6 +561,7 @@ static int iTCO_wdt_probe(struct platform_device *pdev) break; } + ident.firmware_version = p->iTCO_version; p->wddev.info = &ident, p->wddev.ops = &iTCO_wdt_ops, p->wddev.bootstatus = 0;