Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 62c2b322 authored by Ramalingam C's avatar Ramalingam C Committed by Daniel Vetter
Browse files

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:
  Collected the Rb-ed by.
  Rebased.
v7:
  Adjust to the new mei interface.
  Fix for Kdoc.
v8:
  K-Doc addition.[Tomas]
v9:
  renamed func as mei_hdcp_* [Tomas]
  Inline function is defined for DDI index [Tomas]
v10:
  K-Doc fix. [Tomas]
v11:
  Rebased.

Signed-off-by: default avatarRamalingam C <ramalingam.c@intel.com>
Reviewed-by: default avatarUma Shankar <uma.shankar@intel.com>
Acked-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/1550772730-23280-15-git-send-email-ramalingam.c@intel.com
parent 5e234911

drivers/misc/mei/hdcp/mei_hdcp.c

+54 −1
Original line number Diff line number Diff line
@@ -658,6 +658,59 @@ static int mei_hdcp_enable_authentication(struct device *dev, 
	return 0;

}



/**

 * mei_hdcp_close_session() - Close the Wired HDCP Tx session of ME FW per port.

 * This also disables the authenticated state of the port.

 * @dev: device corresponding to the mei_cl_device

 * @data: Intel HW specific hdcp data

 *

 * Return: 0 on Success, <0 on Failure

 */

static int

mei_hdcp_close_session(struct device *dev, struct hdcp_port_data *data)

{

	struct wired_cmd_close_session_in session_close_in = { { 0 } };

	struct wired_cmd_close_session_out session_close_out = { { 0 } };

	struct mei_cl_device *cldev;

	ssize_t byte;



	if (!dev || !data)

		return -EINVAL;



	cldev = to_mei_cl_device(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 = mei_get_ddi_index(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;

}



static const __attribute__((unused))

struct i915_hdcp_component_ops mei_hdcp_ops = {

	.owner = THIS_MODULE,
@@ -673,7 +726,7 @@ struct i915_hdcp_component_ops mei_hdcp_ops = { 
				mei_hdcp_repeater_check_flow_prepare_ack,

	.verify_mprime = mei_hdcp_verify_mprime,

	.enable_hdcp_authentication = mei_hdcp_enable_authentication,

	.close_hdcp_session = NULL,

	.close_hdcp_session = mei_hdcp_close_session,

};



static int mei_hdcp_probe(struct mei_cl_device *cldev,