> -----Original Message----- > From: C, Ramalingam > Sent: Tuesday, April 03, 2018 16:57 > To: intel-gfx@xxxxxxxxxxxxxxxxxxxxx; dri-devel@xxxxxxxxxxxxxxxxxxxxx; > seanpaul@xxxxxxxxxxxx; daniel@xxxxxxxx; chris@xxxxxxxxxxxxxxxxxx; > jani.nikula@xxxxxxxxxxxxxxx; Winkler, Tomas <tomas.winkler@xxxxxxxxx>; > Usyskin, Alexander <alexander.usyskin@xxxxxxxxx> > Cc: Vivi, Rodrigo <rodrigo.vivi@xxxxxxxxx>; C, Ramalingam > <ramalingam.c@xxxxxxxxx> > Subject: [PATCH v3 08/40] misc/mei/hdcp: Initiate Wired HDCP2.2 Tx Session > > Request ME FW to start the HDCP2.2 session for a intel port. > Prepares payloads for command WIRED_INITIATE_HDCP2_SESSION and sent > to ME FW. > > On Success, ME FW will start a HDCP2.2 session for the port and > provides the content for HDCP2.2 AKE_Init message. > > v2: > Rebased. > v3: > cldev is add as a separate parameter [Tomas] > Redundant comment and typecast are removed [Tomas] > > Signed-off-by: Ramalingam C <ramalingam.c@xxxxxxxxx> > --- > drivers/misc/mei/hdcp/mei_hdcp.c | 68 > ++++++++++++++++++++++++++++++++++++++++ > include/linux/mei_hdcp.h | 11 +++++++ > 2 files changed, 79 insertions(+) > > diff --git a/drivers/misc/mei/hdcp/mei_hdcp.c > b/drivers/misc/mei/hdcp/mei_hdcp.c > index 2811a25f8c57..7caee0947761 100644 > --- a/drivers/misc/mei/hdcp/mei_hdcp.c > +++ b/drivers/misc/mei/hdcp/mei_hdcp.c > @@ -33,9 +33,77 @@ > #include <linux/mei_cl_bus.h> > #include <linux/notifier.h> > #include <linux/mei_hdcp.h> > +#include <drm/drm_connector.h> > + > +#include "mei_hdcp.h" > > static BLOCKING_NOTIFIER_HEAD(mei_cldev_notifier_list); > > +/** > + * mei_initiate_hdcp2_session: > + * Function to start a Wired HDCP2.2 Tx Session with ME FW > + * > + * @cldev : Pointer for mei client device > + * @data : Intel HW specific Data > + * @ake_data : ptr to store AKE_Init > + * > + * Returns 0 on Success, <0 on Failure. > + */ > +int mei_initiate_hdcp2_session(struct mei_cl_device *cldev, > + struct mei_hdcp_data *data, > + struct hdcp2_ake_init *ake_data) > +{ > + struct wired_cmd_initiate_hdcp2_session_in session_init_in = { { 0 } > }; > + struct wired_cmd_initiate_hdcp2_session_out > + session_init_out = { { 0 } }; > + struct device *dev; > + ssize_t byte; > + > + if (!data || !ake_data) > + return -EINVAL; > + > + dev = &cldev->dev; > + > + session_init_in.header.api_version = HDCP_API_VERSION; > + session_init_in.header.command_id = > WIRED_INITIATE_HDCP2_SESSION; > + session_init_in.header.status = ME_HDCP_STATUS_SUCCESS; > + session_init_in.header.buffer_len = > + > WIRED_CMD_BUF_LEN_INITIATE_HDCP2_SESSION_IN; > + > + session_init_in.port.integrated_port_type = data->port_type; > + session_init_in.port.physical_port = data->port; > + session_init_in.protocol = (uint8_t)data->protocol; > + > + byte = mei_cldev_send(cldev, (u8 *)&session_init_in, > + sizeof(session_init_in)); > + if (byte < 0) { > + dev_dbg(dev, "mei_cldev_send failed. %d\n", (int)byte); %zd don't require (int) > + return byte; > + } > + > + byte = mei_cldev_recv(cldev, (u8 *)&session_init_out, > + sizeof(session_init_out)); > + if (byte < 0) { > + dev_dbg(dev, "mei_cldev_recv failed. %d\n", (int)byte); %zd don't require (int) > + return byte; > + } > + > + if (session_init_out.header.status != ME_HDCP_STATUS_SUCCESS) { > + dev_dbg(dev, "ME cmd 0x%08X Failed. Status: 0x%X\n", > + WIRED_INITIATE_HDCP2_SESSION, > + session_init_out.header.status); > + return -1; It will be better to return some meaningful error code here. > + } > + > + ake_data->msg_id = HDCP_2_2_AKE_INIT; > + ake_data->tx_caps = session_init_out.tx_caps; > + memcpy(ake_data->r_tx, session_init_out.r_tx, > + sizeof(session_init_out.r_tx)); > + > + return 0; > +} > +EXPORT_SYMBOL(mei_initiate_hdcp2_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 634c1a5bdf1e..bb4f27d3abcb 100644 > --- a/include/linux/mei_hdcp.h > +++ b/include/linux/mei_hdcp.h > @@ -28,6 +28,7 @@ > #define _LINUX_MEI_HDCP_H > > #include <linux/mei_cl_bus.h> > +#include <drm/drm_hdcp.h> > > enum mei_cldev_state { > MEI_CLDEV_DISABLED, > @@ -105,6 +106,9 @@ struct mei_hdcp_data { > #ifdef CONFIG_INTEL_MEI_HDCP > int mei_cldev_register_notify(struct notifier_block *nb); > int mei_cldev_unregister_notify(struct notifier_block *nb); > +int mei_initiate_hdcp2_session(struct mei_cl_device *cldev, > + struct mei_hdcp_data *data, > + struct hdcp2_ake_init *ake_data); > #else > static int mei_cldev_register_notify(struct notifier_block *nb) > { > @@ -114,5 +118,12 @@ static int mei_cldev_unregister_notify(struct > notifier_block *nb) > { > return -ENODEV; > } > +static inline > +int mei_initiate_hdcp2_session(struct mei_cl_device *cldev, > + struct mei_hdcp_data *data, > + struct hdcp2_ake_init *ake_data) > +{ > + return -ENODEV; > +} > #endif /* defined (CONFIG_INTEL_MEI_HDCP) */ > #endif /* defined (_LINUX_MEI_HDCP_H) */ > -- > 2.7.4 _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/dri-devel