1 files changed, 44 insertions, 54 deletions

diff --git a/drivers/misc/mei/amthif.c b/drivers/misc/mei/amthif.c
index 095d0595a49e..18794aea6062 100644
--- a/drivers/misc/mei/amthif.c
+++ b/drivers/misc/mei/amthif.c
@@ -431,74 +431,64 @@ unsigned int mei_amthif_poll(struct mei_device *dev,
  *
  * returns 0, OK; otherwise, error.
  */
-int mei_amthif_irq_process_completed(struct mei_device *dev, s32 *slots,
-                        struct mei_cl_cb *cb_pos,
-                        struct mei_cl *cl,
-                        struct mei_cl_cb *cmpl_list)
+int mei_amthif_irq_write_complete(struct mei_device *dev, s32 *slots,
+                        struct mei_cl_cb *cb, struct mei_cl_cb *cmpl_list)
 {
         struct mei_msg_hdr *mei_hdr;
+        struct mei_cl *cl = cb->cl;
+        size_t len = dev->iamthif_msg_buf_size - dev->iamthif_msg_buf_index;
+        size_t msg_slots = mei_data2slots(len);
 
-        if ((*slots * sizeof(u32)) >= (sizeof(struct mei_msg_hdr) +
-                        dev->iamthif_msg_buf_size -
-                        dev->iamthif_msg_buf_index)) {
-                mei_hdr = (struct mei_msg_hdr *) &dev->wr_msg_buf[0];
-                mei_hdr->host_addr = cl->host_client_id;
-                mei_hdr->me_addr = cl->me_client_id;
-                mei_hdr->length = dev->iamthif_msg_buf_size -
-                        dev->iamthif_msg_buf_index;
+        mei_hdr = (struct mei_msg_hdr *)&dev->wr_msg_buf[0];
+        mei_hdr->host_addr = cl->host_client_id;
+        mei_hdr->me_addr = cl->me_client_id;
+        mei_hdr->reserved = 0;
+
+        if (*slots >= msg_slots) {
+                mei_hdr->length = len;
                 mei_hdr->msg_complete = 1;
-                mei_hdr->reserved = 0;
+        /* Split the message only if we can write the whole host buffer */
+        } else if (*slots == dev->hbuf_depth) {
+                msg_slots = *slots;
+                len = (*slots * sizeof(u32)) - sizeof(struct mei_msg_hdr);
+                mei_hdr->length = len;
+                mei_hdr->msg_complete = 0;
+        } else {
+                /* wait for next time the host buffer is empty */
+                return 0;
+        }
 
-                *slots -= mei_data2slots(mei_hdr->length);
+        dev_dbg(&dev->pdev->dev, "msg: len = %d complete = %d\n",
+                        mei_hdr->length, mei_hdr->msg_complete);
 
-                if (mei_write_message(dev, mei_hdr,
-                                        (dev->iamthif_msg_buf +
-                                        dev->iamthif_msg_buf_index),
-                                        mei_hdr->length)) {
+        *slots -=  msg_slots;
+        if (mei_write_message(dev, mei_hdr,
+                dev->iamthif_msg_buf + dev->iamthif_msg_buf_index,
+                mei_hdr->length)) {
                         dev->iamthif_state = MEI_IAMTHIF_IDLE;
                         cl->status = -ENODEV;
-                        list_del(&cb_pos->list);
+                        list_del(&cb->list);
                         return -ENODEV;
-                } else {
-                        if (mei_flow_ctrl_reduce(dev, cl))
-                                return -ENODEV;
-                        dev->iamthif_msg_buf_index += mei_hdr->length;
-                        cb_pos->buf_idx = dev->iamthif_msg_buf_index;
-                        cl->status = 0;
-                        dev->iamthif_state = MEI_IAMTHIF_FLOW_CONTROL;
-                        dev->iamthif_flow_control_pending = true;
-                        /* save iamthif cb sent to amthi client */
-                        dev->iamthif_current_cb = cb_pos;
-                        list_move_tail(&cb_pos->list,
-                                        &dev->write_waiting_list.list);
+        }
 
-                }
-        } else if (*slots == dev->hbuf_depth) {
-                /* buffer is still empty */
-                mei_hdr = (struct mei_msg_hdr *) &dev->wr_msg_buf[0];
-                mei_hdr->host_addr = cl->host_client_id;
-                mei_hdr->me_addr = cl->me_client_id;
-                mei_hdr->length =
-                        (*slots * sizeof(u32)) - sizeof(struct mei_msg_hdr);
-                mei_hdr->msg_complete = 0;
-                mei_hdr->reserved = 0;
+        if (mei_flow_ctrl_reduce(dev, cl))
+                return -ENODEV;
 
-                *slots -= mei_data2slots(mei_hdr->length);
+        dev->iamthif_msg_buf_index += mei_hdr->length;
+        cl->status = 0;
 
-                if (mei_write_message(dev, mei_hdr,
-                                        (dev->iamthif_msg_buf +
-                                        dev->iamthif_msg_buf_index),
-                                        mei_hdr->length)) {
-                        cl->status = -ENODEV;
-                        list_del(&cb_pos->list);
-                } else {
-                        dev->iamthif_msg_buf_index += mei_hdr->length;
-                }
-                return -EMSGSIZE;
-        } else {
-                return -EBADMSG;
+        if (mei_hdr->msg_complete) {
+                dev->iamthif_state = MEI_IAMTHIF_FLOW_CONTROL;
+                dev->iamthif_flow_control_pending = true;
+
+                /* save iamthif cb sent to amthi client */
+                cb->buf_idx = dev->iamthif_msg_buf_index;
+                dev->iamthif_current_cb = cb;
+
+                list_move_tail(&cb->list, &dev->write_waiting_list.list);
         }
 
+
         return 0;
 }