From patchwork Mon Dec 19 21:30:39 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: 34786 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:e747:0:0:0:0:0 with SMTP id c7csp2629498wrn; Mon, 19 Dec 2022 13:42:27 -0800 (PST) X-Google-Smtp-Source: AMrXdXv0/9nzcsmHJEoHtRIR/izY2Stygrj67BIg8gHSMlBO3sTism8kbZZxwcLUT0uNDYNxJUKJ X-Received: by 2002:a05:6a20:a5a0:b0:b0:3512:4d5e with SMTP id bc32-20020a056a20a5a000b000b035124d5emr7709995pzb.18.1671486146786; Mon, 19 Dec 2022 13:42:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671486146; cv=none; d=google.com; s=arc-20160816; b=JWy26eUrWp6gJwB/z1XMtzYEeon4rA1wj2zIs5S8qfIc1y9319WJKmzx2vMcmJqYtA P5GyTZ17AK7T2VryiNmpVI3sP+1Lhszm9+DPajhSJNjMX3SF0+pPqk2PyyKK+EoASge/ DWqep5xn+O+FkXKqHToDzCdp+16tw46ZC0R/wWfATeRtvCNfvB9nKyZ3v9g6dQNGtRAl g3gMt2nHCVT32XXzlc5QqEWc4qlHnti/DK3Eui2hJAho2P1HXu+dCbNqIkmRtgUWXhgl j5Sxt3DnOzdrfxQqyjZP8fs3DKlvyJI5ZHq4vXTmb5EpmIF934YQ3geZ5P/WGQV1wjKs FbzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:dkim-signature :from; bh=vnij9Uq1JQomBjKNI/4DDKyKSRH90h3viDpZM6pfxsA=; b=ZbOkFtmxr9roVdia3tqfC3WdDigTEfaByLy9s50FCPrIubd801EPTOc2PKK569kW0K trU8Jmm3w/vbZVNAYfEoAYhp6AKDlkYilH3hcxa+iiMvEVGcqZPOh60JhoydEaausgJZ EPfMu5dPR8Rpil+jrzSmoMU3Nb5qHNG7/+vobh9G0NMMWg9BG1LyxcXfgdAkic3vI7PQ rSdWDejTLG2i55xcHq11FT3oP2DEdGYwCVf/qJjkx7naK9wWm+pdhUtkiRPqnUtm6k2a DCkUgJBH8stdrcsq3+Z283UuMo8klWk79y3My9mK/90BiMNG3+wrxq6cos46+4SURwvQ yXsA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@weissschuh.net header.s=mail header.b=fpxDsYoz; 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 i7-20020a632207000000b004790794f31csi11323195pgi.588.2022.12.19.13.42.13; Mon, 19 Dec 2022 13:42:26 -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=fpxDsYoz; 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 S230007AbiLSVbE (ORCPT + 99 others); Mon, 19 Dec 2022 16:31:04 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51566 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232758AbiLSVa4 (ORCPT ); Mon, 19 Dec 2022 16:30:56 -0500 Received: from todd.t-8ch.de (todd.t-8ch.de [IPv6:2a01:4f8:c010:41de::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9CE3FF000; Mon, 19 Dec 2022 13:30:53 -0800 (PST) From: Thomas =?utf-8?q?Wei=C3=9Fschuh?= DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=weissschuh.net; s=mail; t=1671485451; bh=Fa2g4bN8T2fJYrUVKPR4XgCbGFZG+GXnu+qNhNRb8TY=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=fpxDsYozRYo3qwQv2CmVeB30VH6EARsb/FDKl7bpuGIxk0QdukCg9yRrE3bw2ZR4f 7jhvPYHHqr9C03xGUmKS5LPdTJSF449ylieKpqMwqEC5c73AuULQqzAMrdYsZSNg8p /sHtgCP0PEniouX/1W5hxUDXPajEP/gtW2e9jnbE= Date: Mon, 19 Dec 2022 21:30:39 +0000 Subject: [PATCH v2 1/2] watchdog: report fw_version in sysfs MIME-Version: 1.0 Message-Id: <20221216-watchdog-sysfs-v2-1-6189311103a9@weissschuh.net> References: <20221216-watchdog-sysfs-v2-0-6189311103a9@weissschuh.net> In-Reply-To: <20221216-watchdog-sysfs-v2-0-6189311103a9@weissschuh.net> To: Wim Van Sebroeck , Guenter Roeck Cc: linux-kernel@vger.kernel.org, linux-watchdog@vger.kernel.org, Thomas =?utf-8?q?Wei=C3=9Fschuh?= , Wim Van Sebroeck X-Mailer: b4 0.11.0-dev-e429b X-Developer-Signature: v=1; a=ed25519-sha256; t=1671485447; l=2245; i=linux@weissschuh.net; s=20221212; h=from:subject:message-id; bh=Fa2g4bN8T2fJYrUVKPR4XgCbGFZG+GXnu+qNhNRb8TY=; b=sCZpnkOKFcDJi8tGB+H4kXRfBbuz9WDBTrHxyu3nrYHimprtleLfDr9n0lte5G7aFjVs4R7xAmFX fm/6zbqKB45EHzrSZjiObLpAzRr1qgCKLcN8AMMFGum6scfYht2B X-Developer-Key: i=linux@weissschuh.net; a=ed25519; pk=KcycQgFPX2wGR5azS7RhpBqedglOZVgRPfdFSPB1LNw= X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,SPF_HELO_NONE,SPF_PASS 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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1752680257697399193?= X-GMAIL-MSGID: =?utf-8?q?1752680257697399193?= This synchronizes the information reported by ioctl and sysfs. The mismatch is confusing because "wdctl" from util-linux uses the ioctl when used with root privileges and sysfs without. The file is called "fw_version" instead of "firmware_version" as "firmware_version" is already used as custom attribute by single drivers. Signed-off-by: Thomas Weißschuh Reviewed-by: Guenter Roeck --- Documentation/ABI/testing/sysfs-class-watchdog | 7 +++++++ drivers/watchdog/watchdog_dev.c | 10 ++++++++++ 2 files changed, 17 insertions(+) diff --git a/Documentation/ABI/testing/sysfs-class-watchdog b/Documentation/ABI/testing/sysfs-class-watchdog index 585caecda3a5..27c000238fe4 100644 --- a/Documentation/ABI/testing/sysfs-class-watchdog +++ b/Documentation/ABI/testing/sysfs-class-watchdog @@ -6,6 +6,13 @@ Description: device at boot. It is equivalent to WDIOC_GETBOOTSTATUS of ioctl interface. +What: /sys/class/watchdog/watchdogn/fw_version +Date: April 2023 +Contact: Thomas Weißschuh +Description: + It is a read only file. It contains firmware version of + watchdog device. + What: /sys/class/watchdog/watchdogn/identity Date: August 2015 Contact: Wim Van Sebroeck diff --git a/drivers/watchdog/watchdog_dev.c b/drivers/watchdog/watchdog_dev.c index 55574ed42504..7feeda02a531 100644 --- a/drivers/watchdog/watchdog_dev.c +++ b/drivers/watchdog/watchdog_dev.c @@ -546,6 +546,15 @@ static ssize_t pretimeout_show(struct device *dev, } static DEVICE_ATTR_RO(pretimeout); +static ssize_t fw_version_show(struct device *dev, struct device_attribute *attr, + char *buf) +{ + struct watchdog_device *wdd = dev_get_drvdata(dev); + + return sysfs_emit(buf, "%d\n", wdd->info->firmware_version); +} +static DEVICE_ATTR_RO(fw_version); + static ssize_t identity_show(struct device *dev, struct device_attribute *attr, char *buf) { @@ -617,6 +626,7 @@ static umode_t wdt_is_visible(struct kobject *kobj, struct attribute *attr, } static struct attribute *wdt_attrs[] = { &dev_attr_state.attr, + &dev_attr_fw_version.attr, &dev_attr_identity.attr, &dev_attr_timeout.attr, &dev_attr_min_timeout.attr, From patchwork Mon Dec 19 21:30: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: 34785 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:e747:0:0:0:0:0 with SMTP id c7csp2629208wrn; Mon, 19 Dec 2022 13:41:35 -0800 (PST) X-Google-Smtp-Source: AMrXdXv6yGPD9wIr45mPaop/LcldVo4yROHXPSNmWQBnybnOfWLaYvBB9rMoePElwl2CkHZ2p09w X-Received: by 2002:a05:6a21:78a8:b0:b1:f593:e738 with SMTP id bf40-20020a056a2178a800b000b1f593e738mr2573209pzc.28.1671486095049; Mon, 19 Dec 2022 13:41:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671486095; cv=none; d=google.com; s=arc-20160816; b=XCE6mka4C5dC8zDwHNPICBRHW3t6lh3dgb6lvRsZZDhG55b57cBDrwOiCT/+QU1SJ0 I8BdJIyB3zTg4drdFp4HjgRXAYhbmHd8fL6673kaV4AbxaKqASQtrdQbQuhsg60k8647 WQJskoBm5m4hIBB/ownRITwLleqiLBWtB++MRXdXhWDTSI7d1spBFHBHfrZeWNUqMxaj ngdtEaiHzOluiJIBRCFi0HLt0325Mhfedot0MnJuKH86UrgWoG1QlEU255fK4DYaG+6u gzfGkL9tHgr7xsxt8Eo3SH+GHAIHf20/RcoyPoN4z+Pp/g2ozzlFIZY8faqIkZP8tavm aHmQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:dkim-signature :from; bh=tbQW7AUuET9dnNt7P9Vjjnsmh/pnY+RguokmC1C0PeU=; b=eWu9hfWhwnUMWLy24h2BnflAHX6DJ8Z3gX6A5bAEhRCk3l+AcKbtSMKia2gQZp8CV9 13Uf//1nde9gmhXDzo1K/qFwcsTVfTFVVi2odV1eTIuHNjeaFH3tQ8cpc+HSsm6lbGPl PWQkLfML1r5X3J2aYWalOPD4zTGkaZoo/w248xGqwkYD31Ynzlq1kO4/rC1SooGFRgN4 XfCSi3Dv1drxyyw//mioK/6GBtKltgF3cp+1D1MFSUr11GlKSp6ByONRwJvIxAdfBiB+ IuxlUzzBGSaVyDQND8V8JAKNvZ13uqhfL+glHTsdsuTctxI2s8BmtPczqgVyhqVY/EeP OENg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@weissschuh.net header.s=mail header.b=pV+JvrVk; 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 b2-20020a6567c2000000b0046b2ec0de65si11612467pgs.789.2022.12.19.13.41.22; Mon, 19 Dec 2022 13:41:35 -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=pV+JvrVk; 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 S232799AbiLSVbB (ORCPT + 99 others); Mon, 19 Dec 2022 16:31:01 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51562 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232716AbiLSVa4 (ORCPT ); Mon, 19 Dec 2022 16:30:56 -0500 Received: from todd.t-8ch.de (todd.t-8ch.de [159.69.126.157]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 63FCA65DC; Mon, 19 Dec 2022 13:30:53 -0800 (PST) From: Thomas =?utf-8?q?Wei=C3=9Fschuh?= DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=weissschuh.net; s=mail; t=1671485451; bh=0IcN0OcF0xL6oMTvYqLoBEg3dP+mgswr0WrxRfjY0gw=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=pV+JvrVke0VLSZmn1EquemCvnQURZvEce7oeAIm3vZb01hrYHvAI00uPprb7Au27l kcjAfVsLpaSt00SYz2/FY8Ef+EQoXKlQ7IX0qRgk7vMgoEH6rgUOMnqs0DA9WhHXID JxlRlu4z8ox5ATmR3RpFGUvqx544MJXzB1SBQBmc= Date: Mon, 19 Dec 2022 21:30:40 +0000 Subject: [PATCH v2 2/2] watchdog: report options in sysfs MIME-Version: 1.0 Message-Id: <20221216-watchdog-sysfs-v2-2-6189311103a9@weissschuh.net> References: <20221216-watchdog-sysfs-v2-0-6189311103a9@weissschuh.net> In-Reply-To: <20221216-watchdog-sysfs-v2-0-6189311103a9@weissschuh.net> To: Wim Van Sebroeck , Guenter Roeck Cc: linux-kernel@vger.kernel.org, linux-watchdog@vger.kernel.org, Thomas =?utf-8?q?Wei=C3=9Fschuh?= , Wim Van Sebroeck X-Mailer: b4 0.11.0-dev-e429b X-Developer-Signature: v=1; a=ed25519-sha256; t=1671485447; l=2062; i=linux@weissschuh.net; s=20221212; h=from:subject:message-id; bh=0IcN0OcF0xL6oMTvYqLoBEg3dP+mgswr0WrxRfjY0gw=; b=ylN4XsQM9WROkgQr2OO+yeRu5lAb1bc+2SnOBtHRva136jaCkqG9DXjVsNOuDb3yqb6aaz0lxw/i dOzMuSIdCSjA0DRmtkxhskp61P87QugqKpbxImBZ366gpreKEHzI X-Developer-Key: i=linux@weissschuh.net; a=ed25519; pk=KcycQgFPX2wGR5azS7RhpBqedglOZVgRPfdFSPB1LNw= X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,SPF_HELO_NONE,SPF_PASS 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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1752680203839367956?= X-GMAIL-MSGID: =?utf-8?q?1752680203839367956?= This synchronizes the information reported by ioctl and sysfs. The mismatch is confusing because "wdctl" from util-linux uses the ioctl when used with root privileges and sysfs without. Signed-off-by: Thomas Weißschuh --- Documentation/ABI/testing/sysfs-class-watchdog | 6 ++++++ drivers/watchdog/watchdog_dev.c | 10 ++++++++++ 2 files changed, 16 insertions(+) diff --git a/Documentation/ABI/testing/sysfs-class-watchdog b/Documentation/ABI/testing/sysfs-class-watchdog index 27c000238fe4..94fb74615951 100644 --- a/Documentation/ABI/testing/sysfs-class-watchdog +++ b/Documentation/ABI/testing/sysfs-class-watchdog @@ -6,6 +6,12 @@ Description: device at boot. It is equivalent to WDIOC_GETBOOTSTATUS of ioctl interface. +What: /sys/class/watchdog/watchdogn/options +Date: April 2023 +Contact: Thomas Weißschuh +Description: + It is a read only file. It contains options of watchdog device. + What: /sys/class/watchdog/watchdogn/fw_version Date: April 2023 Contact: Thomas Weißschuh diff --git a/drivers/watchdog/watchdog_dev.c b/drivers/watchdog/watchdog_dev.c index 7feeda02a531..2b06c179f754 100644 --- a/drivers/watchdog/watchdog_dev.c +++ b/drivers/watchdog/watchdog_dev.c @@ -546,6 +546,15 @@ static ssize_t pretimeout_show(struct device *dev, } static DEVICE_ATTR_RO(pretimeout); +static ssize_t options_show(struct device *dev, struct device_attribute *attr, + char *buf) +{ + struct watchdog_device *wdd = dev_get_drvdata(dev); + + return sysfs_emit(buf, "0x%x\n", wdd->info->options); +} +static DEVICE_ATTR_RO(options); + static ssize_t fw_version_show(struct device *dev, struct device_attribute *attr, char *buf) { @@ -626,6 +635,7 @@ static umode_t wdt_is_visible(struct kobject *kobj, struct attribute *attr, } static struct attribute *wdt_attrs[] = { &dev_attr_state.attr, + &dev_attr_options.attr, &dev_attr_fw_version.attr, &dev_attr_identity.attr, &dev_attr_timeout.attr,