We keep track of all MEI devices on the bus through a specific linked list.
We also have a mei_device instance in the mei_cl structure.
Signed-off-by: Samuel Ortiz <sa...@linux.intel.com>
Signed-off-by: Tomas Winkler <tomas.wink...@intel.com>
---
drivers/misc/mei/bus.c | 46 +++++++++++++++++++++++++++++++-------------
drivers/misc/mei/client.c | 1 +
drivers/misc/mei/init.c | 1 +
drivers/misc/mei/mei_dev.h | 8 ++++++++
4 files changed, 43 insertions(+), 13 deletions(-)
diff --git a/drivers/misc/mei/bus.c b/drivers/misc/mei/bus.c
index 7229d3e..0d8caec 100644
--- a/drivers/misc/mei/bus.c
+++ b/drivers/misc/mei/bus.c
@@ -117,17 +117,37 @@ static struct device_type mei_client_type = {
.release = mei_client_dev_release,
};
+static struct mei_cl *mei_bus_find_mei_cl_by_uuid(struct mei_host *mei_dev,
+ uuid_le uuid)
+{
+ struct mei_cl *cl, *next;
+
+ list_for_each_entry_safe(cl, next,
+ &mei_dev->device_list, device_link) {
+ if (!uuid_le_cmp(uuid, cl->device_uuid))
+ return cl;
+ }
+
+ return NULL;
+}
+
struct mei_device *mei_add_device(struct mei_host *mei_host,
uuid_le uuid, char *name)
{
struct mei_device *device;
+ struct mei_cl *cl;
int status;
+ cl = mei_bus_find_mei_cl_by_uuid(mei_host, uuid);
+ if (cl == NULL)
+ return NULL;
+
device = kzalloc(sizeof(struct mei_device), GFP_KERNEL);
if (!device)
return NULL;
device->uuid = uuid;
+ device->cl = cl;
device->dev.parent = &mei_host->pdev->dev;
device->dev.bus = &mei_bus_type;
@@ -136,19 +156,17 @@ struct mei_device *mei_add_device(struct mei_host
*mei_host,
dev_set_name(&device->dev, "%s", name);
status = device_register(&device->dev);
- if (status)
- goto out_err;
+ if (status) {
+ kfree(device);
+ dev_err(device->dev.parent, "Failed to register MEI device\n");
+ return NULL;
+ }
+
+ cl->device = device;
dev_dbg(&device->dev, "client %s registered\n", name);
return device;
-
-out_err:
- dev_err(device->dev.parent, "Failed to register MEI client\n");
-
- kfree(device);
-
- return NULL;
}
EXPORT_SYMBOL_GPL(mei_add_device);
@@ -346,9 +364,10 @@ out:
int mei_send(struct mei_device *device, u8 *buf, size_t length)
{
- struct mei_cl *cl = NULL;
+ struct mei_cl *cl = device->cl;
- /* TODO: hook between mei_bus_client and mei_cl */
+ if (cl == NULL)
+ return -ENODEV;
if (device->ops && device->ops->send)
return device->ops->send(device, buf, length);
@@ -359,9 +378,10 @@ EXPORT_SYMBOL_GPL(mei_send);
int mei_recv(struct mei_device *device, u8 *buf, size_t length)
{
- struct mei_cl *cl = NULL;
+ struct mei_cl *cl = device->cl;
- /* TODO: hook between mei_bus_client and mei_cl */
+ if (cl == NULL)
+ return -ENODEV;
if (device->ops && device->ops->recv)
return device->ops->recv(device, buf, length);
diff --git a/drivers/misc/mei/client.c b/drivers/misc/mei/client.c
index 79eda18..ef5300a 100644
--- a/drivers/misc/mei/client.c
+++ b/drivers/misc/mei/client.c
@@ -216,6 +216,7 @@ void mei_cl_init(struct mei_cl *cl, struct mei_host *dev)
init_waitqueue_head(&cl->rx_wait);
init_waitqueue_head(&cl->tx_wait);
INIT_LIST_HEAD(&cl->link);
+ INIT_LIST_HEAD(&cl->device_link);
cl->reading_state = MEI_IDLE;
cl->writing_state = MEI_IDLE;
cl->dev = dev;
diff --git a/drivers/misc/mei/init.c b/drivers/misc/mei/init.c
index d4b48a7..6fb4a9e 100644
--- a/drivers/misc/mei/init.c
+++ b/drivers/misc/mei/init.c
@@ -46,6 +46,7 @@ void mei_device_init(struct mei_host *dev)
{
/* setup our list array */
INIT_LIST_HEAD(&dev->file_list);
+ INIT_LIST_HEAD(&dev->device_list);
mutex_init(&dev->device_lock);
init_waitqueue_head(&dev->wait_recvd_msg);
init_waitqueue_head(&dev->wait_stop_wd);
diff --git a/drivers/misc/mei/mei_dev.h b/drivers/misc/mei/mei_dev.h
index ee75343..45d008b 100644
--- a/drivers/misc/mei/mei_dev.h
+++ b/drivers/misc/mei/mei_dev.h
@@ -210,6 +210,11 @@ struct mei_cl {
enum mei_file_transaction_states writing_state;
int sm_state;
struct mei_cl_cb *read_cb;
+
+ /* MEI bus data */
+ struct mei_device *device;
+ struct list_head device_link;
+ uuid_le device_uuid;
};
/** struct mei_hw_ops
@@ -420,6 +425,9 @@ struct mei_host {
struct work_struct init_work;
+ /* List of bus devices */
+ struct list_head device_list;
+
const struct mei_hw_ops *ops;
char hw[0] __aligned(sizeof(void *));
};
--
1.7.10.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
