| Message ID | 1531538117-1606-30-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 29/35] misc/mei/hdcp: Initiate Locality check > >Requests ME to start the second stage of HDCP2.2 authentication, called Locality >Check. > >On Success, ME FW will provide LC_Init message to send to hdcp sink. > >v2: > Rebased. >v3: > cldev is passed as first parameter [Tomas] > Redundant comments and cast are removed [Tomas] >v4: > %zd used for ssize_t [Alexander] > %s/return -1/return -EIO [Alexander] > Style fixed [Uma] >v5: > Rebased. >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 | 58 >+++++++++++++++++++++++++++++++++++++++- > 1 file changed, 57 insertions(+), 1 deletion(-) > >diff --git a/drivers/misc/mei/hdcp/mei_hdcp.c >b/drivers/misc/mei/hdcp/mei_hdcp.c >index 4349eff4d0fb..54a7c25d6739 100644 >--- a/drivers/misc/mei/hdcp/mei_hdcp.c >+++ b/drivers/misc/mei/hdcp/mei_hdcp.c >@@ -307,6 +307,62 @@ mei_store_pairing_info(struct mei_cl_device *cldev, > return 0; > } > >+/* >+ * mei_initiate_locality_check: >+ * Function to prepare LC_Init. >+ * >+ * cldev : Pointer for mei client device >+ * data : Intel HW specific Data >+ * hdcp2_lc_init : Pointer for storing LC_Init >+ * >+ * Returns 0 on Success, <0 on Failure >+ */ >+static int mei_initiate_locality_check(struct mei_cl_device *cldev, >+ struct mei_hdcp_data *data, >+ struct hdcp2_lc_init *lc_init_data) { >+ struct wired_cmd_init_locality_check_in lc_init_in = { { 0 } }; >+ struct wired_cmd_init_locality_check_out lc_init_out = { { 0 } }; >+ struct device *dev; >+ ssize_t byte; >+ >+ if (!data || !lc_init_data) >+ return -EINVAL; >+ >+ dev = &cldev->dev; >+ >+ lc_init_in.header.api_version = HDCP_API_VERSION; >+ lc_init_in.header.command_id = WIRED_INIT_LOCALITY_CHECK; >+ lc_init_in.header.status = ME_HDCP_STATUS_SUCCESS; >+ lc_init_in.header.buffer_len = >+WIRED_CMD_BUF_LEN_INIT_LOCALITY_CHECK_IN; >+ >+ lc_init_in.port.integrated_port_type = data->port_type; >+ lc_init_in.port.physical_port = data->port; >+ >+ byte = mei_cldev_send(cldev, (u8 *)&lc_init_in, sizeof(lc_init_in)); >+ if (byte < 0) { >+ dev_dbg(dev, "mei_cldev_send failed. %zd\n", byte); >+ return byte; >+ } >+ >+ byte = mei_cldev_recv(cldev, (u8 *)&lc_init_out, sizeof(lc_init_out)); >+ if (byte < 0) { >+ dev_dbg(dev, "mei_cldev_recv failed. %zd\n", byte); >+ return byte; >+ } >+ >+ if (lc_init_out.header.status != ME_HDCP_STATUS_SUCCESS) { >+ dev_dbg(dev, "ME cmd 0x%08X Failed. status: 0x%X\n", >+ WIRED_INIT_LOCALITY_CHECK, >lc_init_out.header.status); >+ return -EIO; >+ } >+ >+ lc_init_data->msg_id = HDCP_2_2_LC_INIT; >+ memcpy(lc_init_data->r_n, lc_init_out.r_n, HDCP_2_2_RN_LEN); >+ >+ return 0; >+} >+ > struct i915_hdcp_component_ops mei_hdcp_component_ops = { > .owner = THIS_MODULE, > .initiate_hdcp2_session = mei_initiate_hdcp2_session, >@@ -314,7 +370,7 @@ struct i915_hdcp_component_ops >mei_hdcp_component_ops = { > mei_verify_receiver_cert_prepare_km, > .verify_hprime = mei_verify_hprime, > .store_pairing_info = mei_store_pairing_info, >- .initiate_locality_check = NULL, >+ .initiate_locality_check = mei_initiate_locality_check, > .verify_lprime = NULL, > .get_session_key = NULL, > .repeater_check_flow_prepare_ack = NULL, >-- >2.7.4
diff --git a/drivers/misc/mei/hdcp/mei_hdcp.c b/drivers/misc/mei/hdcp/mei_hdcp.c index 4349eff4d0fb..54a7c25d6739 100644 --- a/drivers/misc/mei/hdcp/mei_hdcp.c +++ b/drivers/misc/mei/hdcp/mei_hdcp.c @@ -307,6 +307,62 @@ mei_store_pairing_info(struct mei_cl_device *cldev, return 0; } +/* + * mei_initiate_locality_check: + * Function to prepare LC_Init. + * + * cldev : Pointer for mei client device + * data : Intel HW specific Data + * hdcp2_lc_init : Pointer for storing LC_Init + * + * Returns 0 on Success, <0 on Failure + */ +static int mei_initiate_locality_check(struct mei_cl_device *cldev, + struct mei_hdcp_data *data, + struct hdcp2_lc_init *lc_init_data) +{ + struct wired_cmd_init_locality_check_in lc_init_in = { { 0 } }; + struct wired_cmd_init_locality_check_out lc_init_out = { { 0 } }; + struct device *dev; + ssize_t byte; + + if (!data || !lc_init_data) + return -EINVAL; + + dev = &cldev->dev; + + lc_init_in.header.api_version = HDCP_API_VERSION; + lc_init_in.header.command_id = WIRED_INIT_LOCALITY_CHECK; + lc_init_in.header.status = ME_HDCP_STATUS_SUCCESS; + lc_init_in.header.buffer_len = WIRED_CMD_BUF_LEN_INIT_LOCALITY_CHECK_IN; + + lc_init_in.port.integrated_port_type = data->port_type; + lc_init_in.port.physical_port = data->port; + + byte = mei_cldev_send(cldev, (u8 *)&lc_init_in, sizeof(lc_init_in)); + if (byte < 0) { + dev_dbg(dev, "mei_cldev_send failed. %zd\n", byte); + return byte; + } + + byte = mei_cldev_recv(cldev, (u8 *)&lc_init_out, sizeof(lc_init_out)); + if (byte < 0) { + dev_dbg(dev, "mei_cldev_recv failed. %zd\n", byte); + return byte; + } + + if (lc_init_out.header.status != ME_HDCP_STATUS_SUCCESS) { + dev_dbg(dev, "ME cmd 0x%08X Failed. status: 0x%X\n", + WIRED_INIT_LOCALITY_CHECK, lc_init_out.header.status); + return -EIO; + } + + lc_init_data->msg_id = HDCP_2_2_LC_INIT; + memcpy(lc_init_data->r_n, lc_init_out.r_n, HDCP_2_2_RN_LEN); + + return 0; +} + struct i915_hdcp_component_ops mei_hdcp_component_ops = { .owner = THIS_MODULE, .initiate_hdcp2_session = mei_initiate_hdcp2_session, @@ -314,7 +370,7 @@ struct i915_hdcp_component_ops mei_hdcp_component_ops = { mei_verify_receiver_cert_prepare_km, .verify_hprime = mei_verify_hprime, .store_pairing_info = mei_store_pairing_info, - .initiate_locality_check = NULL, + .initiate_locality_check = mei_initiate_locality_check, .verify_lprime = NULL, .get_session_key = NULL, .repeater_check_flow_prepare_ack = NULL,
Requests ME to start the second stage of HDCP2.2 authentication, called Locality Check. On Success, ME FW will provide LC_Init message to send to hdcp sink. v2: Rebased. v3: cldev is passed as first parameter [Tomas] Redundant comments and cast are removed [Tomas] v4: %zd used for ssize_t [Alexander] %s/return -1/return -EIO [Alexander] Style fixed [Uma] v5: Rebased. v6: No change. Signed-off-by: Ramalingam C <ramalingam.c@intel.com> --- drivers/misc/mei/hdcp/mei_hdcp.c | 58 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 57 insertions(+), 1 deletion(-)