korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-17 17:24:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

mei: connection to fixed address clients from user-space

Browse Source 
This should be used for debug only.
The feaure is gated by "allow_fixed_address" control exposed in debugfs.

Signed-off-by: Alexander Usyskin <alexander.usyskin@intel.com>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Alexander Usyskin 2015-05-04 09:43:57 +03:00 committed by Greg Kroah-Hartman
parent 1df629ef4d
commit eeabfcf5a9
3 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/misc/mei/debugfs.c
View File

@ -209,6 +209,12 @@ int mei_dbgfs_register(struct mei_device *dev, const char *name)
dev_err(dev->dev, "devstate: registration failed\n"); dev_err(dev->dev, "devstate: registration failed\n");
goto err; goto err;
} }
f = debugfs_create_bool("allow_fixed_address", S_IRUSR | S_IWUSR, dir,
&dev->allow_fixed_address);
if (!f) {
dev_err(dev->dev, "allow_fixed_address: registration failed\n");
goto err;
}
dev->dbgfs_dir = dir; dev->dbgfs_dir = dir;
return 0; return 0;
err: err:

8
drivers/misc/mei/main.c
View File

@ -215,6 +215,11 @@ static ssize_t mei_read(struct file *file, char __user *ubuf,
cb = mei_cl_read_cb(cl, file); cb = mei_cl_read_cb(cl, file);
if (!cb) { if (!cb) {
if (mei_cl_is_fixed_address(cl) && dev->allow_fixed_address) {
cb = mei_cl_read_cb(cl, NULL);
if (cb)
goto copy_buffer;
}
rets = 0; rets = 0;
goto out; goto out;
} }
@ -389,7 +394,8 @@ static int mei_ioctl_connect_client(struct file *file,
/* find ME client we're trying to connect to */ /* find ME client we're trying to connect to */
me_cl = mei_me_cl_by_uuid(dev, &data->in_client_uuid); me_cl = mei_me_cl_by_uuid(dev, &data->in_client_uuid);
if (!me_cl || me_cl->props.fixed_address) { if (!me_cl ||
(me_cl->props.fixed_address && !dev->allow_fixed_address)) {
dev_dbg(dev->dev, "Cannot connect to FW Client UUID = %pUl\n", dev_dbg(dev->dev, "Cannot connect to FW Client UUID = %pUl\n",
&data->in_client_uuid); &data->in_client_uuid);
mei_me_cl_put(me_cl); mei_me_cl_put(me_cl);

4
drivers/misc/mei/mei_dev.h
View File

@ -476,6 +476,8 @@ const char *mei_pg_state_str(enum mei_pg_state state);
* @host_clients_map : host clients id pool * @host_clients_map : host clients id pool
* @me_client_index : last FW client index in enumeration * @me_client_index : last FW client index in enumeration
* *
* @allow_fixed_address: allow user space to connect a fixed client
*
* @wd_cl : watchdog client * @wd_cl : watchdog client
* @wd_state : watchdog client state * @wd_state : watchdog client state
* @wd_pending : watchdog command is pending * @wd_pending : watchdog command is pending
@ -567,6 +569,8 @@ struct mei_device {
DECLARE_BITMAP(host_clients_map, MEI_CLIENTS_MAX); DECLARE_BITMAP(host_clients_map, MEI_CLIENTS_MAX);
unsigned long me_client_index; unsigned long me_client_index;
u32 allow_fixed_address;
struct mei_cl wd_cl; struct mei_cl wd_cl;
enum mei_wd_states wd_state; enum mei_wd_states wd_state;
bool wd_pending; bool wd_pending;