-----Original Message----- From: C, Ramalingam Sent: Thursday, January 31, 2019 12:30 PM To: intel-gfx@lists.freedesktop.org; dri-devel@lists.freedesktop.org; daniel.vetter@ffwll.ch; Winkler, Tomas tomas.winkler@intel.com; Shankar, Uma uma.shankar@intel.com Cc: C, Ramalingam ramalingam.c@intel.com Subject: [PATCH v10 29/40] 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: Collected the Rb-ed by. Rebasing. v7: Adjust to the new mei interface. Fix for Kdoc. v8: K-Doc addition. [Tomas]
Signed-off-by: Ramalingam C ramalingam.c@intel.com Reviewed-by: Uma Shankar uma.shankar@intel.com
Latest set looks ok. You can keep the RB.
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 e8396c723ab0..412a33e29d7d 100644 --- a/drivers/misc/mei/hdcp/mei_hdcp.c +++ b/drivers/misc/mei/hdcp/mei_hdcp.c @@ -282,6 +282,60 @@ mei_store_pairing_info(struct device *dev, struct hdcp_port_data *data, return 0; }
+/**
- mei_initiate_locality_check() - Prepare LC_Init
- @dev: device corresponding to the mei_cl_device
- @hdcp_data: Intel HW specific hdcp data
- @lc_init_data: LC_Init msg output
- Return: 0 on Success, <0 on Failure
- */
+static int +mei_initiate_locality_check(struct device *dev, struct hdcp_port_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 mei_cl_device *cldev;
- ssize_t byte;
- if (!dev || !data || !lc_init_data)
return -EINVAL;- cldev = to_mei_cl_device(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 = (u8)GET_MEI_DDI_INDEX(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;
+}
static __attribute__((unused)) struct i915_hdcp_component_ops mei_hdcp_ops = { .owner = THIS_MODULE, @@ -289,7 +343,7 @@ struct i915_hdcp_component_ops mei_hdcp_ops = { .verify_receiver_cert_prepare_km = 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