Re: [PATCH v6 2/3] misc/mei_hdcp: Adding the transcoder detail in payload input
On 2019-08-20 at 14:15:47 +0530, Winkler, Tomas wrote:
>
> >
> > ME FW takes the transcoder details for Gen12+ platforms, as HDCP HW block is
> > moved to transcoders.
> >
> > hdcp_port_data is extended with enum transcoder. Payload structure is
> > modified and populated from the hdcp_port_data.
> >
> > Signed-off-by: Ramalingam C
> > ---
> > drivers/misc/mei/hdcp/mei_hdcp.c | 27 +++
> > drivers/misc/mei/hdcp/mei_hdcp.h | 15 ++-
> > include/drm/i915_mei_hdcp_interface.h | 2 ++
> > 3 files changed, 43 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/misc/mei/hdcp/mei_hdcp.c
> > b/drivers/misc/mei/hdcp/mei_hdcp.c
> > index c681f6fab342..7efe3b65a986 100644
> > --- a/drivers/misc/mei/hdcp/mei_hdcp.c
> > +++ b/drivers/misc/mei/hdcp/mei_hdcp.c
> > @@ -39,6 +39,22 @@ static inline u8 mei_get_ddi_index(enum port port)
> > }
> > }
> >
> > +static inline u8 mei_get_tc_type(enum transcoder tc) {
> > + switch (tc) {
> > + case TRANSCODER_A ... TRANSCODER_D:
> > + return (u8)(tc | 0x10);
> > + case TRANSCODER_EDP:
> > + return TC_EDP;
> > + case TRANSCODER_DSI_0:
> > + return TC_DSI0;
> > + case TRANSCODER_DSI_1:
> > + return TC_DSI1;
> > + default:
> > + return MEI_INVALID_TRANSCODER;
> > + }
> > +}
> > +
> > /**
> > * mei_hdcp_initiate_session() - Initiate a Wired HDCP2.2 Tx Session in ME
> > FW
> > * @dev: device corresponding to the mei_cl_device @@ -70,6 +86,7 @@
> > mei_hdcp_initiate_session(struct device *dev, struct hdcp_port_data *data,
> >
> > session_init_in.port.integrated_port_type = data->port_type;
> > session_init_in.port.physical_port = mei_get_ddi_index(data->port);
> > + session_init_in.port.attached_transcoder = mei_get_tc_type(data->tc);
> > session_init_in.protocol = data->protocol;
> >
> > byte = mei_cldev_send(cldev, (u8 *)_init_in, @@ -139,6
> > +156,7 @@ mei_hdcp_verify_receiver_cert_prepare_km(struct device *dev,
> >
> > verify_rxcert_in.port.integrated_port_type = data->port_type;
> > verify_rxcert_in.port.physical_port = mei_get_ddi_index(data->port);
> > + verify_rxcert_in.port.attached_transcoder = mei_get_tc_type(data-
> > >tc);
> >
> > verify_rxcert_in.cert_rx = rx_cert->cert_rx;
> > memcpy(verify_rxcert_in.r_rx, _cert->r_rx, HDCP_2_2_RRX_LEN);
> > @@ -209,6 +227,7 @@ mei_hdcp_verify_hprime(struct device *dev, struct
> > hdcp_port_data *data,
> >
> > send_hprime_in.port.integrated_port_type = data->port_type;
> > send_hprime_in.port.physical_port = mei_get_ddi_index(data->port);
> > + send_hprime_in.port.attached_transcoder = mei_get_tc_type(data-
> > >tc);
> >
> > memcpy(send_hprime_in.h_prime, rx_hprime->h_prime,
> >HDCP_2_2_H_PRIME_LEN);
> > @@ -266,6 +285,7 @@ mei_hdcp_store_pairing_info(struct device *dev, struct
> > hdcp_port_data *data,
> >
> > pairing_info_in.port.integrated_port_type = data->port_type;
> > pairing_info_in.port.physical_port = mei_get_ddi_index(data->port);
> > + pairing_info_in.port.attached_transcoder = mei_get_tc_type(data->tc);
> >
> > memcpy(pairing_info_in.e_kh_km, pairing_info->e_kh_km,
> >HDCP_2_2_E_KH_KM_LEN);
> > @@ -324,6 +344,7 @@ mei_hdcp_initiate_locality_check(struct device *dev,
> >
> > lc_init_in.port.integrated_port_type = data->port_type;
> > lc_init_in.port.physical_port = mei_get_ddi_index(data->port);
> > + lc_init_in.port.attached_transcoder = mei_get_tc_type(data->tc);
> >
> > byte = mei_cldev_send(cldev, (u8 *)_init_in, sizeof(lc_init_in));
> > if (byte < 0) {
> > @@ -379,6 +400,7 @@ mei_hdcp_verify_lprime(struct device *dev, struct
> > hdcp_port_data *data,
> >
> > verify_lprime_in.port.integrated_port_type = data->port_type;
> > verify_lprime_in.port.physical_port = mei_get_ddi_index(data->port);
> > + verify_lprime_in.port.attached_transcoder = mei_get_tc_type(data-
> > >tc);
> >
> > memcpy(verify_lprime_in.l_prime, rx_lprime->l_prime,
> >HDCP_2_2_L_PRIME_LEN);
> > @@ -436,6 +458,7 @@ static int mei_hdcp_get_session_key(struct device
> > *dev,
> >
> > get_skey_in.port.integrated_port_type = data->port_type;
> > get_skey_in.port.physical_port = mei_get_ddi_index(data->port);
> > + get_skey_in.port.attached_transcoder = mei_get_tc_type(data->tc);
> >
> > byte = mei_cldev_send(cldev, (u8 *)_skey_in, sizeof(get_skey_in));
> > if (byte < 0) {
> > @@ -500,6 +523,7 @@ mei_hdcp_repeater_check_flow_prepare_ack(struct
> > device *dev,
> >
> > verify_repeater_in.port.integrated_port_type = data->port_type;
> > verify_repeater_in.port.physical_port = mei_get_ddi_index(data-
> > >port);
> > + verify_repeater_in.port.attached_transcoder =
> > +mei_get_tc_type(data->tc);
> >
> > memcpy(verify_repeater_in.rx_info, rep_topology->rx_info,
> >HDCP_2_2_RXINFO_LEN);
> > @@ -570,6 +594,7 @@ static int
RE: [PATCH v6 2/3] misc/mei_hdcp: Adding the transcoder detail in payload input
>
> ME FW takes the transcoder details for Gen12+ platforms, as HDCP HW block is
> moved to transcoders.
>
> hdcp_port_data is extended with enum transcoder. Payload structure is
> modified and populated from the hdcp_port_data.
>
> Signed-off-by: Ramalingam C
> ---
> drivers/misc/mei/hdcp/mei_hdcp.c | 27 +++
> drivers/misc/mei/hdcp/mei_hdcp.h | 15 ++-
> include/drm/i915_mei_hdcp_interface.h | 2 ++
> 3 files changed, 43 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/misc/mei/hdcp/mei_hdcp.c
> b/drivers/misc/mei/hdcp/mei_hdcp.c
> index c681f6fab342..7efe3b65a986 100644
> --- a/drivers/misc/mei/hdcp/mei_hdcp.c
> +++ b/drivers/misc/mei/hdcp/mei_hdcp.c
> @@ -39,6 +39,22 @@ static inline u8 mei_get_ddi_index(enum port port)
> }
> }
>
> +static inline u8 mei_get_tc_type(enum transcoder tc) {
> + switch (tc) {
> + case TRANSCODER_A ... TRANSCODER_D:
> + return (u8)(tc | 0x10);
> + case TRANSCODER_EDP:
> + return TC_EDP;
> + case TRANSCODER_DSI_0:
> + return TC_DSI0;
> + case TRANSCODER_DSI_1:
> + return TC_DSI1;
> + default:
> + return MEI_INVALID_TRANSCODER;
> + }
> +}
> +
> /**
> * mei_hdcp_initiate_session() - Initiate a Wired HDCP2.2 Tx Session in ME FW
> * @dev: device corresponding to the mei_cl_device @@ -70,6 +86,7 @@
> mei_hdcp_initiate_session(struct device *dev, struct hdcp_port_data *data,
>
> session_init_in.port.integrated_port_type = data->port_type;
> session_init_in.port.physical_port = mei_get_ddi_index(data->port);
> + session_init_in.port.attached_transcoder = mei_get_tc_type(data->tc);
> session_init_in.protocol = data->protocol;
>
> byte = mei_cldev_send(cldev, (u8 *)_init_in, @@ -139,6
> +156,7 @@ mei_hdcp_verify_receiver_cert_prepare_km(struct device *dev,
>
> verify_rxcert_in.port.integrated_port_type = data->port_type;
> verify_rxcert_in.port.physical_port = mei_get_ddi_index(data->port);
> + verify_rxcert_in.port.attached_transcoder = mei_get_tc_type(data-
> >tc);
>
> verify_rxcert_in.cert_rx = rx_cert->cert_rx;
> memcpy(verify_rxcert_in.r_rx, _cert->r_rx, HDCP_2_2_RRX_LEN);
> @@ -209,6 +227,7 @@ mei_hdcp_verify_hprime(struct device *dev, struct
> hdcp_port_data *data,
>
> send_hprime_in.port.integrated_port_type = data->port_type;
> send_hprime_in.port.physical_port = mei_get_ddi_index(data->port);
> + send_hprime_in.port.attached_transcoder = mei_get_tc_type(data-
> >tc);
>
> memcpy(send_hprime_in.h_prime, rx_hprime->h_prime,
> HDCP_2_2_H_PRIME_LEN);
> @@ -266,6 +285,7 @@ mei_hdcp_store_pairing_info(struct device *dev, struct
> hdcp_port_data *data,
>
> pairing_info_in.port.integrated_port_type = data->port_type;
> pairing_info_in.port.physical_port = mei_get_ddi_index(data->port);
> + pairing_info_in.port.attached_transcoder = mei_get_tc_type(data->tc);
>
> memcpy(pairing_info_in.e_kh_km, pairing_info->e_kh_km,
> HDCP_2_2_E_KH_KM_LEN);
> @@ -324,6 +344,7 @@ mei_hdcp_initiate_locality_check(struct device *dev,
>
> lc_init_in.port.integrated_port_type = data->port_type;
> lc_init_in.port.physical_port = mei_get_ddi_index(data->port);
> + lc_init_in.port.attached_transcoder = mei_get_tc_type(data->tc);
>
> byte = mei_cldev_send(cldev, (u8 *)_init_in, sizeof(lc_init_in));
> if (byte < 0) {
> @@ -379,6 +400,7 @@ mei_hdcp_verify_lprime(struct device *dev, struct
> hdcp_port_data *data,
>
> verify_lprime_in.port.integrated_port_type = data->port_type;
> verify_lprime_in.port.physical_port = mei_get_ddi_index(data->port);
> + verify_lprime_in.port.attached_transcoder = mei_get_tc_type(data-
> >tc);
>
> memcpy(verify_lprime_in.l_prime, rx_lprime->l_prime,
> HDCP_2_2_L_PRIME_LEN);
> @@ -436,6 +458,7 @@ static int mei_hdcp_get_session_key(struct device
> *dev,
>
> get_skey_in.port.integrated_port_type = data->port_type;
> get_skey_in.port.physical_port = mei_get_ddi_index(data->port);
> + get_skey_in.port.attached_transcoder = mei_get_tc_type(data->tc);
>
> byte = mei_cldev_send(cldev, (u8 *)_skey_in, sizeof(get_skey_in));
> if (byte < 0) {
> @@ -500,6 +523,7 @@ mei_hdcp_repeater_check_flow_prepare_ack(struct
> device *dev,
>
> verify_repeater_in.port.integrated_port_type = data->port_type;
> verify_repeater_in.port.physical_port = mei_get_ddi_index(data-
> >port);
> + verify_repeater_in.port.attached_transcoder =
> +mei_get_tc_type(data->tc);
>
> memcpy(verify_repeater_in.rx_info, rep_topology->rx_info,
> HDCP_2_2_RXINFO_LEN);
> @@ -570,6 +594,7 @@ static int mei_hdcp_verify_mprime(struct device *dev,
>
> verify_mprime_in.port.integrated_port_type = data->port_type;
> verify_mprime_in.port.physical_port = mei_get_ddi_index(data->port);
> +
