Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 479327fc authored by Tomas Winkler's avatar Tomas Winkler Committed by Greg Kroah-Hartman
Browse files

mei: enable marking internal commands 



Set hbm header bit 30 for internal commands
This mark commands that are generated by
the device driver

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

drivers/misc/mei/amthif.c

+2 −0
Original line number Diff line number Diff line
@@ -316,6 +316,7 @@ static int mei_amthif_send_cmd(struct mei_device *dev, struct mei_cl_cb *cb) 
		mei_hdr.host_addr = dev->iamthif_cl.host_client_id;

		mei_hdr.me_addr = dev->iamthif_cl.me_client_id;

		mei_hdr.reserved = 0;

		mei_hdr.internal = 0;

		dev->iamthif_msg_buf_index += mei_hdr.length;

		ret = mei_write_message(dev, &mei_hdr, dev->iamthif_msg_buf);

		if (ret)
@@ -477,6 +478,7 @@ int mei_amthif_irq_write_complete(struct mei_cl *cl, struct mei_cl_cb *cb, 
	mei_hdr.host_addr = cl->host_client_id;

	mei_hdr.me_addr = cl->me_client_id;

	mei_hdr.reserved = 0;

	mei_hdr.internal = 0;



	if (*slots >= msg_slots) {

		mei_hdr.length = len;

drivers/misc/mei/client.c

+2 −0
Original line number Diff line number Diff line
@@ -727,6 +727,7 @@ int mei_cl_irq_write_complete(struct mei_cl *cl, struct mei_cl_cb *cb, 
	mei_hdr.host_addr = cl->host_client_id;

	mei_hdr.me_addr = cl->me_client_id;

	mei_hdr.reserved = 0;

	mei_hdr.internal = cb->internal;



	if (*slots >= msg_slots) {

		mei_hdr.length = len;
@@ -826,6 +827,7 @@ int mei_cl_write(struct mei_cl *cl, struct mei_cl_cb *cb, bool blocking) 
	mei_hdr.host_addr = cl->host_client_id;

	mei_hdr.me_addr = cl->me_client_id;

	mei_hdr.reserved = 0;

	mei_hdr.internal = cb->internal;





	rets = mei_write_message(dev, &mei_hdr, buf->data);

drivers/misc/mei/hw.h

+2 −1
Original line number Diff line number Diff line
@@ -111,7 +111,8 @@ struct mei_msg_hdr { 
	u32 me_addr:8;

	u32 host_addr:8;

	u32 length:9;

	u32 reserved:6;

	u32 reserved:5;

	u32 internal:1;

	u32 msg_complete:1;

} __packed;

drivers/misc/mei/mei_dev.h

+3 −2
Original line number Diff line number Diff line
@@ -178,6 +178,7 @@ struct mei_cl_cb { 
	unsigned long buf_idx;

	unsigned long read_time;

	struct file *file_object;

	u32 internal:1;

};



/* MEI client instance carried as file->pirvate_data*/
@@ -637,9 +638,9 @@ static inline void mei_dbgfs_deregister(struct mei_device *dev) {} 
int mei_register(struct mei_device *dev);

void mei_deregister(struct mei_device *dev);



#define MEI_HDR_FMT "hdr:host=%02d me=%02d len=%d comp=%1d"

#define MEI_HDR_FMT "hdr:host=%02d me=%02d len=%d internal=%1d comp=%1d"

#define MEI_HDR_PRM(hdr)                  \

	(hdr)->host_addr, (hdr)->me_addr, \

	(hdr)->length, (hdr)->msg_complete

	(hdr)->length, (hdr)->internal, (hdr)->msg_complete



#endif

drivers/misc/mei/wd.c

+1 −0
Original line number Diff line number Diff line
@@ -115,6 +115,7 @@ int mei_wd_send(struct mei_device *dev) 
	hdr.me_addr = dev->wd_cl.me_client_id;

	hdr.msg_complete = 1;

	hdr.reserved = 0;

	hdr.internal = 0;



	if (!memcmp(dev->wd_data, mei_start_wd_params, MEI_WD_HDR_SIZE))

		hdr.length = MEI_WD_START_MSG_SIZE;