mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-30 08:02:30 +00:00
mei: push credentials inside the irq write handler
this eventually allows as use a single write queue both for control and data messages and removing possible race Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
2ebf8c94d4
commit
136698e535
3 changed files with 34 additions and 10 deletions
|
@ -460,6 +460,15 @@ int mei_amthif_irq_write_complete(struct mei_cl *cl, struct mei_cl_cb *cb,
|
|||
u32 msg_slots = mei_data2slots(len);
|
||||
int rets;
|
||||
|
||||
rets = mei_cl_flow_ctrl_creds(cl);
|
||||
if (rets < 0)
|
||||
return rets;
|
||||
|
||||
if (rets == 0) {
|
||||
cl_dbg(dev, cl, "No flow control credentials: not sending.\n");
|
||||
return 0;
|
||||
}
|
||||
|
||||
mei_hdr.host_addr = cl->host_client_id;
|
||||
mei_hdr.me_addr = cl->me_client_id;
|
||||
mei_hdr.reserved = 0;
|
||||
|
|
|
@ -702,12 +702,33 @@ int mei_cl_read_start(struct mei_cl *cl, size_t length)
|
|||
int mei_cl_irq_write_complete(struct mei_cl *cl, struct mei_cl_cb *cb,
|
||||
s32 *slots, struct mei_cl_cb *cmpl_list)
|
||||
{
|
||||
struct mei_device *dev = cl->dev;
|
||||
struct mei_device *dev;
|
||||
struct mei_msg_data *buf;
|
||||
struct mei_msg_hdr mei_hdr;
|
||||
size_t len = cb->request_buffer.size - cb->buf_idx;
|
||||
u32 msg_slots = mei_data2slots(len);
|
||||
size_t len;
|
||||
u32 msg_slots;
|
||||
int rets;
|
||||
|
||||
|
||||
if (WARN_ON(!cl || !cl->dev))
|
||||
return -ENODEV;
|
||||
|
||||
dev = cl->dev;
|
||||
|
||||
buf = &cb->request_buffer;
|
||||
|
||||
rets = mei_cl_flow_ctrl_creds(cl);
|
||||
if (rets < 0)
|
||||
return rets;
|
||||
|
||||
if (rets == 0) {
|
||||
cl_dbg(dev, cl, "No flow control credentials: not sending.\n");
|
||||
return 0;
|
||||
}
|
||||
|
||||
len = buf->size - cb->buf_idx;
|
||||
msg_slots = mei_data2slots(len);
|
||||
|
||||
mei_hdr.host_addr = cl->host_client_id;
|
||||
mei_hdr.me_addr = cl->me_client_id;
|
||||
mei_hdr.reserved = 0;
|
||||
|
@ -730,8 +751,7 @@ int mei_cl_irq_write_complete(struct mei_cl *cl, struct mei_cl_cb *cb,
|
|||
cb->request_buffer.size, cb->buf_idx);
|
||||
|
||||
*slots -= msg_slots;
|
||||
rets = mei_write_message(dev, &mei_hdr,
|
||||
cb->request_buffer.data + cb->buf_idx);
|
||||
rets = mei_write_message(dev, &mei_hdr, buf->data + cb->buf_idx);
|
||||
if (rets) {
|
||||
cl->status = rets;
|
||||
list_move_tail(&cb->list, &cmpl_list->list);
|
||||
|
|
|
@ -513,11 +513,6 @@ int mei_irq_write_handler(struct mei_device *dev, struct mei_cl_cb *cmpl_list)
|
|||
cl = cb->cl;
|
||||
if (cl == NULL)
|
||||
continue;
|
||||
if (mei_cl_flow_ctrl_creds(cl) <= 0) {
|
||||
cl_dbg(dev, cl, "No flow control credentials, not sending.\n");
|
||||
continue;
|
||||
}
|
||||
|
||||
if (cl == &dev->iamthif_cl)
|
||||
ret = mei_amthif_irq_write_complete(cl, cb,
|
||||
&slots, cmpl_list);
|
||||
|
|
Loading…
Reference in a new issue