Commit ea3b5fb7 authored by Tomas Winkler's avatar Tomas Winkler Committed by Greg Kroah-Hartman
Browse files

mei: streamline write complete flow function 



Rename the function  _mei_irq_thread_cmpl to
mei_irq_thread_write_complete to make clear it deals
with writing. Remove cl from the parameter list as it
can be extracted from cb block.
Extract the common flow from if statements and document
the logic properly

Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5fb54fb4

drivers/misc/mei/interrupt.c

+43 −70
Original line number Diff line number Diff line
@@ -734,90 +734,63 @@ static int _mei_irq_thread_ioctl(struct mei_device *dev, s32 *slots, 
}



/**

 * _mei_irq_thread_cmpl - processes completed and no-iamthif operation.

 * mei_irq_thread_write_complete - write messages to device.

 *

 * @dev: the device structure.

 * @slots: free slots.

 * @cb_pos: callback block.

 * @cl: private data of the file object.

 * @cb: callback block.

 * @cmpl_list: complete list.

 *

 * returns 0, OK; otherwise, error.

 */

static int _mei_irq_thread_cmpl(struct mei_device *dev,	s32 *slots,

			struct mei_cl_cb *cb_pos,

			struct mei_cl *cl,

			struct mei_cl_cb *cmpl_list)

static int mei_irq_thread_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 = cb->request_buffer.size - cb->buf_idx;

	size_t msg_slots = mei_data2slots(len);



	if ((*slots * sizeof(u32)) >= (sizeof(struct mei_msg_hdr) +

			(cb_pos->request_buffer.size - cb_pos->buf_idx))) {

	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 = cb_pos->request_buffer.size - cb_pos->buf_idx;

		mei_hdr->msg_complete = 1;

	mei_hdr->reserved = 0;

		dev_dbg(&dev->pdev->dev, "cb_pos->request_buffer.size =%d"

			"mei_hdr->msg_complete = %d\n",

				cb_pos->request_buffer.size,

				mei_hdr->msg_complete);

		dev_dbg(&dev->pdev->dev, "cb_pos->buf_idx  =%lu\n",

				cb_pos->buf_idx);

		dev_dbg(&dev->pdev->dev, "mei_hdr->length  =%d\n",

				mei_hdr->length);

		*slots -= mei_data2slots(mei_hdr->length);

		if (mei_write_message(dev, mei_hdr,

				(unsigned char *)

				(cb_pos->request_buffer.data +

				cb_pos->buf_idx),

				mei_hdr->length)) {

			cl->status = -ENODEV;

			list_move_tail(&cb_pos->list, &cmpl_list->list);

			return -ENODEV;

		} else {

			if (mei_flow_ctrl_reduce(dev, cl))

				return -ENODEV;

			cl->status = 0;

			cb_pos->buf_idx += mei_hdr->length;

			list_move_tail(&cb_pos->list, &dev->write_waiting_list.list);

		}



	if (*slots >= msg_slots) {

		mei_hdr->length = len;

		mei_hdr->msg_complete = 1;

	/* Split the message only if we can write the whole host buffer */

	} 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);

		msg_slots = *slots;

		len = (*slots * sizeof(u32)) - sizeof(struct mei_msg_hdr);

		mei_hdr->length = len;

		mei_hdr->msg_complete = 0;

		mei_hdr->reserved = 0;

		*slots -= mei_data2slots(mei_hdr->length);

	} else {

		/* wait for next time the host buffer is empty */

		return 0;

	}



	dev_dbg(&dev->pdev->dev, "buf: size = %d idx = %lu\n",

			cb->request_buffer.size, cb->buf_idx);

	dev_dbg(&dev->pdev->dev, "msg: len = %d complete = %d\n",

			mei_hdr->length, mei_hdr->msg_complete);



	*slots -=  msg_slots;

	if (mei_write_message(dev, mei_hdr,

					(unsigned char *)

					(cb_pos->request_buffer.data +

					cb_pos->buf_idx),

					mei_hdr->length)) {

		cb->request_buffer.data + cb->buf_idx, len)) {

		cl->status = -ENODEV;

			list_move_tail(&cb_pos->list, &cmpl_list->list);

		list_move_tail(&cb->list, &cmpl_list->list);

		return -ENODEV;

		} else {

			cb_pos->buf_idx += mei_hdr->length;

			dev_dbg(&dev->pdev->dev,

					"cb_pos->request_buffer.size =%d"

					" mei_hdr->msg_complete = %d\n",

					cb_pos->request_buffer.size,

					mei_hdr->msg_complete);

			dev_dbg(&dev->pdev->dev, "cb_pos->buf_idx  =%lu\n",

					cb_pos->buf_idx);

			dev_dbg(&dev->pdev->dev, "mei_hdr->length  =%d\n",

					mei_hdr->length);

		}

		return -EMSGSIZE;

	} else {

		return -EBADMSG;

	}



	if (mei_flow_ctrl_reduce(dev, cl))

		return -ENODEV;



	cl->status = 0;

	cb->buf_idx += mei_hdr->length;

	if (mei_hdr->msg_complete)

		list_move_tail(&cb->list, &dev->write_waiting_list.list);



	return 0;

}
@@ -1059,8 +1032,8 @@ static int mei_irq_thread_write_handler(struct mei_cl_cb *cmpl_list, 
					cl->host_client_id);

				continue;

			}

			ret = _mei_irq_thread_cmpl(dev, slots, pos,

						cl, cmpl_list);

			ret = mei_irq_thread_write_complete(dev, slots, pos,

						cmpl_list);

			if (ret)

				return ret;

CRA Git | Maintained and supported by SUSTech CRA and CCSE