Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

mei: don't query HCSR for host buffer depth 



1. We record host (write) buffer depth during reset
 so we don't need to query HCSR register later on.
 The host buffer depth doesn't change after the reset
2. Use mei_hbuf_max_data function to compute payload size in bytes

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

drivers/misc/mei/init.c

+3 −0
Original line number Diff line number Diff line
@@ -162,6 +162,9 @@ int mei_hw_init(struct mei_device *dev) 
	if ((dev->host_hw_state & H_IS) == H_IS)

		mei_reg_write(dev, H_CSR, dev->host_hw_state);



	/* Doesn't change in runtime */

	dev->hbuf_depth = (dev->host_hw_state & H_CBD) >> 24;



	dev->recvd_msg = false;

	dev_dbg(&dev->pdev->dev, "reset in start the mei device.\n");

drivers/misc/mei/interface.c

+3 −4
Original line number Diff line number Diff line
@@ -103,15 +103,14 @@ int mei_host_buffer_is_empty(struct mei_device *dev) 
 */

int mei_count_empty_write_slots(struct mei_device *dev)

{

	unsigned char buffer_depth, filled_slots, empty_slots;

	unsigned char filled_slots, empty_slots;



	dev->host_hw_state = mei_hcsr_read(dev);

	buffer_depth = (unsigned char) ((dev->host_hw_state & H_CBD) >> 24);

	filled_slots = _host_get_filled_slots(dev);

	empty_slots = buffer_depth - filled_slots;

	empty_slots = dev->hbuf_depth - filled_slots;



	/* check for overflow */

	if (filled_slots > buffer_depth)

	if (filled_slots > dev->hbuf_depth)

		return -EOVERFLOW;



	return empty_slots;

drivers/misc/mei/interface.h

+6 −0
Original line number Diff line number Diff line
@@ -49,6 +49,12 @@ int mei_count_empty_write_slots(struct mei_device *dev); 


int mei_flow_ctrl_creds(struct mei_device *dev, struct mei_cl *cl);



static inline size_t mei_hbuf_max_data(const struct mei_device *dev)

{

	return dev->hbuf_depth * sizeof(u32) - sizeof(struct mei_msg_hdr);

}





int mei_wd_send(struct mei_device *dev);

int mei_wd_stop(struct mei_device *dev, bool preserve);

int mei_wd_host_init(struct mei_device *dev);

drivers/misc/mei/interrupt.c

+3 −3
Original line number Diff line number Diff line
@@ -951,7 +951,7 @@ static int _mei_irq_thread_cmpl(struct mei_device *dev, s32 *slots, 
			list_move_tail(&cb_pos->cb_list,

				&dev->write_waiting_list.mei_cb.cb_list);

		}

	} else if (*slots == ((dev->host_hw_state & H_CBD) >> 24)) {

	} 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;
@@ -1046,7 +1046,7 @@ static int _mei_irq_thread_cmpl_iamthif(struct mei_device *dev, s32 *slots, 
				&dev->write_waiting_list.mei_cb.cb_list);



		}

	} else if (*slots == ((dev->host_hw_state & H_CBD) >> 24)) {

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

drivers/misc/mei/iorw.c

+2 −6
Original line number Diff line number Diff line
@@ -481,12 +481,8 @@ int amthi_write(struct mei_device *dev, struct mei_cl_cb *cb) 
	if (ret && dev->mei_host_buffer_is_empty) {

		ret = 0;

		dev->mei_host_buffer_is_empty = false;

		if (cb->request_buffer.size >

			(((dev->host_hw_state & H_CBD) >> 24) * sizeof(u32))

				-sizeof(struct mei_msg_hdr)) {

			mei_hdr.length =

			    (((dev->host_hw_state & H_CBD) >> 24) *

			    sizeof(u32)) - sizeof(struct mei_msg_hdr);

		if (cb->request_buffer.size > mei_hbuf_max_data(dev)) {

			mei_hdr.length = mei_hbuf_max_data(dev);

			mei_hdr.msg_complete = 0;

		} else {

			mei_hdr.length = cb->request_buffer.size;