| Message ID | 1531538117-1606-36-git-send-email-ramalingam.c@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
>-----Original Message----- >From: C, Ramalingam >Sent: Saturday, July 14, 2018 8:45 AM >To: intel-gfx@lists.freedesktop.org; dri-devel@lists.freedesktop.org; >daniel@ffwll.ch; seanpaul@chromium.org; Winkler, Tomas ><tomas.winkler@intel.com>; Usyskin, Alexander <alexander.usyskin@intel.com>; >Shankar, Uma <uma.shankar@intel.com> >Cc: Sharma, Shashank <shashank.sharma@intel.com>; C, Ramalingam ><ramalingam.c@intel.com> >Subject: [PATCH v6 35/35] misc/mei/hdcp: Closing wired HDCP2.2 Tx Session > >Request the ME to terminate the HDCP2.2 session for a port. > >On Success, ME FW will mark the intel port as Deauthenticated and terminate the >wired HDCP2.2 Tx session started due to the cmd >WIRED_INITIATE_HDCP2_SESSION. > >v2: > Rebased. >v3: > cldev is passed as first parameter [Tomas] > Redundant comments and cast are removed [Tomas] >v4: > %zd for ssize_t [Alexander] > %s/return -1/return -EIO [Alexander] > Style and typos fixed [Uma] >v5: > Extra line is removed. >v6: > No change. > Looks ok to me. Reviewed-by: Uma Shankar <uma.shankar@intel.com> >Signed-off-by: Ramalingam C <ramalingam.c@intel.com> >--- > drivers/misc/mei/hdcp/mei_hdcp.c | 56 >+++++++++++++++++++++++++++++++++++++++- > 1 file changed, 55 insertions(+), 1 deletion(-) > >diff --git a/drivers/misc/mei/hdcp/mei_hdcp.c >b/drivers/misc/mei/hdcp/mei_hdcp.c >index fdfdfb1724ec..032b2823fcf3 100644 >--- a/drivers/misc/mei/hdcp/mei_hdcp.c >+++ b/drivers/misc/mei/hdcp/mei_hdcp.c >@@ -678,6 +678,60 @@ static int mei_enable_hdcp_authentication(struct >mei_cl_device *cldev, > return 0; > } > >+/* >+ * mei_close_hdcp_session: >+ * Function to close the Wired HDCP Tx session of ME FW. >+ * This also disables the authenticated state of the port. >+ * >+ * data : Intel HW specific Data >+ * >+ * Returns 0 on Success, <0 on Failure >+ */ >+static int mei_close_hdcp_session(struct mei_cl_device *cldev, >+ struct mei_hdcp_data *data) >+{ >+ struct wired_cmd_close_session_in session_close_in = { { 0 } }; >+ struct wired_cmd_close_session_out session_close_out = { { 0 } }; >+ struct device *dev; >+ ssize_t byte; >+ >+ if (!data) >+ return -EINVAL; >+ >+ dev = &cldev->dev; >+ >+ session_close_in.header.api_version = HDCP_API_VERSION; >+ session_close_in.header.command_id = WIRED_CLOSE_SESSION; >+ session_close_in.header.status = ME_HDCP_STATUS_SUCCESS; >+ session_close_in.header.buffer_len = >+ WIRED_CMD_BUF_LEN_CLOSE_SESSION_IN; >+ >+ session_close_in.port.integrated_port_type = data->port_type; >+ session_close_in.port.physical_port = data->port; >+ >+ byte = mei_cldev_send(cldev, (u8 *)&session_close_in, >+ sizeof(session_close_in)); >+ if (byte < 0) { >+ dev_dbg(dev, "mei_cldev_send failed. %zd\n", byte); >+ return byte; >+ } >+ >+ byte = mei_cldev_recv(cldev, (u8 *)&session_close_out, >+ sizeof(session_close_out)); >+ if (byte < 0) { >+ dev_dbg(dev, "mei_cldev_recv failed. %zd\n", byte); >+ return byte; >+ } >+ >+ if (session_close_out.header.status != ME_HDCP_STATUS_SUCCESS) { >+ dev_dbg(dev, "Session Close Failed. status: 0x%X\n", >+ session_close_out.header.status); >+ return -EIO; >+ } >+ >+ return 0; >+} >+ > struct i915_hdcp_component_ops mei_hdcp_component_ops = { > .owner = THIS_MODULE, > .initiate_hdcp2_session = mei_initiate_hdcp2_session, >@@ -693,7 +747,7 @@ struct i915_hdcp_component_ops >mei_hdcp_component_ops = { > .verify_mprime = mei_verify_mprime, > .enable_hdcp_authentication = > mei_enable_hdcp_authentication, >- .close_hdcp_session = NULL, >+ .close_hdcp_session = mei_close_hdcp_session, > }; > > static int mei_hdcp_component_bind(struct device *mei_kdev, >-- >2.7.4
diff --git a/drivers/misc/mei/hdcp/mei_hdcp.c b/drivers/misc/mei/hdcp/mei_hdcp.c index fdfdfb1724ec..032b2823fcf3 100644 --- a/drivers/misc/mei/hdcp/mei_hdcp.c +++ b/drivers/misc/mei/hdcp/mei_hdcp.c @@ -678,6 +678,60 @@ static int mei_enable_hdcp_authentication(struct mei_cl_device *cldev, return 0; } +/* + * mei_close_hdcp_session: + * Function to close the Wired HDCP Tx session of ME FW. + * This also disables the authenticated state of the port. + * + * data : Intel HW specific Data + * + * Returns 0 on Success, <0 on Failure + */ +static int mei_close_hdcp_session(struct mei_cl_device *cldev, + struct mei_hdcp_data *data) +{ + struct wired_cmd_close_session_in session_close_in = { { 0 } }; + struct wired_cmd_close_session_out session_close_out = { { 0 } }; + struct device *dev; + ssize_t byte; + + if (!data) + return -EINVAL; + + dev = &cldev->dev; + + session_close_in.header.api_version = HDCP_API_VERSION; + session_close_in.header.command_id = WIRED_CLOSE_SESSION; + session_close_in.header.status = ME_HDCP_STATUS_SUCCESS; + session_close_in.header.buffer_len = + WIRED_CMD_BUF_LEN_CLOSE_SESSION_IN; + + session_close_in.port.integrated_port_type = data->port_type; + session_close_in.port.physical_port = data->port; + + byte = mei_cldev_send(cldev, (u8 *)&session_close_in, + sizeof(session_close_in)); + if (byte < 0) { + dev_dbg(dev, "mei_cldev_send failed. %zd\n", byte); + return byte; + } + + byte = mei_cldev_recv(cldev, (u8 *)&session_close_out, + sizeof(session_close_out)); + if (byte < 0) { + dev_dbg(dev, "mei_cldev_recv failed. %zd\n", byte); + return byte; + } + + if (session_close_out.header.status != ME_HDCP_STATUS_SUCCESS) { + dev_dbg(dev, "Session Close Failed. status: 0x%X\n", + session_close_out.header.status); + return -EIO; + } + + return 0; +} + struct i915_hdcp_component_ops mei_hdcp_component_ops = { .owner = THIS_MODULE, .initiate_hdcp2_session = mei_initiate_hdcp2_session, @@ -693,7 +747,7 @@ struct i915_hdcp_component_ops mei_hdcp_component_ops = { .verify_mprime = mei_verify_mprime, .enable_hdcp_authentication = mei_enable_hdcp_authentication, - .close_hdcp_session = NULL, + .close_hdcp_session = mei_close_hdcp_session, }; static int mei_hdcp_component_bind(struct device *mei_kdev,
Request the ME to terminate the HDCP2.2 session for a port. On Success, ME FW will mark the intel port as Deauthenticated and terminate the wired HDCP2.2 Tx session started due to the cmd WIRED_INITIATE_HDCP2_SESSION. v2: Rebased. v3: cldev is passed as first parameter [Tomas] Redundant comments and cast are removed [Tomas] v4: %zd for ssize_t [Alexander] %s/return -1/return -EIO [Alexander] Style and typos fixed [Uma] v5: Extra line is removed. v6: No change. Signed-off-by: Ramalingam C <ramalingam.c@intel.com> --- drivers/misc/mei/hdcp/mei_hdcp.c | 56 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 55 insertions(+), 1 deletion(-)