-----Original Message----- From: dri-devel [mailto:dri-devel-bounces@lists.freedesktop.org] On Behalf Of Ramalingam C 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 Subject: [PATCH v10 28/40] misc/mei/hdcp: Store the HDCP Pairing info
Provides Pairing info to ME to store.
Pairing is a process to fast track the subsequent authentication with the same HDCP sink.
On Success, received HDCP pairing info is stored in non-volatile memory of ME.
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 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] memcpy for const length.
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 | 60 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 59 insertions(+), 1 deletion(-)
diff --git a/drivers/misc/mei/hdcp/mei_hdcp.c b/drivers/misc/mei/hdcp/mei_hdcp.c index 74219e1487d3..e8396c723ab0 100644 --- a/drivers/misc/mei/hdcp/mei_hdcp.c +++ b/drivers/misc/mei/hdcp/mei_hdcp.c @@ -224,13 +224,71 @@ static int mei_verify_hprime(struct device *dev, struct hdcp_port_data *data, return 0; }
+/**
- mei_store_pairing_info() - Store pairing info received at ME FW
- @dev: device corresponding to the mei_cl_device
- @hdcp_data: Intel HW specific hdcp data
- @pairing_info: AKE_Send_Pairing_Info msg input to ME FW
- Return: 0 on Success, <0 on Failure
- */
+static int +mei_store_pairing_info(struct device *dev, struct hdcp_port_data *data,
struct hdcp2_ake_send_pairing_info *pairing_info) {- struct wired_cmd_ake_send_pairing_info_in pairing_info_in = { { 0 } };
- struct wired_cmd_ake_send_pairing_info_out pairing_info_out = { { 0 } };
- struct mei_cl_device *cldev;
- ssize_t byte;
- if (!dev || !data || !pairing_info)
return -EINVAL;- cldev = to_mei_cl_device(dev);
- pairing_info_in.header.api_version = HDCP_API_VERSION;
- pairing_info_in.header.command_id =
WIRED_AKE_SEND_PAIRING_INFO;
- pairing_info_in.header.status = ME_HDCP_STATUS_SUCCESS;
- pairing_info_in.header.buffer_len =
- WIRED_CMD_BUF_LEN_SEND_PAIRING_INFO_IN;
- pairing_info_in.port.integrated_port_type = data->port_type;
- pairing_info_in.port.physical_port =
+(u8)GET_MEI_DDI_INDEX(data->port);
- memcpy(pairing_info_in.e_kh_km, pairing_info->e_kh_km,
HDCP_2_2_E_KH_KM_LEN);- byte = mei_cldev_send(cldev, (u8 *)&pairing_info_in,
sizeof(pairing_info_in));- if (byte < 0) {
dev_dbg(dev, "mei_cldev_send failed. %zd\n", byte);return byte;- }
- byte = mei_cldev_recv(cldev, (u8 *)&pairing_info_out,
sizeof(pairing_info_out));- if (byte < 0) {
dev_dbg(dev, "mei_cldev_recv failed. %zd\n", byte);return byte;- }
- if (pairing_info_out.header.status != ME_HDCP_STATUS_SUCCESS) {
dev_dbg(dev, "ME cmd 0x%08X failed. Status: 0x%X\n",WIRED_AKE_SEND_PAIRING_INFO,pairing_info_out.header.status);return -EIO;- }
- return 0;
+}
static __attribute__((unused)) struct i915_hdcp_component_ops mei_hdcp_ops = { .owner = THIS_MODULE, .initiate_hdcp2_session = mei_initiate_hdcp2_session, .verify_receiver_cert_prepare_km = mei_verify_receiver_cert_prepare_km, .verify_hprime = mei_verify_hprime,
- .store_pairing_info = NULL,
- .store_pairing_info = mei_store_pairing_info, .initiate_locality_check = NULL, .verify_lprime = NULL, .get_session_key = NULL,
-- 2.7.4
dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel