mei: move client functions to client.c
This file now contains me and host client functions and also io callback helpers We also kill iorw.c which is no longer needed Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Tomas Winkler
committed by
Greg Kroah-Hartman
Greg Kroah-Hartman
parent
0edb23fc34
commit
9ca9050b3d
@@ -22,7 +22,6 @@
|
||||
#include <linux/mei.h>
|
||||
|
||||
#include "mei_dev.h"
|
||||
#include "hbm.h"
|
||||
#include "interface.h"
|
||||
|
||||
const char *mei_dev_state_str(int state)
|
||||
@@ -45,47 +44,6 @@ const char *mei_dev_state_str(int state)
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* mei_io_list_flush - removes list entry belonging to cl.
|
||||
*
|
||||
* @list: An instance of our list structure
|
||||
* @cl: private data of the file object
|
||||
*/
|
||||
void mei_io_list_flush(struct mei_cl_cb *list, struct mei_cl *cl)
|
||||
{
|
||||
struct mei_cl_cb *pos;
|
||||
struct mei_cl_cb *next;
|
||||
|
||||
list_for_each_entry_safe(pos, next, &list->list, list) {
|
||||
if (pos->cl) {
|
||||
if (mei_cl_cmp_id(cl, pos->cl))
|
||||
list_del(&pos->list);
|
||||
}
|
||||
}
|
||||
}
|
||||
/**
|
||||
* mei_cl_flush_queues - flushes queue lists belonging to cl.
|
||||
*
|
||||
* @dev: the device structure
|
||||
* @cl: private data of the file object
|
||||
*/
|
||||
int mei_cl_flush_queues(struct mei_cl *cl)
|
||||
{
|
||||
if (!cl || !cl->dev)
|
||||
return -EINVAL;
|
||||
|
||||
dev_dbg(&cl->dev->pdev->dev, "remove list entry belonging to cl\n");
|
||||
mei_io_list_flush(&cl->dev->read_list, cl);
|
||||
mei_io_list_flush(&cl->dev->write_list, cl);
|
||||
mei_io_list_flush(&cl->dev->write_waiting_list, cl);
|
||||
mei_io_list_flush(&cl->dev->ctrl_wr_list, cl);
|
||||
mei_io_list_flush(&cl->dev->ctrl_rd_list, cl);
|
||||
mei_io_list_flush(&cl->dev->amthif_cmd_list, cl);
|
||||
mei_io_list_flush(&cl->dev->amthif_rd_complete_list, cl);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* init_mei_device - allocates and initializes the mei device structure
|
||||
@@ -360,215 +318,5 @@ void mei_allocate_me_clients_storage(struct mei_device *dev)
|
||||
return ;
|
||||
}
|
||||
|
||||
void mei_host_client_init(struct work_struct *work)
|
||||
{
|
||||
struct mei_device *dev = container_of(work,
|
||||
struct mei_device, init_work);
|
||||
struct mei_client_properties *client_props;
|
||||
int i;
|
||||
|
||||
mutex_lock(&dev->device_lock);
|
||||
|
||||
bitmap_zero(dev->host_clients_map, MEI_CLIENTS_MAX);
|
||||
dev->open_handle_count = 0;
|
||||
|
||||
/*
|
||||
* Reserving the first three client IDs
|
||||
* 0: Reserved for MEI Bus Message communications
|
||||
* 1: Reserved for Watchdog
|
||||
* 2: Reserved for AMTHI
|
||||
*/
|
||||
bitmap_set(dev->host_clients_map, 0, 3);
|
||||
|
||||
for (i = 0; i < dev->me_clients_num; i++) {
|
||||
client_props = &dev->me_clients[i].props;
|
||||
|
||||
if (!uuid_le_cmp(client_props->protocol_name, mei_amthi_guid))
|
||||
mei_amthif_host_init(dev);
|
||||
else if (!uuid_le_cmp(client_props->protocol_name, mei_wd_guid))
|
||||
mei_wd_host_init(dev);
|
||||
}
|
||||
|
||||
dev->dev_state = MEI_DEV_ENABLED;
|
||||
|
||||
mutex_unlock(&dev->device_lock);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* mei_init_file_private - initializes private file structure.
|
||||
*
|
||||
* @priv: private file structure to be initialized
|
||||
* @file: the file structure
|
||||
*/
|
||||
void mei_cl_init(struct mei_cl *priv, struct mei_device *dev)
|
||||
{
|
||||
memset(priv, 0, sizeof(struct mei_cl));
|
||||
init_waitqueue_head(&priv->wait);
|
||||
init_waitqueue_head(&priv->rx_wait);
|
||||
init_waitqueue_head(&priv->tx_wait);
|
||||
INIT_LIST_HEAD(&priv->link);
|
||||
priv->reading_state = MEI_IDLE;
|
||||
priv->writing_state = MEI_IDLE;
|
||||
priv->dev = dev;
|
||||
}
|
||||
|
||||
int mei_me_cl_by_uuid(const struct mei_device *dev, const uuid_le *cuuid)
|
||||
{
|
||||
int i, res = -ENOENT;
|
||||
|
||||
for (i = 0; i < dev->me_clients_num; ++i)
|
||||
if (uuid_le_cmp(*cuuid,
|
||||
dev->me_clients[i].props.protocol_name) == 0) {
|
||||
res = i;
|
||||
break;
|
||||
}
|
||||
|
||||
return res;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* mei_me_cl_link - create link between host and me clinet and add
|
||||
* me_cl to the list
|
||||
*
|
||||
* @dev: the device structure
|
||||
* @cl: link between me and host client assocated with opened file descriptor
|
||||
* @cuuid: uuid of ME client
|
||||
* @client_id: id of the host client
|
||||
*
|
||||
* returns ME client index if ME client
|
||||
* -EINVAL on incorrect values
|
||||
* -ENONET if client not found
|
||||
*/
|
||||
int mei_me_cl_link(struct mei_device *dev, struct mei_cl *cl,
|
||||
const uuid_le *cuuid, u8 host_cl_id)
|
||||
{
|
||||
int i;
|
||||
|
||||
if (!dev || !cl || !cuuid)
|
||||
return -EINVAL;
|
||||
|
||||
/* check for valid client id */
|
||||
i = mei_me_cl_by_uuid(dev, cuuid);
|
||||
if (i >= 0) {
|
||||
cl->me_client_id = dev->me_clients[i].client_id;
|
||||
cl->state = MEI_FILE_CONNECTING;
|
||||
cl->host_client_id = host_cl_id;
|
||||
|
||||
list_add_tail(&cl->link, &dev->file_list);
|
||||
return (u8)i;
|
||||
}
|
||||
|
||||
return -ENOENT;
|
||||
}
|
||||
/**
|
||||
* mei_me_cl_unlink - remove me_cl from the list
|
||||
*
|
||||
* @dev: the device structure
|
||||
* @host_client_id: host client id to be removed
|
||||
*/
|
||||
void mei_me_cl_unlink(struct mei_device *dev, struct mei_cl *cl)
|
||||
{
|
||||
struct mei_cl *pos, *next;
|
||||
list_for_each_entry_safe(pos, next, &dev->file_list, link) {
|
||||
if (cl->host_client_id == pos->host_client_id) {
|
||||
dev_dbg(&dev->pdev->dev, "remove host client = %d, ME client = %d\n",
|
||||
pos->host_client_id, pos->me_client_id);
|
||||
list_del_init(&pos->link);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* mei_alloc_file_private - allocates a private file structure and sets it up.
|
||||
* @file: the file structure
|
||||
*
|
||||
* returns The allocated file or NULL on failure
|
||||
*/
|
||||
struct mei_cl *mei_cl_allocate(struct mei_device *dev)
|
||||
{
|
||||
struct mei_cl *cl;
|
||||
|
||||
cl = kmalloc(sizeof(struct mei_cl), GFP_KERNEL);
|
||||
if (!cl)
|
||||
return NULL;
|
||||
|
||||
mei_cl_init(cl, dev);
|
||||
|
||||
return cl;
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* mei_disconnect_host_client - sends disconnect message to fw from host client.
|
||||
*
|
||||
* @dev: the device structure
|
||||
* @cl: private data of the file object
|
||||
*
|
||||
* Locking: called under "dev->device_lock" lock
|
||||
*
|
||||
* returns 0 on success, <0 on failure.
|
||||
*/
|
||||
int mei_disconnect_host_client(struct mei_device *dev, struct mei_cl *cl)
|
||||
{
|
||||
struct mei_cl_cb *cb;
|
||||
int rets, err;
|
||||
|
||||
if (!dev || !cl)
|
||||
return -ENODEV;
|
||||
|
||||
if (cl->state != MEI_FILE_DISCONNECTING)
|
||||
return 0;
|
||||
|
||||
cb = mei_io_cb_init(cl, NULL);
|
||||
if (!cb)
|
||||
return -ENOMEM;
|
||||
|
||||
cb->fop_type = MEI_FOP_CLOSE;
|
||||
if (dev->mei_host_buffer_is_empty) {
|
||||
dev->mei_host_buffer_is_empty = false;
|
||||
if (mei_hbm_cl_disconnect_req(dev, cl)) {
|
||||
rets = -ENODEV;
|
||||
dev_err(&dev->pdev->dev, "failed to disconnect.\n");
|
||||
goto free;
|
||||
}
|
||||
mdelay(10); /* Wait for hardware disconnection ready */
|
||||
list_add_tail(&cb->list, &dev->ctrl_rd_list.list);
|
||||
} else {
|
||||
dev_dbg(&dev->pdev->dev, "add disconnect cb to control write list\n");
|
||||
list_add_tail(&cb->list, &dev->ctrl_wr_list.list);
|
||||
|
||||
}
|
||||
mutex_unlock(&dev->device_lock);
|
||||
|
||||
err = wait_event_timeout(dev->wait_recvd_msg,
|
||||
MEI_FILE_DISCONNECTED == cl->state,
|
||||
mei_secs_to_jiffies(MEI_CL_CONNECT_TIMEOUT));
|
||||
|
||||
mutex_lock(&dev->device_lock);
|
||||
if (MEI_FILE_DISCONNECTED == cl->state) {
|
||||
rets = 0;
|
||||
dev_dbg(&dev->pdev->dev, "successfully disconnected from FW client.\n");
|
||||
} else {
|
||||
rets = -ENODEV;
|
||||
if (MEI_FILE_DISCONNECTED != cl->state)
|
||||
dev_dbg(&dev->pdev->dev, "wrong status client disconnect.\n");
|
||||
|
||||
if (err)
|
||||
dev_dbg(&dev->pdev->dev,
|
||||
"wait failed disconnect err=%08x\n",
|
||||
err);
|
||||
|
||||
dev_dbg(&dev->pdev->dev, "failed to disconnect from FW client.\n");
|
||||
}
|
||||
|
||||
mei_io_list_flush(&dev->ctrl_rd_list, cl);
|
||||
mei_io_list_flush(&dev->ctrl_wr_list, cl);
|
||||
free:
|
||||
mei_io_cb_free(cb);
|
||||
return rets;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user