| Message ID | 1522763873-23041-19-git-send-email-ramalingam.c@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
>-----Original Message----- >From: Intel-gfx [mailto:intel-gfx-bounces@lists.freedesktop.org] On Behalf Of >Ramalingam C >Sent: Tuesday, April 3, 2018 7:28 PM >To: intel-gfx@lists.freedesktop.org; dri-devel@lists.freedesktop.org; >seanpaul@chromium.org; daniel@ffwll.ch; chris@chris-wilson.co.uk; >jani.nikula@linux.intel.com; Winkler, Tomas <tomas.winkler@intel.com>; >Usyskin, Alexander <alexander.usyskin@intel.com> >Cc: Vivi, Rodrigo <rodrigo.vivi@intel.com> >Subject: [Intel-gfx] [PATCH v3 18/40] 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] > >Signed-off-by: Ramalingam C <ramalingam.c@intel.com> >--- > drivers/misc/mei/hdcp/mei_hdcp.c | 55 >++++++++++++++++++++++++++++++++++++++++ > include/linux/mei_hdcp.h | 7 +++++ > 2 files changed, 62 insertions(+) > >diff --git a/drivers/misc/mei/hdcp/mei_hdcp.c >b/drivers/misc/mei/hdcp/mei_hdcp.c >index b5d1da41f1d9..ed402f1f2f64 100644 >--- a/drivers/misc/mei/hdcp/mei_hdcp.c >+++ b/drivers/misc/mei/hdcp/mei_hdcp.c >@@ -686,6 +686,61 @@ int mei_enable_hdcp_authentication(struct >mei_cl_device *cldev, } EXPORT_SYMBOL(mei_enable_hdcp_authentication); > >+/** >+ * me_close_hdcp_session: Typo in me. Should be mei. >+ * 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 >+ */ >+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. %d\n", (int)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. %d\n", (int)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 -1; >+ } >+ return 0; >+} >+EXPORT_SYMBOL(mei_close_hdcp_session); >+ > void mei_cldev_state_notify_clients(struct mei_cl_device *cldev, bool enabled) { > if (enabled) >diff --git a/include/linux/mei_hdcp.h b/include/linux/mei_hdcp.h index >2366d0741abe..55cbde890571 100644 >--- a/include/linux/mei_hdcp.h >+++ b/include/linux/mei_hdcp.h >@@ -138,6 +138,8 @@ int mei_verify_mprime(struct mei_cl_device *cldev, >struct mei_hdcp_data *data, > struct hdcp2_rep_stream_ready *stream_ready); int >mei_enable_hdcp_authentication(struct mei_cl_device *cldev, > struct mei_hdcp_data *data); >+int mei_close_hdcp_session(struct mei_cl_device *cldev, >+ struct mei_hdcp_data *data); > #else > static int mei_cldev_register_notify(struct notifier_block *nb) { @@ -216,5 >+218,10 @@ static inline int mei_enable_hdcp_authentication(struct >mei_cl_device *cldev, { > return -ENODEV; > } >+static inline int mei_close_hdcp_session(struct mei_cl_device *cldev, >+ struct mei_hdcp_data *data) >+{ >+ return -ENODEV; >+} > #endif /* defined (CONFIG_INTEL_MEI_HDCP) */ #endif /* defined >(_LINUX_MEI_HDCP_H) */ >-- >2.7.4 > >_______________________________________________ >Intel-gfx mailing list >Intel-gfx@lists.freedesktop.org >https://lists.freedesktop.org/mailman/listinfo/intel-gfx
On Wednesday 09 May 2018 07:32 PM, Shankar, Uma wrote: > >> -----Original Message----- >> From: Intel-gfx [mailto:intel-gfx-bounces@lists.freedesktop.org] On Behalf Of >> Ramalingam C >> Sent: Tuesday, April 3, 2018 7:28 PM >> To: intel-gfx@lists.freedesktop.org; dri-devel@lists.freedesktop.org; >> seanpaul@chromium.org; daniel@ffwll.ch; chris@chris-wilson.co.uk; >> jani.nikula@linux.intel.com; Winkler, Tomas <tomas.winkler@intel.com>; >> Usyskin, Alexander <alexander.usyskin@intel.com> >> Cc: Vivi, Rodrigo <rodrigo.vivi@intel.com> >> Subject: [Intel-gfx] [PATCH v3 18/40] 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] >> >> Signed-off-by: Ramalingam C <ramalingam.c@intel.com> >> --- >> drivers/misc/mei/hdcp/mei_hdcp.c | 55 >> ++++++++++++++++++++++++++++++++++++++++ >> include/linux/mei_hdcp.h | 7 +++++ >> 2 files changed, 62 insertions(+) >> >> diff --git a/drivers/misc/mei/hdcp/mei_hdcp.c >> b/drivers/misc/mei/hdcp/mei_hdcp.c >> index b5d1da41f1d9..ed402f1f2f64 100644 >> --- a/drivers/misc/mei/hdcp/mei_hdcp.c >> +++ b/drivers/misc/mei/hdcp/mei_hdcp.c >> @@ -686,6 +686,61 @@ int mei_enable_hdcp_authentication(struct >> mei_cl_device *cldev, } EXPORT_SYMBOL(mei_enable_hdcp_authentication); >> >> +/** >> + * me_close_hdcp_session: > Typo in me. Should be mei. Thank you for catching it. --Ram > >> + * 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 >> + */ >> +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. %d\n", (int)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. %d\n", (int)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 -1; >> + } >> + return 0; >> +} >> +EXPORT_SYMBOL(mei_close_hdcp_session); >> + >> void mei_cldev_state_notify_clients(struct mei_cl_device *cldev, bool enabled) { >> if (enabled) >> diff --git a/include/linux/mei_hdcp.h b/include/linux/mei_hdcp.h index >> 2366d0741abe..55cbde890571 100644 >> --- a/include/linux/mei_hdcp.h >> +++ b/include/linux/mei_hdcp.h >> @@ -138,6 +138,8 @@ int mei_verify_mprime(struct mei_cl_device *cldev, >> struct mei_hdcp_data *data, >> struct hdcp2_rep_stream_ready *stream_ready); int >> mei_enable_hdcp_authentication(struct mei_cl_device *cldev, >> struct mei_hdcp_data *data); >> +int mei_close_hdcp_session(struct mei_cl_device *cldev, >> + struct mei_hdcp_data *data); >> #else >> static int mei_cldev_register_notify(struct notifier_block *nb) { @@ -216,5 >> +218,10 @@ static inline int mei_enable_hdcp_authentication(struct >> mei_cl_device *cldev, { >> return -ENODEV; >> } >> +static inline int mei_close_hdcp_session(struct mei_cl_device *cldev, >> + struct mei_hdcp_data *data) >> +{ >> + return -ENODEV; >> +} >> #endif /* defined (CONFIG_INTEL_MEI_HDCP) */ #endif /* defined >> (_LINUX_MEI_HDCP_H) */ >> -- >> 2.7.4 >> >> _______________________________________________ >> Intel-gfx mailing list >> Intel-gfx@lists.freedesktop.org >> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff --git a/drivers/misc/mei/hdcp/mei_hdcp.c b/drivers/misc/mei/hdcp/mei_hdcp.c index b5d1da41f1d9..ed402f1f2f64 100644 --- a/drivers/misc/mei/hdcp/mei_hdcp.c +++ b/drivers/misc/mei/hdcp/mei_hdcp.c @@ -686,6 +686,61 @@ int mei_enable_hdcp_authentication(struct mei_cl_device *cldev, } EXPORT_SYMBOL(mei_enable_hdcp_authentication); +/** + * me_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 + */ +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. %d\n", (int)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. %d\n", (int)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 -1; + } + return 0; +} +EXPORT_SYMBOL(mei_close_hdcp_session); + void mei_cldev_state_notify_clients(struct mei_cl_device *cldev, bool enabled) { if (enabled) diff --git a/include/linux/mei_hdcp.h b/include/linux/mei_hdcp.h index 2366d0741abe..55cbde890571 100644 --- a/include/linux/mei_hdcp.h +++ b/include/linux/mei_hdcp.h @@ -138,6 +138,8 @@ int mei_verify_mprime(struct mei_cl_device *cldev, struct mei_hdcp_data *data, struct hdcp2_rep_stream_ready *stream_ready); int mei_enable_hdcp_authentication(struct mei_cl_device *cldev, struct mei_hdcp_data *data); +int mei_close_hdcp_session(struct mei_cl_device *cldev, + struct mei_hdcp_data *data); #else static int mei_cldev_register_notify(struct notifier_block *nb) { @@ -216,5 +218,10 @@ static inline int mei_enable_hdcp_authentication(struct mei_cl_device *cldev, { return -ENODEV; } +static inline int mei_close_hdcp_session(struct mei_cl_device *cldev, + struct mei_hdcp_data *data) +{ + return -ENODEV; +} #endif /* defined (CONFIG_INTEL_MEI_HDCP) */ #endif /* defined (_LINUX_MEI_HDCP_H) */
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] Signed-off-by: Ramalingam C <ramalingam.c@intel.com> --- drivers/misc/mei/hdcp/mei_hdcp.c | 55 ++++++++++++++++++++++++++++++++++++++++ include/linux/mei_hdcp.h | 7 +++++ 2 files changed, 62 insertions(+)