On 2019-08-27 at 10:42:33 +0530, Sharma, Shashank wrote:
> Regards
>
> Shashank
>
> On 8/22/2019 8:49 PM, Ramalingam C wrote:
> > For gen12+ platform we need to pass the transcoder info
> > as part of the port info into ME FW.
> >
> > This change fills the payload for ME FW from hdcp_port_data.
> >
> > Signed-off-by: Ramalingam C <ramalingam.c@xxxxxxxxx>
> > Acked-by: Jani Nikula <jani.nikula@xxxxxxxxx>
> > ---
> > drivers/misc/mei/hdcp/mei_hdcp.c | 11 +++++++++++
> > drivers/misc/mei/hdcp/mei_hdcp.h | 4 +++-
> > 2 files changed, 14 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/misc/mei/hdcp/mei_hdcp.c b/drivers/misc/mei/hdcp/mei_hdcp.c
> > index 3638c77eba26..93027fd96c71 100644
> > --- a/drivers/misc/mei/hdcp/mei_hdcp.c
> > +++ b/drivers/misc/mei/hdcp/mei_hdcp.c
> > @@ -58,6 +58,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 = (u8)data->fw_ddi;
>
> As this entry is only valid till GEN11.5, don't we need GEN_CHECK here, say
> (INTEL_GEN() < 12). Is that possible in MEI_FW ?
Shashank,
Not needed, as I915 checks the GEN# while loading the transcoder detail
into hdcp_port_data. So here we can assign whatever passed as part of
hdcp_port_data.
-Ram
>
> If not, probably we have to add this gen_check while filling the fw_tc part
> in I915.
>
> Applies for all the changes below too.
>
> - Shashank
>
> > + session_init_in.port.attached_transcoder = (u8)data->fw_tc;
> > session_init_in.protocol = data->protocol;
> > byte = mei_cldev_send(cldev, (u8 *)&session_init_in,
> > @@ -127,6 +128,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 = (u8)data->fw_ddi;
> > + verify_rxcert_in.port.attached_transcoder = (u8)data->fw_tc;
> > verify_rxcert_in.cert_rx = rx_cert->cert_rx;
> > memcpy(verify_rxcert_in.r_rx, &rx_cert->r_rx, HDCP_2_2_RRX_LEN);
> > @@ -197,6 +199,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 = (u8)data->fw_ddi;
> > + send_hprime_in.port.attached_transcoder = (u8)data->fw_tc;
> > memcpy(send_hprime_in.h_prime, rx_hprime->h_prime,
> > HDCP_2_2_H_PRIME_LEN);
> > @@ -254,6 +257,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 = (u8)data->fw_ddi;
> > + pairing_info_in.port.attached_transcoder = (u8)data->fw_tc;
> > memcpy(pairing_info_in.e_kh_km, pairing_info->e_kh_km,
> > HDCP_2_2_E_KH_KM_LEN);
> > @@ -312,6 +316,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 = (u8)data->fw_ddi;
> > + lc_init_in.port.attached_transcoder = (u8)data->fw_tc;
> > byte = mei_cldev_send(cldev, (u8 *)&lc_init_in, sizeof(lc_init_in));
> > if (byte < 0) {
> > @@ -367,6 +372,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 = (u8)data->fw_ddi;
> > + verify_lprime_in.port.attached_transcoder = (u8)data->fw_tc;
> > memcpy(verify_lprime_in.l_prime, rx_lprime->l_prime,
> > HDCP_2_2_L_PRIME_LEN);
> > @@ -424,6 +430,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 = (u8)data->fw_ddi;
> > + get_skey_in.port.attached_transcoder = (u8)data->fw_tc;
> > byte = mei_cldev_send(cldev, (u8 *)&get_skey_in, sizeof(get_skey_in));
> > if (byte < 0) {
> > @@ -488,6 +495,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 = (u8)data->fw_ddi;
> > + verify_repeater_in.port.attached_transcoder = (u8)data->fw_tc;
> > memcpy(verify_repeater_in.rx_info, rep_topology->rx_info,
> > HDCP_2_2_RXINFO_LEN);
> > @@ -558,6 +566,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 = (u8)data->fw_ddi;
> > + verify_mprime_in.port.attached_transcoder = (u8)data->fw_tc;
> > memcpy(verify_mprime_in.m_prime, stream_ready->m_prime,
> > HDCP_2_2_MPRIME_LEN);
> > @@ -619,6 +628,7 @@ static int mei_hdcp_enable_authentication(struct device *dev,
> > enable_auth_in.port.integrated_port_type = data->port_type;
> > enable_auth_in.port.physical_port = (u8)data->fw_ddi;
> > + enable_auth_in.port.attached_transcoder = (u8)data->fw_tc;
> > enable_auth_in.stream_type = data->streams[0].stream_type;
> > byte = mei_cldev_send(cldev, (u8 *)&enable_auth_in,
> > @@ -673,6 +683,7 @@ mei_hdcp_close_session(struct device *dev, struct hdcp_port_data *data)
> > session_close_in.port.integrated_port_type = data->port_type;
> > session_close_in.port.physical_port = (u8)data->fw_ddi;
> > + session_close_in.port.attached_transcoder = (u8)data->fw_tc;
> > byte = mei_cldev_send(cldev, (u8 *)&session_close_in,
> > sizeof(session_close_in));
> > diff --git a/drivers/misc/mei/hdcp/mei_hdcp.h b/drivers/misc/mei/hdcp/mei_hdcp.h
> > index e60282eb2d48..58e439d2fc1a 100644
> > --- a/drivers/misc/mei/hdcp/mei_hdcp.h
> > +++ b/drivers/misc/mei/hdcp/mei_hdcp.h
> > @@ -184,8 +184,10 @@ struct hdcp_cmd_no_data {
> > /* Uniquely identifies the hdcp port being addressed for a given command. */
> > struct hdcp_port_id {
> > u8 integrated_port_type;
> > + /* Used until Gen11.5. Must be zero for Gen11.5+ */
> > u8 physical_port;
> > - u16 reserved;
> > + u8 attached_transcoder;
> > + u8 reserved;
> > } __packed;
> > /*
_______________________________________________
dri-devel mailing list
dri-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/dri-devel
