Hi,
On 4-Nov-24 9:50 AM, Stanislaw Gruszka wrote:
> For diagnostics purposes read firmware version from device
> and print it to dmesg during initialization.
>
> Signed-off-by: Stanislaw Gruszka <stanislaw.gruszka@xxxxxxxxxxxxxxx>
Thanks, patch looks good to me:
Reviewed-by: Hans de Goede <hdegoede@xxxxxxxxxx>
I have also given this a test run on a "ThinkPad X1 Yoga Gen 8" and
everything there works at least as well as before:
Tested-by: Hans de Goede <hdegoede@xxxxxxxxxx> # ThinkPad X1 Yoga Gen 8, ov2740
On this laptop the reported LJCA firmware version is:
[ 25.704000] ljca 3-8:1.0: Firmware version: 1.0.0.544
Regards,
Hans
> ---
> drivers/usb/misc/usb-ljca.c | 28 ++++++++++++++++++++++++++++
> 1 file changed, 28 insertions(+)
>
> diff --git a/drivers/usb/misc/usb-ljca.c b/drivers/usb/misc/usb-ljca.c
> index 062b7fb47114..0f8751c51bf6 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;
> @@ -694,6 +702,24 @@ 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;
> @@ -810,6 +836,8 @@ static int ljca_probe(struct usb_interface *interface,
> if (ret)
> goto err_free;
>
> + ljca_print_fw_version(adap);
> +
> pm_runtime_set_autosuspend_delay(&usb_dev->dev, 10);
> usb_enable_autosuspend(usb_dev);
>
