mei: add optional timeout to internal bus recv
Subsystems (2)
PATCH 1/2 mei: add optional timeout to internal bus recv
From: Alexander Usyskin <[email protected]>
Add optional timeout to internal bus recv function to enable break out of internal flows in case of no answer from FW.
Signed-off-by Alexander Usyskin <[email protected]>
Signed-off-by Tomas Winkler <[email protected]>
--- drivers/misc/mei/bus-fixup.c | 2 +- drivers/misc/mei/bus.c | 36 ++++++++++++++++++++++++++---------- drivers/misc/mei/mei_dev.h | 2 +- 3 files changed, 28 insertions(+), 12 deletions(-)
drivers/misc/mei/bus-fixup.c +1 -1
@@ -266,7 +266,7 @@ static int mei_nfc_if_version(struct mei_cl *cl,return -ENOMEM ; ret =0 ; - bytes_recv =__mei_cl_recv (cl, (u8 *)reply, if_version_length,0 ); + bytes_recv =__mei_cl_recv (cl, (u8 *)reply, if_version_length,0 ,0 );if (bytes_recv < if_version_length) {dev_err (bus->dev,"Could not read IF version\n" ); ret = -EIO ;
drivers/misc/mei/bus.c +26 -10
@@ -116,11 +116,12 @@ ssize_t __mei_cl_send(struct mei_cl *cl, u8 *buf, size_t length,* @buf: buffer to receive * @length: buffer length * @mode: io mode +* @timeout: recv timeout, 0 for infinite timeout * * Return: read size in bytes of < 0 on error */ ssize_t __mei_cl_recv (struct mei_cl *cl,u8 *buf,size_t length, -unsigned int mode) +unsigned int mode,unsigned long timeout) {struct mei_device *bus;struct mei_cl_cb *cb;
@@ -158,13 +159,28 @@ ssize_t __mei_cl_recv(struct mei_cl *cl, u8 *buf, size_t length,mutex_unlock (&bus->device_lock); -if (wait_event_interruptible (cl->rx_wait, - (!list_empty (&cl->rd_completed)) || - (!mei_cl_is_connected (cl)))) { - -if (signal_pending (current)) -return -EINTR ; -return -ERESTARTSYS ; +if (timeout) { + rets =wait_event_interruptible_timeout + (cl->rx_wait, + (!list_empty (&cl->rd_completed)) || + (!mei_cl_is_connected (cl)), +msecs_to_jiffies (timeout)); +if (rets ==0 ) +return -ETIME ; +if (rets <0 ) { +if (signal_pending (current)) +return -EINTR ; +return -ERESTARTSYS ; + } + }else { +if (wait_event_interruptible + (cl->rx_wait, + (!list_empty (&cl->rd_completed)) || + (!mei_cl_is_connected (cl)))) { +if (signal_pending (current)) +return -EINTR ; +return -ERESTARTSYS ; + } }mutex_lock (&bus->device_lock);
@@ -231,7 +247,7 @@ ssize_t mei_cldev_recv_nonblock(struct mei_cl_device *cldev, u8 *buf, {struct mei_cl *cl = cldev->cl; -return __mei_cl_recv (cl, buf, length,MEI_CL_IO_RX_NONBLOCK ); +return __mei_cl_recv (cl, buf, length,MEI_CL_IO_RX_NONBLOCK ,0 ); }EXPORT_SYMBOL_GPL (mei_cldev_recv_nonblock);
@@ -248,7 +264,7 @@ ssize_t mei_cldev_recv(struct mei_cl_device *cldev, u8 *buf, size_t length) {struct mei_cl *cl = cldev->cl; -return __mei_cl_recv (cl, buf, length,0 ); +return __mei_cl_recv (cl, buf, length,0 ,0 ); }EXPORT_SYMBOL_GPL (mei_cldev_recv);
drivers/misc/mei/mei_dev.h +1 -1
@@ -317,7 +317,7 @@ void mei_cl_bus_dev_fixup(struct mei_cl_device *dev);ssize_t __mei_cl_send (struct mei_cl *cl,u8 *buf,size_t length,unsigned int mode);ssize_t __mei_cl_recv (struct mei_cl *cl,u8 *buf,size_t length, -unsigned int mode); +unsigned int mode,unsigned long timeout);bool mei_cl_bus_rx_event (struct mei_cl *cl);bool mei_cl_bus_notify_event (struct mei_cl *cl);void mei_cl_bus_remove_devices (struct mei_device *bus);
Signature · 1 line
2.14.4
PATCH 2/2 mei: expose fw version to sysfs
From: Alexander Usyskin <[email protected]>
The ME FW version is constantly used by detection and update tools. To improve the reliability and simplify these tools provide a sysfs interface to access version of the platform ME firmware in the following format:
<platform>:<major>.<minor>.<milestone>.<build>.
There can be up to three such blocks for different FW components.
Signed-off-by Alexander Usyskin <[email protected]>
Signed-off-by Tomas Winkler <[email protected]>
--- Documentation/ABI/testing/sysfs-class-mei | 11 ++++ drivers/misc/mei/bus-fixup.c | 86 ++++++++++++++++++++++++++++--- drivers/misc/mei/main.c | 30 ++++++++++- drivers/misc/mei/mei_dev.h | 25 ++++++++- 4 files changed, 144 insertions(+), 8 deletions(-)
Documentation/ABI/testing/sysfs-class-mei +11 -0
@@ -54,3 +54,14 @@ Description: Configure tx queue limit Set maximal number of pending writes per opened session. + +What: /sys/class/mei/meiN/fw_ver +Date: May 2018 +KernelVersion: 4.18 +Contact: Tomas Winkler <[email protected]> +Description: Display the ME firmware version. + + The version of the platform ME firmware is in format: + <platform>:<major>.<minor>.<milestone>.<build_no>. + There can be up to three such blocks for different + FW components.
drivers/misc/mei/bus-fixup.c +80 -6
116 lines not on this page · raw message
drivers/misc/mei/main.c +29 -1
@@ -1,7 +1,7 @@/* * * Intel Management Engine Interface (Intel MEI) Linux driver -* Copyright (c) 2003-2012, Intel Corporation. +* Copyright (c) 2003-2018, Intel Corporation. * * This program is free software; you can redistribute it and/or modify it * under the terms and conditions of the GNU General Public License,
@@ -812,11 +812,39 @@ static ssize_t tx_queue_limit_store(struct device *device, }static DEVICE_ATTR_RW (tx_queue_limit); +/** +* fw_ver_show - display ME FW version +* +* @device: device pointer +* @attr: attribute pointer +* @buf: char out buffer +* +* Return: number of the bytes printed into buf or error +*/ +static ssize_t fw_ver_show (struct device *device, +struct device_attribute *attr,char *buf) +{ +struct mei_device *dev =dev_get_drvdata (device); +struct mei_fw_version *ver; +ssize_t cnt =0 ; +int i; + + ver = dev->fw_ver; + +for (i =0 ; i <MEI_MAX_FW_VER_BLOCKS ; i++) + cnt +=scnprintf (buf + cnt,PAGE_SIZE - cnt,"%u:%u.%u.%u.%u\n" , + ver[i].platform, ver[i].major, ver[i].minor, + ver[i].hotfix, ver[i].buildno); +return cnt; +} +static DEVICE_ATTR_RO (fw_ver); +static struct attribute *mei_attrs[] = { &dev_attr_fw_status.attr, &dev_attr_hbm_ver.attr, &dev_attr_hbm_ver_drv.attr, &dev_attr_tx_queue_limit.attr, + &dev_attr_fw_ver.attr,NULL };ATTRIBUTE_GROUPS (mei);
drivers/misc/mei/mei_dev.h +24 -1
@@ -1,7 +1,7 @@/* * * Intel Management Engine Interface (Intel MEI) Linux driver -* Copyright (c) 2003-2012, Intel Corporation. +* Copyright (c) 2003-2018, Intel Corporation. * * This program is free software; you can redistribute it and/or modify it * under the terms and conditions of the GNU General Public License,
@@ -354,6 +354,25 @@ enum mei_pg_state {const char *mei_pg_state_str (enum mei_pg_state state); +/** +* struct mei_fw_version - MEI FW version struct +* +* @platform: platform identifier +* @major: major version field +* @minor: minor version field +* @buildno: build number version field +* @hotfix: hotfix number version field +*/ +struct mei_fw_version { +u8 platform; +u8 major; +u16 minor; +u16 buildno; +u16 hotfix; +}; + +#define MEI_MAX_FW_VER_BLOCKS 3 +/** * struct mei_device - MEI private device struct *
@@ -402,6 +421,8 @@ const char *mei_pg_state_str(enum mei_pg_state state);* @hbm_f_ie_supported : hbm feature immediate reply to enum request * @hbm_f_os_supported : hbm feature support OS ver message * +* @fw_ver : FW versions +* * @me_clients_rwsem: rw lock over me_clients list * @me_clients : list of FW clients * @me_clients_map : FW clients bit map
@@ -478,6 +499,8 @@ struct mei_device { unsigned int hbm_f_ie_supported:1; unsigned int hbm_f_os_supported:1; +struct mei_fw_version fw_ver[MEI_MAX_FW_VER_BLOCKS ]; +struct rw_semaphore me_clients_rwsem;struct list_head me_clients;DECLARE_BITMAP (me_clients_map,MEI_CLIENTS_MAX );
Signature · 1 line
2.14.4