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

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

mei: me_client lookup function to return me_client object 



For support of dynamic addition and removal of me clients
it is more convenient to use a list instead of static array
as is use now.
As the first step of the transition to the new data structure
we change the lookup function so it returns me client address
instead of an index.

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

drivers/misc/mei/amthif.c

+11 −18
Original line number Diff line number Diff line
@@ -68,27 +68,26 @@ void mei_amthif_reset_params(struct mei_device *dev) 
int mei_amthif_host_init(struct mei_device *dev)

{

	struct mei_cl *cl = &dev->iamthif_cl;

	struct mei_me_client *me_cl;

	unsigned char *msg_buf;

	int ret, i;

	int ret;



	dev->iamthif_state = MEI_IAMTHIF_IDLE;



	mei_cl_init(cl, dev);



	i = mei_me_cl_by_uuid(dev, &mei_amthif_guid);

	if (i < 0) {

		dev_info(&dev->pdev->dev,

			"amthif: failed to find the client %d\n", i);

	me_cl = mei_me_cl_by_uuid(dev, &mei_amthif_guid);

	if (!me_cl) {

		dev_info(&dev->pdev->dev, "amthif: failed to find the client");

		return -ENOTTY;

	}



	cl->me_client_id = dev->me_clients[i].client_id;

	cl->me_client_id = me_cl->client_id;



	/* Assign iamthif_mtu to the value received from ME  */



	dev->iamthif_mtu = dev->me_clients[i].props.max_msg_length;

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

			dev->me_clients[i].props.max_msg_length);

	dev->iamthif_mtu = me_cl->props.max_msg_length;

	dev_dbg(&dev->pdev->dev, "IAMTHIF_MTU = %d\n", dev->iamthif_mtu);



	kfree(dev->iamthif_msg_buf);

	dev->iamthif_msg_buf = NULL;
@@ -157,12 +156,11 @@ struct mei_cl_cb *mei_amthif_find_read_list_entry(struct mei_device *dev, 
int mei_amthif_read(struct mei_device *dev, struct file *file,

	       char __user *ubuf, size_t length, loff_t *offset)

{

	int rets;

	int wait_ret;

	struct mei_cl_cb *cb = NULL;

	struct mei_cl *cl = file->private_data;

	struct mei_cl_cb *cb;

	unsigned long timeout;

	int i;

	int rets;

	int wait_ret;



	/* Only possible if we are in timeout */

	if (!cl) {
@@ -170,11 +168,6 @@ int mei_amthif_read(struct mei_device *dev, struct file *file, 
		return -ETIME;

	}



	i = mei_me_cl_by_id(dev, dev->iamthif_cl.me_client_id);

	if (i < 0) {

		dev_dbg(&dev->pdev->dev, "amthif client not found.\n");

		return -ENOTTY;

	}

	dev_dbg(&dev->pdev->dev, "checking amthif data\n");

	cb = mei_amthif_find_read_list_entry(dev, file);

drivers/misc/mei/bus.c

+5 −5
Original line number Diff line number Diff line
@@ -229,8 +229,8 @@ static int ___mei_cl_send(struct mei_cl *cl, u8 *buf, size_t length, 
			bool blocking)

{

	struct mei_device *dev;

	struct mei_me_client *me_cl;

	struct mei_cl_cb *cb;

	int id;

	int rets;



	if (WARN_ON(!cl || !cl->dev))
@@ -242,11 +242,11 @@ static int ___mei_cl_send(struct mei_cl *cl, u8 *buf, size_t length, 
		return -ENODEV;



	/* Check if we have an ME client device */

	id = mei_me_cl_by_id(dev, cl->me_client_id);

	if (id < 0)

		return id;

	me_cl = mei_me_cl_by_id(dev, cl->me_client_id);

	if (!me_cl)

		return -ENOTTY;



	if (length > dev->me_clients[id].props.max_msg_length)

	if (length > me_cl->props.max_msg_length)

		return -EFBIG;



	cb = mei_io_cb_init(cl, NULL);

drivers/misc/mei/client.c

+20 −23
Original line number Diff line number Diff line
@@ -33,18 +33,19 @@ 
 *

 * Locking: called under "dev->device_lock" lock

 *

 * returns me client index or -ENOENT if not found

 * returns me client or NULL if not found

 */

int mei_me_cl_by_uuid(const struct mei_device *dev, const uuid_le *uuid)

struct mei_me_client *mei_me_cl_by_uuid(const struct mei_device *dev,

					const uuid_le *uuid)

{

	int i;



	for (i = 0; i < dev->me_clients_num; ++i)

		if (uuid_le_cmp(*uuid,

				dev->me_clients[i].props.protocol_name) == 0)

			return i;

			return &dev->me_clients[i];



	return -ENOENT;

	return NULL;

}
@@ -56,18 +57,18 @@ int mei_me_cl_by_uuid(const struct mei_device *dev, const uuid_le *uuid) 
 *

 * Locking: called under "dev->device_lock" lock

 *

 * returns index on success, -ENOENT on failure.

 * returns me client or NULL if not found

 */



int mei_me_cl_by_id(struct mei_device *dev, u8 client_id)

struct mei_me_client *mei_me_cl_by_id(struct mei_device *dev, u8 client_id)

{

	int i;



	for (i = 0; i < dev->me_clients_num; i++)

		if (dev->me_clients[i].client_id == client_id)

			return i;

			return &dev->me_clients[i];



	return -ENOENT;

	return NULL;

}
@@ -646,7 +647,6 @@ int mei_cl_flow_ctrl_creds(struct mei_cl *cl) 
{

	struct mei_device *dev;

	struct mei_me_client *me_cl;

	int id;



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

		return -EINVAL;
@@ -659,13 +659,12 @@ int mei_cl_flow_ctrl_creds(struct mei_cl *cl) 
	if (cl->mei_flow_ctrl_creds > 0)

		return 1;



	id = mei_me_cl_by_id(dev, cl->me_client_id);

	if (id < 0) {

	me_cl = mei_me_cl_by_id(dev, cl->me_client_id);

	if (!me_cl) {

		cl_err(dev, cl, "no such me client %d\n", cl->me_client_id);

		return id;

		return -ENOENT;

	}



	me_cl = &dev->me_clients[id];

	if (me_cl->mei_flow_ctrl_creds) {

		if (WARN_ON(me_cl->props.single_recv_buf == 0))

			return -EINVAL;
@@ -688,21 +687,19 @@ int mei_cl_flow_ctrl_reduce(struct mei_cl *cl) 
{

	struct mei_device *dev;

	struct mei_me_client *me_cl;

	int id;



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

		return -EINVAL;



	dev = cl->dev;



	id = mei_me_cl_by_id(dev, cl->me_client_id);

	if (id < 0) {

	me_cl = mei_me_cl_by_id(dev, cl->me_client_id);

	if (!me_cl) {

		cl_err(dev, cl, "no such me client %d\n", cl->me_client_id);

		return id;

		return -ENOENT;

	}



	me_cl = &dev->me_clients[id];

	if (me_cl->props.single_recv_buf != 0) {

	if (me_cl->props.single_recv_buf) {

		if (WARN_ON(me_cl->mei_flow_ctrl_creds <= 0))

			return -EINVAL;

		me_cl->mei_flow_ctrl_creds--;
@@ -725,8 +722,8 @@ int mei_cl_read_start(struct mei_cl *cl, size_t length) 
{

	struct mei_device *dev;

	struct mei_cl_cb *cb;

	struct mei_me_client *me_cl;

	int rets;

	int i;



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

		return -ENODEV;
@@ -740,8 +737,8 @@ int mei_cl_read_start(struct mei_cl *cl, size_t length) 
		cl_dbg(dev, cl, "read is pending.\n");

		return -EBUSY;

	}

	i = mei_me_cl_by_id(dev, cl->me_client_id);

	if (i < 0) {

	me_cl = mei_me_cl_by_id(dev, cl->me_client_id);

	if (!me_cl) {

		cl_err(dev, cl, "no such me client %d\n", cl->me_client_id);

		return  -ENOTTY;

	}
@@ -760,7 +757,7 @@ int mei_cl_read_start(struct mei_cl *cl, size_t length) 
	}



	/* always allocate at least client max message */

	length = max_t(size_t, length, dev->me_clients[i].props.max_msg_length);

	length = max_t(size_t, length, me_cl->props.max_msg_length);

	rets = mei_io_cb_alloc_resp_buf(cb, length);

	if (rets)

		goto out;

drivers/misc/mei/client.h

+3 −2
Original line number Diff line number Diff line
@@ -24,8 +24,9 @@ 


#include "mei_dev.h"



int mei_me_cl_by_uuid(const struct mei_device *dev, const uuid_le *cuuid);

int mei_me_cl_by_id(struct mei_device *dev, u8 client_id);

struct mei_me_client *mei_me_cl_by_uuid(const struct mei_device *dev,

					const uuid_le *cuuid);

struct mei_me_client *mei_me_cl_by_id(struct mei_device *dev, u8 client_id);



/*

 * MEI IO Functions

drivers/misc/mei/hbm.c

+9 −14
Original line number Diff line number Diff line
@@ -402,25 +402,20 @@ static int mei_hbm_add_single_flow_creds(struct mei_device *dev, 
				  struct hbm_flow_control *flow)

{

	struct mei_me_client *me_cl;

	int id;



	id = mei_me_cl_by_id(dev, flow->me_addr);

	if (id < 0) {

	me_cl = mei_me_cl_by_id(dev, flow->me_addr);

	if (!me_cl) {

		dev_err(&dev->pdev->dev, "no such me client %d\n",

			flow->me_addr);

		return id;

		return -ENOENT;

	}



	me_cl = &dev->me_clients[id];

	if (me_cl->props.single_recv_buf) {

	if (WARN_ON(me_cl->props.single_recv_buf == 0))

		return -EINVAL;



	me_cl->mei_flow_ctrl_creds++;

		dev_dbg(&dev->pdev->dev, "recv flow ctrl msg ME %d (single).\n",

		    flow->me_addr);

		dev_dbg(&dev->pdev->dev, "flow control credentials =%d.\n",

		    me_cl->mei_flow_ctrl_creds);

	} else {

		BUG();	/* error in flow control */

	}

	dev_dbg(&dev->pdev->dev, "recv flow ctrl msg ME %d (single) creds = %d.\n",

	    flow->me_addr, me_cl->mei_flow_ctrl_creds);



	return 0;

}