From: Guenter Roeck <linux@roeck-us.net>
To: Andrey Smirnov <andrew.smirnov@gmail.com>
Cc: linux-watchdog@vger.kernel.org, Chris Healy <cphealy@gmail.com>,
Rick Ramstetter <rick@anteaterllc.com>,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH 5/5] watchdog: ziirave_wdt: Log bootloader/firmware info during probe
Date: Wed, 31 Jul 2019 14:44:07 -0700 [thread overview]
Message-ID: <20190731214407.GD17277@roeck-us.net> (raw)
In-Reply-To: <20190731174252.18041-6-andrew.smirnov@gmail.com>
On Wed, Jul 31, 2019 at 10:42:52AM -0700, Andrey Smirnov wrote:
> Log bootloader/firmware info during probe. This information is
> available via sysfs already, but it's really helpful to have this in
> kernel log during startup as well.
>
> Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
> Cc: Chris Healy <cphealy@gmail.com>
> Cc: Guenter Roeck <linux@roeck-us.net>
> Cc: Rick Ramstetter <rick@anteaterllc.com>
> Cc: linux-watchdog@vger.kernel.org
> Cc: linux-kernel@vger.kernel.org
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
> ---
> drivers/watchdog/ziirave_wdt.c | 18 +++++++++++++++---
> 1 file changed, 15 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/watchdog/ziirave_wdt.c b/drivers/watchdog/ziirave_wdt.c
> index 33c8d2eadada..84ba8820ac86 100644
> --- a/drivers/watchdog/ziirave_wdt.c
> +++ b/drivers/watchdog/ziirave_wdt.c
> @@ -68,6 +68,9 @@ static char *ziirave_reasons[] = {"power cycle", "hw watchdog", NULL, NULL,
> #define ZIIRAVE_CMD_JUMP_TO_BOOTLOADER 0x0c
> #define ZIIRAVE_CMD_DOWNLOAD_PACKET 0x0e
>
> +#define ZIIRAVE_FW_VERSION_FMT "02.%02u.%02u"
> +#define ZIIRAVE_BL_VERSION_FMT "01.%02u.%02u"
> +
> struct ziirave_wdt_rev {
> unsigned char major;
> unsigned char minor;
> @@ -482,7 +485,7 @@ static ssize_t ziirave_wdt_sysfs_show_firm(struct device *dev,
> if (ret)
> return ret;
>
> - ret = sprintf(buf, "02.%02u.%02u", w_priv->firmware_rev.major,
> + ret = sprintf(buf, ZIIRAVE_FW_VERSION_FMT, w_priv->firmware_rev.major,
> w_priv->firmware_rev.minor);
>
> mutex_unlock(&w_priv->sysfs_mutex);
> @@ -505,7 +508,7 @@ static ssize_t ziirave_wdt_sysfs_show_boot(struct device *dev,
> if (ret)
> return ret;
>
> - ret = sprintf(buf, "01.%02u.%02u", w_priv->bootloader_rev.major,
> + ret = sprintf(buf, ZIIRAVE_BL_VERSION_FMT, w_priv->bootloader_rev.major,
> w_priv->bootloader_rev.minor);
>
> mutex_unlock(&w_priv->sysfs_mutex);
> @@ -572,7 +575,8 @@ static ssize_t ziirave_wdt_sysfs_store_firm(struct device *dev,
> goto unlock_mutex;
> }
>
> - dev_info(&client->dev, "Firmware updated to version 02.%02u.%02u\n",
> + dev_info(&client->dev,
> + "Firmware updated to version " ZIIRAVE_FW_VERSION_FMT "\n",
> w_priv->firmware_rev.major, w_priv->firmware_rev.minor);
>
> /* Restore the watchdog timeout */
> @@ -706,6 +710,10 @@ static int ziirave_wdt_probe(struct i2c_client *client,
> return ret;
> }
>
> + dev_info(&client->dev,
> + "Firmware version: " ZIIRAVE_FW_VERSION_FMT "\n",
> + w_priv->firmware_rev.major, w_priv->firmware_rev.minor);
> +
> ret = ziirave_wdt_revision(client, &w_priv->bootloader_rev,
> ZIIRAVE_WDT_BOOT_VER_MAJOR);
> if (ret) {
> @@ -713,6 +721,10 @@ static int ziirave_wdt_probe(struct i2c_client *client,
> return ret;
> }
>
> + dev_info(&client->dev,
> + "Bootloader version: " ZIIRAVE_BL_VERSION_FMT "\n",
> + w_priv->bootloader_rev.major, w_priv->bootloader_rev.minor);
> +
> w_priv->reset_reason = i2c_smbus_read_byte_data(client,
> ZIIRAVE_WDT_RESET_REASON);
> if (w_priv->reset_reason < 0) {
> --
> 2.21.0
>
next prev parent reply other threads:[~2019-07-31 21:44 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-31 17:42 [PATCH 0/5] Ziirave_wdt driver fixes Andrey Smirnov
2019-07-31 17:42 ` [PATCH 1/5] watchdog: ziirave_wdt: Add missing newline Andrey Smirnov
2019-07-31 21:42 ` Guenter Roeck
2019-07-31 17:42 ` [PATCH 2/5] watchdog: ziirave_wdt: Be verbose about errors in probe() Andrey Smirnov
2019-07-31 21:42 ` Guenter Roeck
2019-07-31 17:42 ` [PATCH 3/5] watchdog: ziirave_wdt: Be more verbose during firmware update Andrey Smirnov
2019-07-31 21:43 ` Guenter Roeck
2019-07-31 17:42 ` [PATCH 4/5] watchdog: ziirave_wdt: Don't bail out on unexpected timeout value Andrey Smirnov
2019-07-31 18:09 ` Guenter Roeck
2019-08-10 21:17 ` Andrey Smirnov
2019-08-02 20:49 ` Guenter Roeck
2019-07-31 17:42 ` [PATCH 5/5] watchdog: ziirave_wdt: Log bootloader/firmware info during probe Andrey Smirnov
2019-07-31 21:44 ` Guenter Roeck [this message]
2019-07-31 18:11 ` [PATCH 0/5] Ziirave_wdt driver fixes Guenter Roeck
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190731214407.GD17277@roeck-us.net \
--to=linux@roeck-us.net \
--cc=andrew.smirnov@gmail.com \
--cc=cphealy@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-watchdog@vger.kernel.org \
--cc=rick@anteaterllc.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).