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: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/misc/mei/amthif.c b/drivers/misc/mei/amthif.c
index ab60959886202e6160f1b880a021343108887642..c1fc6dd8faae5d6c523da93a1965fa1a5dc8f6ef 100644 (file)
--- a/drivers/misc/mei/amthif.c
+++ b/drivers/misc/mei/amthif.c
@@ -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);
 

diff --git a/drivers/misc/mei/bus.c b/drivers/misc/mei/bus.c
index 0e993ef28b94ff23272b0a3d2f57e87f73da6c3b..c829676c471604aec417eef64d14caaffd6e9009 100644 (file)
--- a/drivers/misc/mei/bus.c
+++ b/drivers/misc/mei/bus.c
@@ -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);

diff --git a/drivers/misc/mei/client.c b/drivers/misc/mei/client.c
index 3c5a1d3289774c9160d8870fbdaf7c3e13f9a1f9..a20e6e9422f80449fee8d310439f0671207f5356 100644 (file)
--- a/drivers/misc/mei/client.c
+++ b/drivers/misc/mei/client.c
@@ -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;

diff --git a/drivers/misc/mei/client.h b/drivers/misc/mei/client.h
index bf2b0b1b493d52fdf9c3942cb6bf3a25e0a901cd..ddb95b2ee2ac5dec23ad2b2e84fd42c124a902c9 100644 (file)
--- a/drivers/misc/mei/client.h
+++ b/drivers/misc/mei/client.h
@@ -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

diff --git a/drivers/misc/mei/hbm.c b/drivers/misc/mei/hbm.c
index 2b4ea161d748d3cbbbee0efb089e89a1ee498478..0b21675967f9e9efcc68d5056c243875f3dc3e37 100644 (file)
--- a/drivers/misc/mei/hbm.c
+++ b/drivers/misc/mei/hbm.c
@@ -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) {
-               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 */
-       }
+       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) creds = %d.\n",
+           flow->me_addr, me_cl->mei_flow_ctrl_creds);
 
        return 0;
 }

diff --git a/drivers/misc/mei/main.c b/drivers/misc/mei/main.c
index 401a3d526cd0a0a316374974a45ffb21861396f5..a65b7cc4a8775a9333b2139259088876665cebf4 100644 (file)
--- a/drivers/misc/mei/main.c
+++ b/drivers/misc/mei/main.c
@@ -303,11 +303,11 @@ static ssize_t mei_write(struct file *file, const char __user *ubuf,
                         size_t length, loff_t *offset)
 {
        struct mei_cl *cl = file->private_data;
+       struct mei_me_client *me_cl;
        struct mei_cl_cb *write_cb = NULL;
        struct mei_device *dev;
        unsigned long timeout = 0;
        int rets;
-       int id;
 
        if (WARN_ON(!cl || !cl->dev))
                return -ENODEV;
@@ -321,8 +321,8 @@ static ssize_t mei_write(struct file *file, const char __user *ubuf,
                goto out;
        }
 
-       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) {
                rets = -ENOTTY;
                goto out;
        }
@@ -332,7 +332,7 @@ static ssize_t mei_write(struct file *file, const char __user *ubuf,
                goto out;
        }
 
-       if (length > dev->me_clients[id].props.max_msg_length) {
+       if (length > me_cl->props.max_msg_length) {
                rets = -EFBIG;
                goto out;
        }
@@ -428,8 +428,8 @@ static int mei_ioctl_connect_client(struct file *file,
 {
        struct mei_device *dev;
        struct mei_client *client;
+       struct mei_me_client *me_cl;
        struct mei_cl *cl;
-       int i;
        int rets;
 
        cl = file->private_data;
@@ -450,22 +450,22 @@ static int mei_ioctl_connect_client(struct file *file,
        }
 
        /* find ME client we're trying to connect to */
-       i = mei_me_cl_by_uuid(dev, &data->in_client_uuid);
-       if (i < 0 || dev->me_clients[i].props.fixed_address) {
+       me_cl = mei_me_cl_by_uuid(dev, &data->in_client_uuid);
+       if (!me_cl || me_cl->props.fixed_address) {
                dev_dbg(&dev->pdev->dev, "Cannot connect to FW Client UUID = %pUl\n",
                                &data->in_client_uuid);
                rets = -ENOTTY;
                goto end;
        }
 
-       cl->me_client_id = dev->me_clients[i].client_id;
+       cl->me_client_id = me_cl->client_id;
 
        dev_dbg(&dev->pdev->dev, "Connect to FW Client ID = %d\n",
                        cl->me_client_id);
        dev_dbg(&dev->pdev->dev, "FW Client - Protocol Version = %d\n",
-                       dev->me_clients[i].props.protocol_version);
+                       me_cl->props.protocol_version);
        dev_dbg(&dev->pdev->dev, "FW Client - Max Msg Len = %d\n",
-                       dev->me_clients[i].props.max_msg_length);
+                       me_cl->props.max_msg_length);
 
        /* if we're connecting to amthif client then we will use the
         * existing connection
@@ -484,10 +484,8 @@ static int mei_ioctl_connect_client(struct file *file,
                file->private_data = &dev->iamthif_cl;
 
                client = &data->out_client_properties;
-               client->max_msg_length =
-                       dev->me_clients[i].props.max_msg_length;
-               client->protocol_version =
-                       dev->me_clients[i].props.protocol_version;
+               client->max_msg_length = me_cl->props.max_msg_length;
+               client->protocol_version = me_cl->props.protocol_version;
                rets = dev->iamthif_cl.status;
 
                goto end;
@@ -496,8 +494,8 @@ static int mei_ioctl_connect_client(struct file *file,
 
        /* prepare the output buffer */
        client = &data->out_client_properties;
-       client->max_msg_length = dev->me_clients[i].props.max_msg_length;
-       client->protocol_version = dev->me_clients[i].props.protocol_version;
+       client->max_msg_length = me_cl->props.max_msg_length;
+       client->protocol_version = me_cl->props.protocol_version;
        dev_dbg(&dev->pdev->dev, "Can connect?\n");
 
 

diff --git a/drivers/misc/mei/nfc.c b/drivers/misc/mei/nfc.c
index 5ccc23bc76904a3b1dbe2770667e7aad502f96cf..964b4c606646929e353a489328faf634fcdc251a 100644 (file)
--- a/drivers/misc/mei/nfc.c
+++ b/drivers/misc/mei/nfc.c
@@ -480,7 +480,8 @@ int mei_nfc_host_init(struct mei_device *dev)
 {
        struct mei_nfc_dev *ndev = &nfc_dev;
        struct mei_cl *cl_info, *cl = NULL;
-       int i, ret;
+       struct mei_me_client *me_cl;
+       int ret;
 
        /* already initialized */
        if (ndev->cl_info)
@@ -498,14 +499,14 @@ int mei_nfc_host_init(struct mei_device *dev)
        }
 
        /* check for valid client id */
-       i = mei_me_cl_by_uuid(dev, &mei_nfc_info_guid);
-       if (i < 0) {
+       me_cl = mei_me_cl_by_uuid(dev, &mei_nfc_info_guid);
+       if (!me_cl) {
                dev_info(&dev->pdev->dev, "nfc: failed to find the client\n");
                ret = -ENOTTY;
                goto err;
        }
 
-       cl_info->me_client_id = dev->me_clients[i].client_id;
+       cl_info->me_client_id = me_cl->client_id;
 
        ret = mei_cl_link(cl_info, MEI_HOST_CLIENT_ID_ANY);
        if (ret)
@@ -516,14 +517,14 @@ int mei_nfc_host_init(struct mei_device *dev)
        list_add_tail(&cl_info->device_link, &dev->device_list);
 
        /* check for valid client id */
-       i = mei_me_cl_by_uuid(dev, &mei_nfc_guid);
-       if (i < 0) {
+       me_cl = mei_me_cl_by_uuid(dev, &mei_nfc_guid);
+       if (!me_cl) {
                dev_info(&dev->pdev->dev, "nfc: failed to find the client\n");
                ret = -ENOTTY;
                goto err;
        }
 
-       cl->me_client_id = dev->me_clients[i].client_id;
+       cl->me_client_id = me_cl->client_id;
 
        ret = mei_cl_link(cl, MEI_HOST_CLIENT_ID_ANY);
        if (ret)

diff --git a/drivers/misc/mei/wd.c b/drivers/misc/mei/wd.c
index a84a664dfccb281746e0932a004905bb459074d6..8b241eef35d2c6641416f7c9e2787564314a77be 100644 (file)
--- a/drivers/misc/mei/wd.c
+++ b/drivers/misc/mei/wd.c
@@ -59,7 +59,7 @@ static void mei_wd_set_start_timeout(struct mei_device *dev, u16 timeout)
 int mei_wd_host_init(struct mei_device *dev)
 {
        struct mei_cl *cl = &dev->wd_cl;
-       int id;
+       struct mei_me_client *me_cl;
        int ret;
 
        mei_cl_init(cl, dev);
@@ -69,13 +69,13 @@ int mei_wd_host_init(struct mei_device *dev)
 
 
        /* check for valid client id */
-       id = mei_me_cl_by_uuid(dev, &mei_wd_guid);
-       if (id < 0) {
+       me_cl = mei_me_cl_by_uuid(dev, &mei_wd_guid);
+       if (!me_cl) {
                dev_info(&dev->pdev->dev, "wd: failed to find the client\n");
                return -ENOTTY;
        }
 
-       cl->me_client_id = dev->me_clients[id].client_id;
+       cl->me_client_id = me_cl->client_id;
 
        ret = mei_cl_link(cl, MEI_WD_HOST_CLIENT_ID);