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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 228D9C4167B for ; Sat, 26 Nov 2022 01:00:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230129AbiKZBAj (ORCPT ); Fri, 25 Nov 2022 20:00:39 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35596 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229791AbiKZBAi (ORCPT ); Fri, 25 Nov 2022 20:00:38 -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 47ED35C766; Fri, 25 Nov 2022 17:00:37 -0800 (PST) Date: Sat, 26 Nov 2022 02:00:22 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=weissschuh.net; s=mail; t=1669424435; bh=rXjagKwTcr7jMoqYUXokXRrApWW+/3FnY8ZTEVqckRE=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=Yft8KfRBaW4GhHhcIgu4xU/M/pvfufLBN6ChBY7hkEjLPrN+7Ur0/t2+hcbQMCTfR P+Fq9iu9XHElI0ZF1EukjKEyNXGEpnZjpkSvRSocehn/U4WmB6FnvXxjOrc8lGg1Z4 mmEsUMnq/ihk1f/8n/W6rbIdJOV2HGvVZ9Mn//Bk= From: Thomas =?utf-8?Q?Wei=C3=9Fschuh?= To: Guenter Roeck Cc: Wim Van Sebroeck , linux-watchdog@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] watchdog: Report firmware_version in sysfs Message-ID: References: <20221125222315.4925-1-linux@weissschuh.net> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: Jabber-ID: thomas@t-8ch.de X-Accept: text/plain, text/html;q=0.2, text/*;q=0.1 X-Accept-Language: en-us, en;q=0.8, de-de;q=0.7, de;q=0.6 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2022-11-25 16:37-0800, Guenter Roeck wrote: > On 11/25/22 14:23, Thomas Weißschuh wrote: >> 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 >> >> --- >> >> Userspace implementation: >> >> https://github.com/util-linux/util-linux/pull/1927 >> --- >> drivers/watchdog/watchdog_dev.c | 10 ++++++++++ >> 1 file changed, 10 insertions(+) >> >> diff --git a/drivers/watchdog/watchdog_dev.c b/drivers/watchdog/watchdog_dev.c >> index 55574ed42504..88c76e27873c 100644 >> --- a/drivers/watchdog/watchdog_dev.c >> +++ b/drivers/watchdog/watchdog_dev.c >> @@ -555,6 +555,15 @@ static ssize_t identity_show(struct device *dev, struct device_attribute *attr, >> } >> static DEVICE_ATTR_RO(identity); >> +static ssize_t firmware_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(firmware_version); >> + >> static ssize_t state_show(struct device *dev, struct device_attribute *attr, >> char *buf) >> { >> @@ -618,6 +627,7 @@ static umode_t wdt_is_visible(struct kobject *kobj, struct attribute *attr, >> static struct attribute *wdt_attrs[] = { >> &dev_attr_state.attr, >> &dev_attr_identity.attr, >> + &dev_attr_firmware_version.attr, >> &dev_attr_timeout.attr, >> &dev_attr_min_timeout.attr, >> &dev_attr_max_timeout.attr, >> >> base-commit: 0b1dcc2cf55ae6523c6fbd0d741b3ac28c9f4536 > > I think this conflicts with drivers/watchdog/ziirave_wdt.c which generates its own > firmnware_version attribute. Indeed, thanks for the catch. We probably can't change the attribute from ziirave_wdt, which is a bit unfortunate as "firmware_version" would nicely match the name from "struct watchdog_info". How about "fw_version"? That would match the naming of sysfs attributes from a bunch of other subsystems. And obviously an addition to Documentation/ABI/testing/sysfs-class-watchdog is also missing from the patch. I'll add it in v2. Thomas