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

mei: deprecate the mei_wd_state_independence_msg 



wd independence is deprecated, remove it.

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

drivers/misc/mei/main.c

+0 −25
Original line number Diff line number Diff line
@@ -194,7 +194,6 @@ static ssize_t mei_read(struct file *file, char __user *ubuf, 
	struct mei_cl_cb *cb_pos = NULL;

	struct mei_cl_cb *cb = NULL;

	struct mei_device *dev;

	int i;

	int rets;

	int err;
@@ -210,20 +209,6 @@ static ssize_t mei_read(struct file *file, char __user *ubuf, 
		goto out;

	}



	if ((cl->sm_state & MEI_WD_STATE_INDEPENDENCE_MSG_SENT) == 0) {

		/* Do not allow to read watchdog client */

		i = mei_me_cl_by_uuid(dev, &mei_wd_guid);

		if (i >= 0) {

			struct mei_me_client *me_client = &dev->me_clients[i];

			if (cl->me_client_id == me_client->client_id) {

				rets = -EBADF;

				goto out;

			}

		}

	} else {

		cl->sm_state &= ~MEI_WD_STATE_INDEPENDENCE_MSG_SENT;

	}



	if (cl == &dev->iamthif_cl) {

		rets = mei_amthif_read(dev, file, ubuf, length, offset);

		goto out;
@@ -420,16 +405,6 @@ static ssize_t mei_write(struct file *file, const char __user *ubuf, 
	if (rets)

		goto out;



	cl->sm_state = 0;

	if (length == 4 &&

	    ((memcmp(mei_wd_state_independence_msg[0],

				 write_cb->request_buffer.data, 4) == 0) ||

	     (memcmp(mei_wd_state_independence_msg[1],

				 write_cb->request_buffer.data, 4) == 0) ||

	     (memcmp(mei_wd_state_independence_msg[2],

				 write_cb->request_buffer.data, 4) == 0)))

		cl->sm_state |= MEI_WD_STATE_INDEPENDENCE_MSG_SENT;



	if (cl == &dev->iamthif_cl) {

		rets = mei_amthif_write(dev, write_cb);

drivers/misc/mei/mei_dev.h

+0 −6
Original line number Diff line number Diff line
@@ -55,11 +55,6 @@ extern const uuid_le mei_amthif_guid; 
 */

extern const uuid_le mei_wd_guid;



/*

 * Watchdog independence state message

 */

extern const u8 mei_wd_state_independence_msg[3][4];



/*

 * Number of Maximum MEI Clients

 */
@@ -201,7 +196,6 @@ struct mei_cl { 
	u8 timer_count;

	enum mei_file_transaction_states reading_state;

	enum mei_file_transaction_states writing_state;

	int sm_state;

	struct mei_cl_cb *read_cb;



	/* MEI CL bus data */

drivers/misc/mei/wd.c

+0 −6
Original line number Diff line number Diff line
@@ -31,12 +31,6 @@ 
static const u8 mei_start_wd_params[] = { 0x02, 0x12, 0x13, 0x10 };

static const u8 mei_stop_wd_params[] = { 0x02, 0x02, 0x14, 0x10 };



const u8 mei_wd_state_independence_msg[3][4] = {

	{0x05, 0x02, 0x51, 0x10},

	{0x05, 0x02, 0x52, 0x10},

	{0x07, 0x02, 0x01, 0x10}

};



/*

 * AMT Watchdog Device

 */