From: Stanislaw Gruszka <stanislaw.gruszka@linux.intel.com>
To: linux-usb@vger.kernel.org
Cc: Wentong Wu <wentong.wu@intel.com>,
Sakari Ailus <sakari.ailus@linux.intel.com>
Subject: [PATCH v2 3/3] usb: misc: ljca: print firmware version
Date: Wed, 6 Nov 2024 13:34:38 +0100 [thread overview]
Message-ID: <20241106123438.337117-3-stanislaw.gruszka@linux.intel.com> (raw)
In-Reply-To: <20241106123438.337117-1-stanislaw.gruszka@linux.intel.com>
For diagnostics purposes read firmware version from device
and print it to dmesg during initialization.
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Tested-by: Hans de Goede <hdegoede@redhat.com> # ThinkPad X1 Yoga Gen 8, ov2740
Signed-off-by: Stanislaw Gruszka <stanislaw.gruszka@linux.intel.com>
---
drivers/usb/misc/usb-ljca.c | 29 +++++++++++++++++++++++++++++
1 file changed, 29 insertions(+)
diff --git a/drivers/usb/misc/usb-ljca.c b/drivers/usb/misc/usb-ljca.c
index d9c21f783055..e698a1075a40 100644
--- a/drivers/usb/misc/usb-ljca.c
+++ b/drivers/usb/misc/usb-ljca.c
@@ -43,6 +43,7 @@ enum ljca_client_type {
/* MNG client commands */
enum ljca_mng_cmd {
+ LJCA_MNG_GET_VERSION = 1,
LJCA_MNG_RESET = 2,
LJCA_MNG_ENUM_GPIO = 4,
LJCA_MNG_ENUM_I2C = 5,
@@ -68,6 +69,13 @@ struct ljca_msg {
u8 data[] __counted_by(len);
} __packed;
+struct ljca_fw_version {
+ u8 major;
+ u8 minor;
+ __le16 patch;
+ __le16 build;
+} __packed;
+
struct ljca_i2c_ctr_info {
u8 id;
u8 capacity;
@@ -695,6 +703,25 @@ static int ljca_reset_handshake(struct ljca_adapter *adap)
return 0;
}
+static void ljca_print_fw_version(struct ljca_adapter *adap)
+{
+ struct ljca_fw_version version = {};
+ int ret;
+
+ ret = ljca_send(adap, LJCA_CLIENT_MNG, LJCA_MNG_GET_VERSION, NULL, 0,
+ (u8 *)&version, sizeof(version), true,
+ LJCA_WRITE_ACK_TIMEOUT_MS);
+
+ if (ret != sizeof(version)) {
+ dev_err(adap->dev, "Get version failed, ret: %d\n", ret);
+ return;
+ }
+
+ dev_info(adap->dev, "Firmware version: %d.%d.%d.%d\n",
+ version.major, version.minor,
+ le16_to_cpu(version.patch), le16_to_cpu(version.build));
+}
+
static int ljca_enumerate_clients(struct ljca_adapter *adap)
{
struct ljca_client *client, *next;
@@ -811,6 +838,8 @@ static int ljca_probe(struct usb_interface *interface,
if (ret)
goto err_free;
+ ljca_print_fw_version(adap);
+
/*
* This works around problems with ov2740 initialization on some
* Lenovo platforms. The autosuspend delay, has to be smaller than
--
2.34.1
next prev parent reply other threads:[~2024-11-06 12:34 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-06 12:34 [PATCH v2 1/3] usb: misc: ljca: move usb_autopm_put_interface() after wait for response Stanislaw Gruszka
2024-11-06 12:34 ` [PATCH v2 2/3] usb: misc: ljca: set small runtime autosuspend delay Stanislaw Gruszka
2024-11-06 13:33 ` Sakari Ailus
2024-11-06 12:34 ` Stanislaw Gruszka [this message]
2024-11-06 12:42 ` [PATCH v2 3/3] usb: misc: ljca: print firmware version Greg KH
2024-11-06 13:37 ` Sakari Ailus
2024-11-06 14:50 ` Stanislaw Gruszka
2024-11-07 4:21 ` Greg KH
2024-11-06 13:32 ` [PATCH v2 1/3] usb: misc: ljca: move usb_autopm_put_interface() after wait for response Sakari Ailus
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=20241106123438.337117-3-stanislaw.gruszka@linux.intel.com \
--to=stanislaw.gruszka@linux.intel.com \
--cc=linux-usb@vger.kernel.org \
--cc=sakari.ailus@linux.intel.com \
--cc=wentong.wu@intel.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