mei: revamp client disconnection flow
Subsystems (2)
PATCH RESEND 1/9 mei: revamp client disconnection flow
Split disconnected state into two parts first reception disconnect response from the firmware and second actually setting of disconnected state. Book keeping data are needed for processing and after firmware disconnected the client and are cleaned when setting the disconnected state in mei_cl_set_disconneted() function.
Add mei_cl_send_disconnect to reduce code duplication.
--- drivers/misc/mei/bus.c | 2 - drivers/misc/mei/client.c | 159 ++++++++++++++++++++++++++++++++----------- drivers/misc/mei/client.h | 3 + drivers/misc/mei/hbm.c | 8 +-- drivers/misc/mei/interrupt.c | 46 +------------ drivers/misc/mei/main.c | 9 +-- drivers/misc/mei/mei_dev.h | 3 +- 7 files changed, 134 insertions(+), 96 deletions(-)
drivers/misc/mei/bus.c +0 -2
@@ -480,8 +480,6 @@ int mei_cl_disable_device(struct mei_cl_device *device) goto out; } - cl->state =MEI_FILE_DISCONNECTING ; - err =mei_cl_disconnect (cl);if (err <0 ) {dev_err (dev->dev,"Could not disconnect from the ME client" );
drivers/misc/mei/client.c +121 -38
238 lines not on this page · raw message
drivers/misc/mei/client.h +3 -0
@@ -105,6 +105,9 @@ static inline bool mei_cl_is_connected(struct mei_cl *cl)bool mei_cl_is_other_connecting (struct mei_cl *cl);int mei_cl_disconnect (struct mei_cl *cl); +void mei_cl_set_disconnected (struct mei_cl *cl); +int mei_cl_irq_disconnect (struct mei_cl *cl,struct mei_cl_cb *cb, +struct mei_cl_cb *cmpl_list);int mei_cl_connect (struct mei_cl *cl,struct file *file);int mei_cl_read_start (struct mei_cl *cl,size_t length,struct file *fp); int mei_cl_irq_read_msg(struct mei_cl *cl, struct mei_msg_hdr *hdr,
drivers/misc/mei/hbm.c +4 -4
@@ -572,7 +572,7 @@ static void mei_hbm_cl_disconnect_res(struct mei_device *dev, struct mei_cl *cl,cl_dbg (dev, cl,"hbm: disconnect response status=%d\n" , rs->status);if (rs->status ==MEI_CL_DISCONN_SUCCESS ) - cl->state =MEI_FILE_DISCONNECTED ; + cl->state =MEI_FILE_DISCONNECT_REPLY ; cl->status =0 ; }
@@ -611,7 +611,7 @@ static void mei_hbm_cl_connect_res(struct mei_device *dev, struct mei_cl *cl,if (rs->status ==MEI_CL_CONN_SUCCESS ) cl->state =MEI_FILE_CONNECTED ;else - cl->state =MEI_FILE_DISCONNECTED ; + cl->state =MEI_FILE_DISCONNECT_REPLY ; cl->status =mei_cl_conn_status_to_errno (rs->status); }
@@ -680,8 +680,8 @@ static int mei_hbm_fw_disconnect_req(struct mei_device *dev, cl =mei_hbm_cl_find_by_cmd (dev, disconnect_req);if (cl) { -cl_dbg (dev, cl,"disconnect request received\n" ); - cl->state =MEI_FILE_DISCONNECTED ; +cl_dbg (dev, cl,"fw disconnect request received\n" ); + cl->state =MEI_FILE_DISCONNECTING ; cl->timer_count =0 ; cb =mei_io_cb_init (cl,MEI_FOP_DISCONNECT_RSP ,NULL );
drivers/misc/mei/interrupt.c +1 -45
57 lines not on this page · raw message
drivers/misc/mei/main.c +3 -6
@@ -94,7 +94,7 @@ static int mei_release(struct inode *inode, struct file *file) {struct mei_cl *cl = file->private_data;struct mei_device *dev; -int rets =0 ; +int rets;if (WARN_ON (!cl || !cl->dev))return -ENODEV ;
@@ -106,11 +106,8 @@ static int mei_release(struct inode *inode, struct file *file) rets =mei_amthif_release (dev, file); goto out; } -if (mei_cl_is_connected (cl)) { - cl->state =MEI_FILE_DISCONNECTING ; -cl_dbg (dev, cl,"disconnecting\n" ); - rets =mei_cl_disconnect (cl); - } + rets =mei_cl_disconnect (cl); +mei_cl_flush_queues (cl, file);cl_dbg (dev, cl,"removing\n" );
drivers/misc/mei/mei_dev.h +2 -1
@@ -88,7 +88,8 @@ enum file_state {MEI_FILE_CONNECTING ,MEI_FILE_CONNECTED ,MEI_FILE_DISCONNECTING , - MEI_FILE_DISCONNECTED +MEI_FILE_DISCONNECT_REPLY , + MEI_FILE_DISCONNECTED, };/* MEI device states */
Signature · 1 line
2.1.0
PATCH v2 2/9 mei: revamp client connection
Simplify connect state machine by changing the logic around Connection request in progress - only check if we have a callback in relevant queue.
Extract common code into mei_cl_send_connect() function
---
V2: fix the conflict
drivers/misc/mei/bus.c | 6 +++ drivers/misc/mei/client.c | 97 ++++++++++++++++++++++++++++++++++---------- drivers/misc/mei/client.h | 3 +- drivers/misc/mei/interrupt.c | 43 -------------------- 4 files changed, 83 insertions(+), 66 deletions(-)
drivers/misc/mei/bus.c +6 -0
@@ -436,6 +436,12 @@ int mei_cl_enable_device(struct mei_cl_device *device)mutex_lock (&dev->device_lock); +if (mei_cl_is_connected (cl)) { +mutex_unlock (&dev->device_lock); +dev_warn (dev->dev,"Already connected" ); +return -EBUSY ; + } + err =mei_cl_connect (cl,NULL );if (err <0 ) {mutex_unlock (&dev->device_lock);
drivers/misc/mei/client.c +75 -22
141 lines not on this page · raw message
drivers/misc/mei/client.h +2 -1
@@ -103,12 +103,13 @@ static inline bool mei_cl_is_connected(struct mei_cl *cl)return cl->state ==MEI_FILE_CONNECTED ; } -bool mei_cl_is_other_connecting (struct mei_cl *cl);int mei_cl_disconnect (struct mei_cl *cl);void mei_cl_set_disconnected (struct mei_cl *cl);int mei_cl_irq_disconnect (struct mei_cl *cl,struct mei_cl_cb *cb,struct mei_cl_cb *cmpl_list);int mei_cl_connect (struct mei_cl *cl,struct file *file); +int mei_cl_irq_connect (struct mei_cl *cl,struct mei_cl_cb *cb, +struct mei_cl_cb *cmpl_list);int mei_cl_read_start (struct mei_cl *cl,size_t length,struct file *fp);int mei_cl_irq_read_msg (struct mei_cl *cl,struct mei_msg_hdr *hdr,struct mei_cl_cb *cmpl_list);
drivers/misc/mei/interrupt.c +0 -43
49 lines not on this page · raw message
Signature · 1 line
2.1.0
PATCH RESEND 4/9 mei: fix flow control for single buffer clients
In reply to Tomas WinklerFrom: Alexander Usyskin <[email protected]>
For ME clients that use single receiving buffer
the driver tracks credentials on mei_me_clients structure for all connections. The driver needs to book keep the shared resource correctly and track the connections, particularly the credit has to be cleaned when there is no active connection to a particular me client. This solves issue when subsequent connection will not get an ill impression that it can write.
We add active connection counter the particular ME client and when the counter reach zero, we clear the credits.
--- drivers/misc/mei/client.c | 29 +++++++++++++++++++++++------ drivers/misc/mei/mei_dev.h | 4 ++++ 2 files changed, 27 insertions(+), 6 deletions(-)
drivers/misc/mei/client.c +23 -6
@@ -749,10 +749,31 @@ void mei_cl_set_disconnected(struct mei_cl *cl) cl->mei_flow_ctrl_creds =0 ; cl->timer_count =0 ; +if (!cl->me_cl) +return ; + +if (!WARN_ON (cl->me_cl->connect_count ==0 )) + cl->me_cl->connect_count--; + +if (cl->me_cl->connect_count ==0 ) + cl->me_cl->mei_flow_ctrl_creds =0 ; +mei_me_cl_put (cl->me_cl); cl->me_cl =NULL ; } +static int mei_cl_set_connecting (struct mei_cl *cl,struct mei_me_client *me_cl) +{ + cl->me_cl =mei_me_cl_get (me_cl); +if (!cl->me_cl) +return -ENOENT ; + + cl->state =MEI_FILE_CONNECTING ; + cl->me_cl->connect_count++; + +return 0 ; +} +/* * mei_cl_send_disconnect - send disconnect request *
@@ -1009,13 +1030,9 @@ int mei_cl_connect(struct mei_cl *cl, struct mei_me_client *me_cl,if (rets) goto out; - cl->me_cl =mei_me_cl_get (me_cl); -if (!cl->me_cl) { - rets = -ENODEV ; + rets =mei_cl_set_connecting (cl, me_cl); +if (rets) goto out; - } - - cl->state =MEI_FILE_CONNECTING ;list_add_tail (&cb->list, &dev->ctrl_wr_list.list);/* run hbuf acquire last so we don't have to undo */
drivers/misc/mei/mei_dev.h +4 -0
@@ -177,6 +177,8 @@ struct mei_fw_status {* @props: client properties * @client_id: me client id * @mei_flow_ctrl_creds: flow control credits +* @connect_count: number connections to this client +* @reserved: reserved */ struct mei_me_client {struct list_head list;
@@ -184,6 +186,8 @@ struct mei_me_client {struct mei_client_properties props;u8 client_id;u8 mei_flow_ctrl_creds; +u8 connect_count; +u8 reserved; };
Signature · 1 line
2.1.0
PATCH RESEND 5/9 mei: support for fixed address clients
In reply to Tomas WinklerFrom: Alexander Usyskin <[email protected]>
Fixed address is simplified FW client that doesn't require connection and doesn't support flow control.
So it can be only one host client per fixed FW client. Fixed client access is available only for drivers on mei bus, connection from user-space is blocked.
--- drivers/misc/mei/client.c | 69 ++++++++++++++++++++++++++++++++++---------- drivers/misc/mei/client.h | 12 ++++++++ drivers/misc/mei/hbm.c | 4 +-- drivers/misc/mei/interrupt.c | 2 +- 4 files changed, 68 insertions(+), 19 deletions(-)
drivers/misc/mei/client.c +53 -16
@@ -764,10 +764,18 @@ void mei_cl_set_disconnected(struct mei_cl *cl)static int mei_cl_set_connecting (struct mei_cl *cl,struct mei_me_client *me_cl) { - cl->me_cl =mei_me_cl_get (me_cl); -if (!cl->me_cl) +if (!mei_me_cl_get (me_cl))return -ENOENT ; +/* only one connection is allowed for fixed address clients */ +if (me_cl->props.fixed_address) { +if (me_cl->connect_count) { +mei_me_cl_put (me_cl); +return -EBUSY ; + } + } + + cl->me_cl = me_cl; cl->state =MEI_FILE_CONNECTING ; cl->me_cl->connect_count++;
@@ -860,6 +868,11 @@ int mei_cl_disconnect(struct mei_cl *cl)if (!mei_cl_is_connected (cl))return 0 ; +if (mei_cl_is_fixed_address (cl)) { +mei_cl_set_disconnected (cl); +return 0 ; + } + rets =pm_runtime_get (dev->dev);if (rets <0 && rets != -EINPROGRESS ) {pm_runtime_put_noidle (dev->dev);
@@ -1013,16 +1026,25 @@ int mei_cl_connect(struct mei_cl *cl, struct mei_me_client *me_cl,struct mei_cl_cb *cb;int rets; -if (WARN_ON (!cl || !cl->dev)) +if (WARN_ON (!cl || !cl->dev || !me_cl))return -ENODEV ; dev = cl->dev; + rets =mei_cl_set_connecting (cl, me_cl); +if (rets) +return rets; + +if (mei_cl_is_fixed_address (cl)) { + cl->state =MEI_FILE_CONNECTED ; +return 0 ; + } + rets =pm_runtime_get (dev->dev);if (rets <0 && rets != -EINPROGRESS ) {pm_runtime_put_noidle (dev->dev);cl_err (dev, cl,"rpm: get failed %d\n" , rets); -return rets; + goto nortpm; } cb =mei_io_cb_init (cl,MEI_FOP_CONNECT , file);
@@ -1030,9 +1052,6 @@ int mei_cl_connect(struct mei_cl *cl, struct mei_me_client *me_cl,if (rets) goto out; - rets =mei_cl_set_connecting (cl, me_cl); -if (rets) - goto out;list_add_tail (&cb->list, &dev->ctrl_wr_list.list);/* run hbuf acquire last so we don't have to undo */
@@ -1063,6 +1082,7 @@ out:mei_io_cb_free (cb); +nortpm:if (!mei_cl_is_connected (cl))mei_cl_set_disconnected (cl);
@@ -1109,12 +1129,21 @@ err:*/ int mei_cl_flow_ctrl_creds (struct mei_cl *cl) { +int rets; +if (WARN_ON (!cl || !cl->me_cl))return -EINVAL ;if (cl->mei_flow_ctrl_creds >0 )return 1 ; +if (mei_cl_is_fixed_address (cl)) { + rets =mei_cl_read_start (cl,mei_cl_mtu (cl),NULL ); +if (rets && rets != -EBUSY ) +return rets; +return 1 ; + } +if (mei_cl_is_single_recv_buf (cl)) {if (cl->me_cl->mei_flow_ctrl_creds >0 )return 1 ;
@@ -1136,6 +1165,9 @@ int mei_cl_flow_ctrl_reduce(struct mei_cl *cl)if (WARN_ON (!cl || !cl->me_cl))return -EINVAL ; +if (mei_cl_is_fixed_address (cl)) +return 0 ; +if (mei_cl_is_single_recv_buf (cl)) {if (WARN_ON (cl->me_cl->mei_flow_ctrl_creds <=0 ))return -EINVAL ;
@@ -1179,21 +1211,25 @@ int mei_cl_read_start(struct mei_cl *cl, size_t length, struct file *fp)cl_err (dev, cl,"no such me client\n" );return -ENOTTY ; } +/* always allocate at least client max message */ length =max_t (size_t, length,mei_cl_mtu (cl)); + cb =mei_cl_alloc_cb (cl, length,MEI_FOP_READ , fp); +if (!cb) +return -ENOMEM ; + +if (mei_cl_is_fixed_address (cl)) { +list_add_tail (&cb->list, &cl->rd_pending); +return 0 ; + } rets =pm_runtime_get (dev->dev);if (rets <0 && rets != -EINPROGRESS ) {pm_runtime_put_noidle (dev->dev);cl_err (dev, cl,"rpm: get failed %d\n" , rets); -return rets; + goto nortpm; } - cb =mei_cl_alloc_cb (cl, length,MEI_FOP_READ , fp); - rets = cb ?0 : -ENOMEM ; -if (rets) - goto out; -if (mei_hbuf_acquire (dev)) { rets =mei_hbm_cl_flow_control_req (dev, cl);if (rets <0 )
@@ -1201,6 +1237,7 @@ int mei_cl_read_start(struct mei_cl *cl, size_t length, struct file *fp)list_add_tail (&cb->list, &cl->rd_pending); }else { + rets =0 ;list_add_tail (&cb->list, &dev->ctrl_wr_list.list); }
@@ -1208,7 +1245,7 @@ out:cl_dbg (dev, cl,"rpm: autosuspend\n" );pm_runtime_mark_last_busy (dev->dev);pm_runtime_put_autosuspend (dev->dev); - +nortpm:if (rets)mei_io_cb_free (cb);
@@ -1256,7 +1293,7 @@ int mei_cl_irq_write(struct mei_cl *cl, struct mei_cl_cb *cb, len = buf->size - cb->buf_idx; msg_slots =mei_data2slots (len); - mei_hdr.host_addr = cl->host_client_id; + mei_hdr.host_addr =mei_cl_host_addr (cl); mei_hdr.me_addr =mei_cl_me_id (cl); mei_hdr.reserved =0 ; mei_hdr.internal = cb->internal;
@@ -1340,7 +1377,7 @@ int mei_cl_write(struct mei_cl *cl, struct mei_cl_cb *cb, bool blocking) cb->buf_idx =0 ; cl->writing_state =MEI_IDLE ; - mei_hdr.host_addr = cl->host_client_id; + mei_hdr.host_addr =mei_cl_host_addr (cl); mei_hdr.me_addr =mei_cl_me_id (cl); mei_hdr.reserved =0 ; mei_hdr.msg_complete =0 ;
drivers/misc/mei/client.h +12 -0
@@ -188,6 +188,18 @@ static inline const uuid_le *mei_cl_uuid(const struct mei_cl *cl)return mei_me_cl_uuid (cl->me_cl); } +/** +* mei_cl_host_addr - client's host address +* +* @cl: host client +* +* Return: 0 for fixed address client, host address for dynamic client +*/ +static inline u8 mei_cl_host_addr (const struct mei_cl *cl) +{ +return mei_cl_is_fixed_address (cl) ?0 : cl->host_client_id; +} +int mei_cl_disconnect (struct mei_cl *cl);void mei_cl_set_disconnected (struct mei_cl *cl); int mei_cl_irq_disconnect(struct mei_cl *cl, struct mei_cl_cb *cb,
drivers/misc/mei/hbm.c +2 -2
@@ -150,7 +150,7 @@ void mei_hbm_cl_hdr(struct mei_cl *cl, u8 hbm_cmd, void *buf, size_t len)memset (cmd,0 , len); cmd->hbm_cmd = hbm_cmd; - cmd->host_addr = cl->host_client_id; + cmd->host_addr =mei_cl_host_addr (cl); cmd->me_addr =mei_cl_me_id (cl); }
@@ -188,7 +188,7 @@ int mei_hbm_cl_write(struct mei_device *dev,static inline bool mei_hbm_cl_addr_equal (struct mei_cl *cl,struct mei_hbm_cl_cmd *cmd) { -return cl->host_client_id == cmd->host_addr && +return mei_cl_host_addr (cl) == cmd->host_addr &&mei_cl_me_id (cl) == cmd->me_addr; }
drivers/misc/mei/interrupt.c +1 -1
@@ -65,7 +65,7 @@ EXPORT_SYMBOL_GPL(mei_irq_compl_handler);static inline int mei_cl_hbm_equal (struct mei_cl *cl,struct mei_msg_hdr *mei_hdr) { -return cl->host_client_id == mei_hdr->host_addr && +return mei_cl_host_addr (cl) == mei_hdr->host_addr &&mei_cl_me_id (cl) == mei_hdr->me_addr; }
Signature · 1 line
2.1.0
PATCH v2 3/9 mei: add a reference from the host client to the me client
In reply to Tomas WinklerFrom: Alexander Usyskin <[email protected]>
Keep a pointer to associated me client in the host client object to eliminate me client searches. Check if the me client is active in the firmware by checking if its is linked on the me clients list Add accessors for the me client properties from host client.
---
V2: reworked mei_cl_bus_find_cl_by_uuid to NFC registration
drivers/misc/mei/amthif.c | 19 ++----- drivers/misc/mei/bus.c | 38 ++++++++------ drivers/misc/mei/client.c | 118 +++++++++++++++++++------------------------ drivers/misc/mei/client.h | 96 ++++++++++++++++++++++++++++++++--- drivers/misc/mei/debugfs.c | 2 +- drivers/misc/mei/hbm.c | 4 +- drivers/misc/mei/interrupt.c | 4 +- drivers/misc/mei/main.c | 31 +++++------- drivers/misc/mei/mei_dev.h | 20 +++++--- drivers/misc/mei/nfc.c | 50 ++++++++---------- drivers/misc/mei/wd.c | 22 ++------ 11 files changed, 225 insertions(+), 179 deletions(-)
drivers/misc/mei/amthif.c +4 -15
@@ -59,28 +59,19 @@ void mei_amthif_reset_params(struct mei_device *dev)* mei_amthif_host_init - mei initialization amthif client. * * @dev: the device structure +* @me_cl: me client * * Return: 0 on success, <0 on failure. */ -int mei_amthif_host_init (struct mei_device *dev) +int mei_amthif_host_init (struct mei_device *dev,struct mei_me_client *me_cl) {struct mei_cl *cl = &dev->iamthif_cl; -struct mei_me_client *me_cl;int ret; dev->iamthif_state =MEI_IAMTHIF_IDLE ;mei_cl_init (cl, dev); - me_cl =mei_me_cl_by_uuid (dev, &mei_amthif_guid); -if (!me_cl) { -dev_info (dev->dev,"amthif: failed to find the client" ); -return -ENOTTY ; - } - - cl->me_client_id = me_cl->client_id; - cl->cl_uuid = me_cl->props.protocol_name; -/* Assign iamthif_mtu to the value received from ME */ dev->iamthif_mtu = me_cl->props.max_msg_length;
@@ -90,15 +81,13 @@ int mei_amthif_host_init(struct mei_device *dev) ret =mei_cl_link (cl,MEI_IAMTHIF_HOST_CLIENT_ID );if (ret <0 ) {dev_err (dev->dev,"amthif: failed cl_link %d\n" , ret); - goto out; +return ret; } - ret =mei_cl_connect (cl,NULL ); + ret =mei_cl_connect (cl, me_cl,NULL ); dev->iamthif_state =MEI_IAMTHIF_IDLE ; -out: -mei_me_cl_put (me_cl);return ret; }
drivers/misc/mei/bus.c +23 -15
@@ -133,7 +133,13 @@ static struct bus_type mei_cl_bus_type = {static void mei_cl_dev_release (struct device *dev) { -kfree (to_mei_cl_device (dev)); +struct mei_cl_device *device =to_mei_cl_device (dev); + +if (!device) +return ; + +mei_me_cl_put (device->me_cl); +kfree (device); }static struct device_type mei_cl_device_type = {
@@ -141,33 +147,37 @@ static struct device_type mei_cl_device_type = { };struct mei_cl *mei_cl_bus_find_cl_by_uuid (struct mei_device *dev, -uuid_le uuid) +uuid_le uuid) {struct mei_cl *cl;list_for_each_entry (cl, &dev->device_list, device_link) { -if (!uuid_le_cmp (uuid, cl->cl_uuid)) +if (cl->device && cl->device->me_cl && + !uuid_le_cmp (uuid, *mei_me_cl_uuid (cl->device->me_cl)))return cl; }return NULL ; } +struct mei_cl_device *mei_cl_add_device (struct mei_device *dev, -uuid_le uuid,char *name, +struct mei_me_client *me_cl, +struct mei_cl *cl, +char *name,struct mei_cl_ops *ops) {struct mei_cl_device *device; -struct mei_cl *cl;int status; - cl =mei_cl_bus_find_cl_by_uuid (dev, uuid); -if (cl ==NULL ) -return NULL ; - device =kzalloc (sizeof (struct mei_cl_device ),GFP_KERNEL );if (!device)return NULL ; + device->me_cl =mei_me_cl_get (me_cl); +if (!device->me_cl) { +kfree (device); +return NULL ; + } device->cl = cl; device->ops = ops;
@@ -180,6 +190,7 @@ struct mei_cl_device *mei_cl_add_device(struct mei_device *dev, status =device_register (&device->dev);if (status) {dev_err (dev->dev,"Failed to register MEI device\n" ); +mei_me_cl_put (device->me_cl);kfree (device);return NULL ; }
@@ -228,7 +239,6 @@ static ssize_t ___mei_cl_send(struct mei_cl *cl, u8 *buf, size_t length, bool blocking) {struct mei_device *dev; -struct mei_me_client *me_cl =NULL ;struct mei_cl_cb *cb =NULL ;ssize_t rets;
@@ -244,13 +254,12 @@ static ssize_t ___mei_cl_send(struct mei_cl *cl, u8 *buf, size_t length, }/* Check if we have an ME client device */ - me_cl =mei_me_cl_by_uuid_id (dev, &cl->cl_uuid, cl->me_client_id); -if (!me_cl) { +if (!mei_me_cl_is_active (cl->me_cl)) { rets = -ENOTTY ; goto out; } -if (length > me_cl->props.max_msg_length) { +if (length >mei_cl_mtu (cl)) { rets = -EFBIG ; goto out; }
@@ -266,7 +275,6 @@ static ssize_t ___mei_cl_send(struct mei_cl *cl, u8 *buf, size_t length, rets =mei_cl_write (cl, cb, blocking); out: -mei_me_cl_put (me_cl);mutex_unlock (&dev->device_lock);if (rets <0 )mei_io_cb_free (cb);
@@ -442,7 +450,7 @@ int mei_cl_enable_device(struct mei_cl_device *device)return -EBUSY ; } - err =mei_cl_connect (cl,NULL ); + err =mei_cl_connect (cl, device->me_cl,NULL );if (err <0 ) {mutex_unlock (&dev->device_lock);dev_err (dev->dev,"Could not connect to the ME client" );
drivers/misc/mei/client.c +52 -66
247 lines not on this page · raw message
drivers/misc/mei/client.h +90 -6
130 lines not on this page · raw message
drivers/misc/mei/debugfs.c +1 -1
@@ -116,7 +116,7 @@ static ssize_t mei_dbgfs_read_active(struct file *fp, char __user *ubuf, pos +=scnprintf (buf + pos, bufsz - pos,"%2d|%2d|%4d|%5d|%2d|%2d|\n" , - i, cl->me_client_id, cl->host_client_id, cl->state, + i,mei_cl_me_id (cl), cl->host_client_id, cl->state, !list_empty (&cl->rd_completed), cl->writing_state); i++; }
drivers/misc/mei/hbm.c +2 -2
@@ -151,7 +151,7 @@ void mei_hbm_cl_hdr(struct mei_cl *cl, u8 hbm_cmd, void *buf, size_t len) cmd->hbm_cmd = hbm_cmd; cmd->host_addr = cl->host_client_id; - cmd->me_addr = cl->me_client_id; + cmd->me_addr =mei_cl_me_id (cl); }/**
@@ -189,7 +189,7 @@ static inlinebool mei_hbm_cl_addr_equal (struct mei_cl *cl,struct mei_hbm_cl_cmd *cmd) {return cl->host_client_id == cmd->host_addr && - cl->me_client_id == cmd->me_addr; +mei_cl_me_id (cl) == cmd->me_addr; }/**
drivers/misc/mei/interrupt.c +3 -1
@@ -66,7 +66,7 @@ static inline int mei_cl_hbm_equal(struct mei_cl *cl, struct mei_msg_hdr *mei_hdr) {return cl->host_client_id == mei_hdr->host_addr && - cl->me_client_id == mei_hdr->me_addr; +mei_cl_me_id (cl) == mei_hdr->me_addr; }/**
@@ -182,6 +182,8 @@ static int mei_cl_irq_disconnect_rsp(struct mei_cl *cl, struct mei_cl_cb *cb, ret =mei_hbm_cl_disconnect_rsp (dev, cl);mei_cl_set_disconnected (cl);mei_io_cb_free (cb); +mei_me_cl_put (cl->me_cl); + cl->me_cl =NULL ;return ret; }
drivers/misc/mei/main.c +13 -18
@@ -271,7 +271,6 @@ static ssize_t mei_write(struct file *file, const char __user *ubuf, size_t length, loff_t *offset) { struct mei_cl *cl = file->private_data; -struct mei_me_client *me_cl =NULL ;struct mei_cl_cb *write_cb =NULL ;struct mei_device *dev;unsigned long timeout =0 ;
@@ -289,27 +288,27 @@ static ssize_t mei_write(struct file *file, const char __user *ubuf, goto out; } - me_cl =mei_me_cl_by_uuid_id (dev, &cl->cl_uuid, cl->me_client_id); -if (!me_cl) { - rets = -ENOTTY ; +if (!mei_cl_is_connected (cl)) { +cl_err (dev, cl,"is not connected" ); + rets = -ENODEV ; goto out; } -if (length ==0 ) { - rets =0 ; +if (!mei_me_cl_is_active (cl->me_cl)) { + rets = -ENOTTY ; goto out; } -if (length > me_cl->props.max_msg_length) { +if (length >mei_cl_mtu (cl)) { rets = -EFBIG ; goto out; } -if (!mei_cl_is_connected (cl)) { -cl_err (dev, cl,"is not connected" ); - rets = -ENODEV ; +if (length ==0 ) { + rets =0 ; goto out; } +if (cl == &dev->iamthif_cl) { write_cb =mei_amthif_find_read_list_entry (dev, file);
@@ -347,14 +346,12 @@ static ssize_t mei_write(struct file *file, const char __user *ubuf, "amthif write failed with status = %d\n", rets); goto out; } -mei_me_cl_put (me_cl);mutex_unlock (&dev->device_lock);return length; } rets =mei_cl_write (cl, write_cb, false); out: -mei_me_cl_put (me_cl);mutex_unlock (&dev->device_lock);if (rets <0 )mei_io_cb_free (write_cb);
@@ -394,15 +391,13 @@ static int mei_ioctl_connect_client(struct file *file, me_cl =mei_me_cl_by_uuid (dev, &data->in_client_uuid);if (!me_cl || me_cl->props.fixed_address) {dev_dbg (dev->dev,"Cannot connect to FW Client UUID = %pUl\n" , - &data->in_client_uuid); + &data->in_client_uuid); +mei_me_cl_put (me_cl);return -ENOTTY ; } - cl->me_client_id = me_cl->client_id; - cl->cl_uuid = me_cl->props.protocol_name; -dev_dbg (dev->dev,"Connect to FW Client ID = %d\n" , - cl->me_client_id); + me_cl->client_id);dev_dbg (dev->dev,"FW Client - Protocol Version = %d\n" , me_cl->props.protocol_version); dev_dbg(dev->dev, "FW Client - Max Msg Len = %d\n",
@@ -438,7 +433,7 @@ static int mei_ioctl_connect_client(struct file *file, client->protocol_version = me_cl->props.protocol_version;dev_dbg (dev->dev,"Can connect?\n" ); - rets =mei_cl_connect (cl, file); + rets =mei_cl_connect (cl, me_cl, file); end:mei_me_cl_put (me_cl);
drivers/misc/mei/mei_dev.h +12 -8
@@ -227,11 +227,11 @@ struct mei_cl_cb {* @rx_wait: wait queue for rx completion * @wait: wait queue for management operation * @status: connection status -* @cl_uuid: client uuid name +* @me_cl: fw client connected * @host_client_id: host id -* @me_client_id: me/fw id * @mei_flow_ctrl_creds: transmit flow credentials * @timer_count: watchdog timer for operation completion +* @reserved: reserved for alignment * @writing_state: state of the tx * @rd_pending: pending read credits * @rd_completed: completed read
@@ -247,11 +247,11 @@ struct mei_cl {wait_queue_head_t rx_wait;wait_queue_head_t wait;int status; -uuid_le cl_uuid; +struct mei_me_client *me_cl;u8 host_client_id; -u8 me_client_id;u8 mei_flow_ctrl_creds;u8 timer_count; +u8 reserved;enum mei_file_transaction_states writing_state;struct list_head rd_pending;struct list_head rd_completed;
@@ -346,7 +346,9 @@ struct mei_cl_ops { };struct mei_cl_device *mei_cl_add_device (struct mei_device *dev, -uuid_le uuid,char *name, +struct mei_me_client *me_cl, +struct mei_cl *cl, +char *name,struct mei_cl_ops *ops);void mei_cl_remove_device (struct mei_cl_device *device);
@@ -368,6 +370,7 @@ struct mei_cl *mei_cl_bus_find_cl_by_uuid(struct mei_device *dev, uuid_le uuid);* when being probed and shall use it for doing ME bus I/O. * * @dev: linux driver model device pointer +* @me_cl: me client * @cl: mei client * @ops: ME transport ops * @event_work: async work to execute event callback
@@ -380,6 +383,7 @@ struct mei_cl *mei_cl_bus_find_cl_by_uuid(struct mei_device *dev, uuid_le uuid);struct mei_cl_device {struct device dev; +struct mei_me_client *me_cl;struct mei_cl *cl;const struct mei_cl_ops *ops;
@@ -653,7 +657,7 @@ void mei_irq_compl_handler(struct mei_device *dev, struct mei_cl_cb *cmpl_list);*/ void mei_amthif_reset_params (struct mei_device *dev); -int mei_amthif_host_init (struct mei_device *dev); +int mei_amthif_host_init (struct mei_device *dev,struct mei_me_client *me_cl);int mei_amthif_read (struct mei_device *dev,struct file *file,char __user *ubuf,size_t length,loff_t *offset);
@@ -680,7 +684,7 @@ int mei_amthif_irq_read(struct mei_device *dev, s32 *slots);/* * NFC functions */ -int mei_nfc_host_init (struct mei_device *dev); +int mei_nfc_host_init (struct mei_device *dev,struct mei_me_client *me_cl);void mei_nfc_host_exit (struct mei_device *dev);/*
@@ -690,7 +694,7 @@ extern const uuid_le mei_nfc_guid;int mei_wd_send (struct mei_device *dev);int mei_wd_stop (struct mei_device *dev); -int mei_wd_host_init (struct mei_device *dev); +int mei_wd_host_init (struct mei_device *dev,struct mei_me_client *me_cl);/* * mei_watchdog_register - Registering watchdog interface * once we got connection to the WD Client
drivers/misc/mei/nfc.c +21 -29
128 lines not on this page · raw message
drivers/misc/mei/wd.c +4 -18
@@ -50,15 +50,15 @@ static void mei_wd_set_start_timeout(struct mei_device *dev, u16 timeout)* mei_wd_host_init - connect to the watchdog client * * @dev: the device structure +* @me_cl: me client * * Return: -ENOTTY if wd client cannot be found * -EIO if write has failed * 0 on success */ -int mei_wd_host_init (struct mei_device *dev) +int mei_wd_host_init (struct mei_device *dev,struct mei_me_client *me_cl) {struct mei_cl *cl = &dev->wd_cl; -struct mei_me_client *me_cl;int ret;mei_cl_init (cl, dev);
@@ -66,27 +66,13 @@ int mei_wd_host_init(struct mei_device *dev) dev->wd_timeout =MEI_WD_DEFAULT_TIMEOUT ; dev->wd_state =MEI_WD_IDLE ; - -/* check for valid client id */ - me_cl =mei_me_cl_by_uuid (dev, &mei_wd_guid); -if (!me_cl) { -dev_info (dev->dev,"wd: failed to find the client\n" ); -return -ENOTTY ; - } - - cl->me_client_id = me_cl->client_id; - cl->cl_uuid = me_cl->props.protocol_name; -mei_me_cl_put (me_cl); - ret =mei_cl_link (cl,MEI_WD_HOST_CLIENT_ID ); -if (ret <0 ) {dev_info (dev->dev,"wd: failed link client\n" );return ret; } - ret =mei_cl_connect (cl,NULL ); - + ret =mei_cl_connect (cl, me_cl,NULL );if (ret) {dev_err (dev->dev,"wd: failed to connect = %d\n" , ret);mei_cl_unlink (cl);
@@ -118,7 +104,7 @@ int mei_wd_send(struct mei_device *dev)int ret; hdr.host_addr = cl->host_client_id; - hdr.me_addr = cl->me_client_id; + hdr.me_addr =mei_cl_me_id (cl); hdr.msg_complete =1 ; hdr.reserved =0 ; hdr.internal =0 ;
Signature · 1 line
2.1.0
PATCH v2 6/9 mei: connection to fixed address clients from user-space
In reply to Tomas WinklerFrom: Alexander Usyskin <[email protected]>
This should be used for debug only.
The feaure is gated by "allow_fixed_address" control exposed in debugfs.
---
V2: fix permission on debugfs enntry
drivers/misc/mei/debugfs.c | 6 ++++++ drivers/misc/mei/main.c | 8 +++++++- drivers/misc/mei/mei_dev.h | 4 ++++ 3 files changed, 17 insertions(+), 1 deletion(-)
drivers/misc/mei/debugfs.c +6 -0
@@ -209,6 +209,12 @@ int mei_dbgfs_register(struct mei_device *dev, const char *name)dev_err (dev->dev,"devstate: registration failed\n" ); goto err; } + f =debugfs_create_bool ("allow_fixed_address" ,S_IRUSR |S_IWUSR , dir, + &dev->allow_fixed_address); +if (!f) { +dev_err (dev->dev,"allow_fixed_address: registration failed\n" ); + goto err; + } dev->dbgfs_dir = dir;return 0 ; err:
drivers/misc/mei/main.c +7 -1
@@ -215,6 +215,11 @@ static ssize_t mei_read(struct file *file, char __user *ubuf, cb =mei_cl_read_cb (cl, file);if (!cb) { +if (mei_cl_is_fixed_address (cl) && dev->allow_fixed_address) { + cb =mei_cl_read_cb (cl,NULL ); +if (cb) + goto copy_buffer; + } rets =0 ; goto out; }
@@ -389,7 +394,8 @@ static int mei_ioctl_connect_client(struct file *file,/* find ME client we're trying to connect to */ me_cl =mei_me_cl_by_uuid (dev, &data->in_client_uuid); -if (!me_cl || me_cl->props.fixed_address) { +if (!me_cl || + (me_cl->props.fixed_address && !dev->allow_fixed_address)) {dev_dbg (dev->dev,"Cannot connect to FW Client UUID = %pUl\n" , &data->in_client_uuid);mei_me_cl_put (me_cl);
drivers/misc/mei/mei_dev.h +4 -0
@@ -476,6 +476,8 @@ const char *mei_pg_state_str(enum mei_pg_state state);* @host_clients_map : host clients id pool * @me_client_index : last FW client index in enumeration * +* @allow_fixed_address: allow user space to connect a fixed client +* * @wd_cl : watchdog client * @wd_state : watchdog client state * @wd_pending : watchdog command is pending
@@ -567,6 +569,8 @@ struct mei_device {DECLARE_BITMAP (host_clients_map,MEI_CLIENTS_MAX );unsigned long me_client_index; +u32 allow_fixed_address; +struct mei_cl wd_cl;enum mei_wd_states wd_state;bool wd_pending;
Signature · 1 line
2.1.0
PATCH RESEND 7/9 mei: drop iamthif_mtu from device structure
In reply to Tomas WinklerFrom: Alexander Usyskin <[email protected]>
We can receive mtu with one call now, no need to store it.
--- drivers/misc/mei/amthif.c | 9 +-------- drivers/misc/mei/mei_dev.h | 2 -- 2 files changed, 1 insertion(+), 10 deletions(-)
drivers/misc/mei/amthif.c +1 -8
@@ -72,12 +72,6 @@ int mei_amthif_host_init(struct mei_device *dev, struct mei_me_client *me_cl)mei_cl_init (cl, dev); -/* Assign iamthif_mtu to the value received from ME */ - - dev->iamthif_mtu = me_cl->props.max_msg_length; -dev_dbg (dev->dev,"IAMTHIF_MTU = %d\n" , dev->iamthif_mtu); - - ret =mei_cl_link (cl,MEI_IAMTHIF_HOST_CLIENT_ID );if (ret <0 ) {dev_err (dev->dev,"amthif: failed cl_link %d\n" , ret);
@@ -239,7 +233,6 @@ static int mei_amthif_read_start(struct mei_cl *cl, struct file *file) {struct mei_device *dev = cl->dev;struct mei_cl_cb *cb; -size_t length = dev->iamthif_mtu;int rets; cb =mei_io_cb_init (cl,MEI_FOP_READ , file);
@@ -248,7 +241,7 @@ static int mei_amthif_read_start(struct mei_cl *cl, struct file *file) goto err; } - rets =mei_io_cb_alloc_buf (cb, length); + rets =mei_io_cb_alloc_buf (cb,mei_cl_mtu (cl));if (rets) goto err;
drivers/misc/mei/mei_dev.h +0 -2
@@ -490,7 +490,6 @@ const char *mei_pg_state_str(enum mei_pg_state state);* @iamthif_cl : amthif host client * @iamthif_current_cb : amthif current operation callback * @iamthif_open_count : number of opened amthif connections -* @iamthif_mtu : amthif client max message length * @iamthif_timer : time stamp of current amthif command completion * @iamthif_stall_timer : timer to detect amthif hang * @iamthif_state : amthif processor state
@@ -586,7 +585,6 @@ struct mei_device {struct mei_cl iamthif_cl;struct mei_cl_cb *iamthif_current_cb;long iamthif_open_count; -int iamthif_mtu;unsigned long iamthif_timer;u32 iamthif_stall_timer;enum iamthif_states iamthif_state;
Signature · 1 line
2.1.0
PATCH RESEND 8/9 mei: txe: fix incorrect indentation
In reply to Tomas WinklerRemove spurious blank
--- drivers/misc/mei/pci-txe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/misc/mei/pci-txe.c +1 -1
@@ -338,7 +338,7 @@ static int mei_txe_pm_runtime_suspend(struct device *device)* However if device is not wakeable we do not enter * D-low state and we need to keep the interrupt kicking */ -if (!ret &&pci_dev_run_wake (pdev)) +if (!ret &&pci_dev_run_wake (pdev))mei_disable_interrupts (dev);dev_dbg (&pdev->dev,"rpm: txe: runtime suspend ret=%d\n" , ret);
Signature · 1 line
2.1.0
PATCH 9/9 mei: debug prints with client info in read
In reply to Tomas WinklerFrom: Alexander Usyskin <[email protected]>
Add client info to debug prints in the read function to ease on debugging efforts.
--- drivers/misc/mei/main.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
drivers/misc/mei/main.c +4 -5
@@ -183,8 +183,7 @@ static ssize_t mei_read(struct file *file, char __user *ubuf, err =mei_cl_read_start (cl, length, file);if (err && err != -EBUSY ) { -dev_dbg (dev->dev, -"mei start read failure with status = %d\n" , err); +cl_dbg (dev, cl,"mei start read failure status = %d\n" , err); rets = err; goto out; }
@@ -228,11 +227,11 @@ copy_buffer:/* now copy the data to user space */ if (cb->status) { rets = cb->status; -dev_dbg (dev->dev,"read operation failed %d\n" , rets); +cl_dbg (dev, cl,"read operation failed %d\n" , rets); goto free; } -dev_dbg (dev->dev,"buf.size = %d buf.idx= %ld\n" , +cl_dbg (dev, cl,"buf.size = %d buf.idx = %ld\n" , cb->buf.size, cb->buf_idx);if (length ==0 || ubuf ==NULL || *offset > cb->buf_idx) { rets = -EMSGSIZE ;
@@ -258,7 +257,7 @@ free:mei_io_cb_free (cb); out: -dev_dbg (dev->dev,"end mei read rets= %d\n" , rets); +cl_dbg (dev, cl,"end mei read rets = %d\n" , rets);mutex_unlock (&dev->device_lock);return rets; }
Signature · 1 line
2.1.0