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

Commit e0cb6b2f authored by Alexander Usyskin's avatar Alexander Usyskin Committed by Greg Kroah-Hartman
Browse files

mei: enable to set the internal flag for client write 



Prepare the client write functions to set the internal flag in message
header. Carry both blocking and internal modes inside the transmit cb,
and call internal bus function  __mei_cl_send() with send mode bit mask.
The Internal flag should be added only on messages generated by the
driver.

Signed-off-by: default avatarAlexander Usyskin <alexander.usyskin@intel.com>
Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent fe948dcb

drivers/misc/mei/amthif.c

+1 −1
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ int mei_amthif_run_next_cmd(struct mei_device *dev) 
	dev->iamthif_state = MEI_IAMTHIF_WRITING;

	cl->fp = cb->fp;



	ret = mei_cl_write(cl, cb, false);

	ret = mei_cl_write(cl, cb);

	if (ret < 0)

		return ret;

drivers/misc/mei/bus-fixup.c

+2 −1
Original line number Diff line number Diff line
@@ -162,7 +162,8 @@ static int mei_nfc_if_version(struct mei_cl *cl, 


	WARN_ON(mutex_is_locked(&bus->device_lock));



	ret = __mei_cl_send(cl, (u8 *)&cmd, sizeof(struct mei_nfc_cmd), 1);

	ret = __mei_cl_send(cl, (u8 *)&cmd, sizeof(struct mei_nfc_cmd),

			    MEI_CL_IO_TX_BLOCKING);

	if (ret < 0) {

		dev_err(bus->dev, "Could not send IF version cmd\n");

		return ret;

drivers/misc/mei/bus.c

+6 −4
Original line number Diff line number Diff line
@@ -36,12 +36,12 @@ 
 * @cl: host client

 * @buf: buffer to send

 * @length: buffer length

 * @blocking: wait for write completion

 * @mode: sending mode

 *

 * Return: written size bytes or < 0 on error

 */

ssize_t __mei_cl_send(struct mei_cl *cl, u8 *buf, size_t length,

			bool blocking)

		      unsigned int mode)

{

	struct mei_device *bus;

	struct mei_cl_cb *cb;
@@ -80,9 +80,11 @@ ssize_t __mei_cl_send(struct mei_cl *cl, u8 *buf, size_t length, 
		goto out;

	}



	cb->internal = !!(mode & MEI_CL_IO_TX_INTERNAL);

	cb->blocking = !!(mode & MEI_CL_IO_TX_BLOCKING);

	memcpy(cb->buf.data, buf, length);



	rets = mei_cl_write(cl, cb, blocking);

	rets = mei_cl_write(cl, cb);



out:

	mutex_unlock(&bus->device_lock);
@@ -188,7 +190,7 @@ ssize_t mei_cldev_send(struct mei_cl_device *cldev, u8 *buf, size_t length) 
	if (cl == NULL)

		return -ENODEV;



	return __mei_cl_send(cl, buf, length, 1);

	return __mei_cl_send(cl, buf, length, MEI_CL_IO_TX_BLOCKING);

}

EXPORT_SYMBOL_GPL(mei_cldev_send);

drivers/misc/mei/client.c

+3 −3
Original line number Diff line number Diff line
@@ -1598,18 +1598,17 @@ int mei_cl_irq_write(struct mei_cl *cl, struct mei_cl_cb *cb, 
 *

 * @cl: host client

 * @cb: write callback with filled data

 * @blocking: block until completed

 *

 * Return: number of bytes sent on success, <0 on failure.

 */

int mei_cl_write(struct mei_cl *cl, struct mei_cl_cb *cb, bool blocking)

int mei_cl_write(struct mei_cl *cl, struct mei_cl_cb *cb)

{

	struct mei_device *dev;

	struct mei_msg_data *buf;

	struct mei_msg_hdr mei_hdr;

	int size;

	int rets;



	bool blocking;



	if (WARN_ON(!cl || !cl->dev))

		return -ENODEV;
@@ -1621,6 +1620,7 @@ int mei_cl_write(struct mei_cl *cl, struct mei_cl_cb *cb, bool blocking) 


	buf = &cb->buf;

	size = buf->size;

	blocking = cb->blocking;



	cl_dbg(dev, cl, "size=%d\n", size);

drivers/misc/mei/client.h

+1 −1
Original line number Diff line number Diff line
@@ -219,7 +219,7 @@ int mei_cl_irq_connect(struct mei_cl *cl, struct mei_cl_cb *cb, 
int mei_cl_read_start(struct mei_cl *cl, size_t length, const struct file *fp);

int mei_cl_irq_read_msg(struct mei_cl *cl, struct mei_msg_hdr *hdr,

			struct mei_cl_cb *cmpl_list);

int mei_cl_write(struct mei_cl *cl, struct mei_cl_cb *cb, bool blocking);

int mei_cl_write(struct mei_cl *cl, struct mei_cl_cb *cb);

int mei_cl_irq_write(struct mei_cl *cl, struct mei_cl_cb *cb,

		     struct mei_cl_cb *cmpl_list);