mei: bus: add vtag support
Subsystems (2)
PATCH 1/2 mei: bus: add vtag support
From: Alexander Usyskin <[email protected]>
Add API to support vtag in communication on mei bus.
Add mei_cldev_send_vtag, mei_cldev_recv_vtag and mei_cldev_recv_nonblock_vtag functions to allow sending a message with vtag set and to receive vtag of an incoming message.
Cc Sean Z Huang <[email protected]>
Signed-off-by Alexander Usyskin <[email protected]>
Signed-off-by Tomas Winkler <[email protected]>
--- drivers/misc/mei/bus-fixup.c | 13 +++-- drivers/misc/mei/bus.c | 101 +++++++++++++++++++++++++++++------ drivers/misc/mei/client.c | 6 ++- drivers/misc/mei/mei_dev.h | 4 +- include/linux/mei_cl_bus.h | 6 +++ 5 files changed, 104 insertions(+), 26 deletions(-)
drivers/misc/mei/bus-fixup.c +8 -5
@@ -148,7 +148,7 @@ static int mei_osver(struct mei_cl_device *cldev) os_ver = (struct mei_os_ver *)fwcaps->data; os_ver->os_type =OSTYPE_LINUX ; -return __mei_cl_send (cldev->cl, buf, size, mode); +return __mei_cl_send (cldev->cl, buf, size,0 , mode); }#define MKHI_FWVER_BUF_LEN (sizeof(struct mkhi_msg_hdr) + \
@@ -169,7 +169,7 @@ static int mei_fwver(struct mei_cl_device *cldev) req.hdr.group_id =MKHI_GEN_GROUP_ID ; req.hdr.command =MKHI_GEN_GET_FW_VERSION_CMD ; - ret =__mei_cl_send (cldev->cl, (u8 *)&req,sizeof (req), + ret =__mei_cl_send (cldev->cl, (u8 *)&req,sizeof (req),0 ,MEI_CL_IO_TX_BLOCKING );if (ret <0 ) {dev_err (&cldev->dev,"Could not send ReqFWVersion cmd\n" );
@@ -177,7 +177,7 @@ static int mei_fwver(struct mei_cl_device *cldev) } ret =0 ; - bytes_recv =__mei_cl_recv (cldev->cl, buf,sizeof (buf),0 , + bytes_recv =__mei_cl_recv (cldev->cl, buf,sizeof (buf),NULL ,0 ,MKHI_RCV_TIMEOUT );if (bytes_recv <0 || (size_t )bytes_recv <MKHI_FWVER_LEN (1 )) {/*
@@ -324,13 +324,15 @@ static int mei_nfc_if_version(struct mei_cl *cl, };struct mei_nfc_reply *reply =NULL ;size_t if_version_length; +u8 vtag;int bytes_recv, ret; bus = cl->dev;WARN_ON (mutex_is_locked (&bus->device_lock)); - ret =__mei_cl_send (cl, (u8 *)&cmd,sizeof (cmd),MEI_CL_IO_TX_BLOCKING ); + ret =__mei_cl_send (cl, (u8 *)&cmd,sizeof (cmd),0 , +MEI_CL_IO_TX_BLOCKING );if (ret <0 ) {dev_err (bus->dev,"Could not send IF version cmd\n" );return ret;
@@ -344,7 +346,8 @@ static int mei_nfc_if_version(struct mei_cl *cl,return -ENOMEM ; ret =0 ; - bytes_recv =__mei_cl_recv (cl, (u8 *)reply, if_version_length,0 ,0 ); + bytes_recv =__mei_cl_recv (cl, (u8 *)reply, if_version_length, &vtag, +0 ,0 );if (bytes_recv <0 || (size_t )bytes_recv < if_version_length) {dev_err (bus->dev,"Could not read IF version\n" ); ret = -EIO ;
drivers/misc/mei/bus.c +84 -17
170 lines not on this page · raw message
drivers/misc/mei/client.c +4 -2
@@ -1306,7 +1306,7 @@ struct mei_cl_vtag *mei_cl_vtag_alloc(struct file *fp, u8 vtag)* mei_cl_fp_by_vtag - obtain the file pointer by vtag * * @cl: host client -* @vtag: vm tag +* @vtag: virtual tag * * Return: * * A file pointer - on success
@@ -1317,7 +1317,9 @@ const struct file *mei_cl_fp_by_vtag(const struct mei_cl *cl, u8 vtag)struct mei_cl_vtag *vtag_l;list_for_each_entry (vtag_l, &cl->vtag_map, list) -if (vtag_l->vtag == vtag) +/* The client on bus has one fixed fp */ +if ((cl->cldev &&mei_cldev_enabled (cl->cldev)) || + vtag_l->vtag == vtag)return vtag_l->fp;return ERR_PTR (-ENOENT );
drivers/misc/mei/mei_dev.h +2 -2
@@ -340,9 +340,9 @@ struct mei_hw_ops {/* MEI bus API*/ void mei_cl_bus_rescan_work (struct work_struct *work);void mei_cl_bus_dev_fixup (struct mei_cl_device *dev); -ssize_t __mei_cl_send (struct mei_cl *cl,u8 *buf,size_t length, +ssize_t __mei_cl_send (struct mei_cl *cl,u8 *buf,size_t length,u8 vtag,unsigned int mode); -ssize_t __mei_cl_recv (struct mei_cl *cl,u8 *buf,size_t length, +ssize_t __mei_cl_recv (struct mei_cl *cl,u8 *buf,size_t length,u8 *vtag,unsigned int mode,unsigned long timeout);bool mei_cl_bus_rx_event (struct mei_cl *cl);bool mei_cl_bus_notify_event (struct mei_cl *cl);
include/linux/mei_cl_bus.h +6 -0
@@ -95,6 +95,12 @@ ssize_t mei_cldev_send(struct mei_cl_device *cldev, u8 *buf, size_t length);ssize_t mei_cldev_recv (struct mei_cl_device *cldev,u8 *buf,size_t length);ssize_t mei_cldev_recv_nonblock (struct mei_cl_device *cldev,u8 *buf,size_t length); +ssize_t mei_cldev_send_vtag (struct mei_cl_device *cldev,u8 *buf,size_t length, +u8 vtag); +ssize_t mei_cldev_recv_vtag (struct mei_cl_device *cldev,u8 *buf,size_t length, +u8 *vtag); +ssize_t mei_cldev_recv_nonblock_vtag (struct mei_cl_device *cldev,u8 *buf, +size_t length,u8 *vtag);int mei_cldev_register_rx_cb (struct mei_cl_device *cldev,mei_cldev_cb_t rx_cb); int mei_cldev_register_notif_cb(struct mei_cl_device *cldev,
Signature · 1 line
2.26.2
PATCH 2/2 mei: bus: enable pavp device.
Enable protected audio video path client on mei client bus.
Cc Sean Z Huang <[email protected]>
Signed-off-by Tomas Winkler <[email protected]>
--- drivers/misc/mei/bus-fixup.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/misc/mei/bus-fixup.c +4 -0
@@ -33,6 +33,9 @@ static const uuid_le mei_nfc_info_guid = MEI_UUID_NFC_INFO;#define MEI_UUID_HDCP UUID_LE(0xB638AB7E, 0x94E2, 0x4EA2, \ 0xA5, 0x52, 0xD1, 0xC5, 0x4B, 0x62, 0x7F, 0x04) +#define MEI_UUID_PAVP UUID_LE(0xfbf6fcf1, 0x96cf, 0x4e2e, 0xA6, \ + 0xa6, 0x1b, 0xab, 0x8c, 0xbe, 0x36, 0xb1) +#define MEI_UUID_ANY NULL_UUID_LE/**
@@ -491,6 +494,7 @@ static struct mei_fixup {MEI_FIXUP (MEI_UUID_MKHIF_FIX , mei_mkhi_fix),MEI_FIXUP (MEI_UUID_HDCP , whitelist),MEI_FIXUP (MEI_UUID_ANY , vt_support), + MEI_FIXUP(MEI_UUID_PAVP, whitelist), };/**
Signature · 1 line
2.26.2