drm/amd/display: Handle revoked receivers

[Why]
PSP added a new return code for revoked receivers (SRM). We need to
handle that so we don't retry hdcp

This is already being handled on windows

[How]
Add the enums to psp interface header and handle them.

Signed-off-by: Bhawanpreet Lakha <Bhawanpreet.Lakha@amd.com>
Reviewed-by: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/display/modules/hdcp/hdcp_psp.c b/drivers/gpu/drm/amd/display/modules/hdcp/hdcp_psp.c
index 7911dc157d5a719063b673acd7015b58a134639c..844454e0a5ba1deabdc396820d4a00342a5c89ee 100644 (file)
--- a/drivers/gpu/drm/amd/display/modules/hdcp/hdcp_psp.c
+++ b/drivers/gpu/drm/amd/display/modules/hdcp/hdcp_psp.c
@@ -210,6 +210,10 @@ enum mod_hdcp_status mod_hdcp_hdcp1_validate_rx(struct mod_hdcp *hdcp)
        } else if (hdcp_cmd->out_msg.hdcp1_first_part_authentication.authentication_status ==
                   TA_HDCP_AUTHENTICATION_STATUS__HDCP1_AUTHENTICATED) {
                hdcp->connection.is_repeater = 0;
+       } else if (hdcp_cmd->out_msg.hdcp1_first_part_authentication.authentication_status ==
+                  TA_HDCP_AUTHENTICATION_STATUS__HDCP1_KSV_REVOKED) {
+               hdcp->connection.is_hdcp1_revoked = 1;
+               return MOD_HDCP_STATUS_HDCP1_BKSV_REVOKED;
        } else
                return MOD_HDCP_STATUS_HDCP1_VALIDATE_RX_FAILURE;
 
@@ -245,6 +249,7 @@ enum mod_hdcp_status mod_hdcp_hdcp1_validate_ksvlist_vp(struct mod_hdcp *hdcp)
 {
        struct psp_context *psp = hdcp->config.psp.handle;
        struct ta_hdcp_shared_memory *hdcp_cmd;
+       enum mod_hdcp_status status = MOD_HDCP_STATUS_SUCCESS;
 
        hdcp_cmd = (struct ta_hdcp_shared_memory *)psp->hdcp_context.hdcp_shared_buf;
        memset(hdcp_cmd, 0, sizeof(struct ta_hdcp_shared_memory));
@@ -264,10 +269,19 @@ enum mod_hdcp_status mod_hdcp_hdcp1_validate_ksvlist_vp(struct mod_hdcp *hdcp)
 
        psp_hdcp_invoke(psp, hdcp_cmd->cmd_id);
 
-       if (hdcp_cmd->hdcp_status != TA_HDCP_STATUS__SUCCESS)
-               return MOD_HDCP_STATUS_HDCP1_VALIDATE_KSV_LIST_FAILURE;
+       if (hdcp_cmd->hdcp_status == TA_HDCP_STATUS__SUCCESS &&
+           hdcp_cmd->out_msg.hdcp1_second_part_authentication.authentication_status ==
+                   TA_HDCP_AUTHENTICATION_STATUS__HDCP1_AUTHENTICATED) {
+               status = MOD_HDCP_STATUS_SUCCESS;
+       } else if (hdcp_cmd->out_msg.hdcp1_second_part_authentication.authentication_status ==
+                  TA_HDCP_AUTHENTICATION_STATUS__HDCP1_KSV_REVOKED) {
+               hdcp->connection.is_hdcp1_revoked = 1;
+               status = MOD_HDCP_STATUS_HDCP1_KSV_LIST_REVOKED;
+       } else {
+               status = MOD_HDCP_STATUS_HDCP1_VALIDATE_KSV_LIST_FAILURE;
+       }
 
-       return MOD_HDCP_STATUS_SUCCESS;
+       return status;
 }
 
 enum mod_hdcp_status mod_hdcp_hdcp1_enable_dp_stream_encryption(struct mod_hdcp *hdcp)
@@ -473,9 +487,12 @@ enum mod_hdcp_status mod_hdcp_hdcp2_validate_ake_cert(struct mod_hdcp *hdcp)
                hdcp->connection.is_km_stored = msg_out->process.is_km_stored ? 1 : 0;
                hdcp->connection.is_repeater = msg_out->process.is_repeater ? 1 : 0;
                return MOD_HDCP_STATUS_SUCCESS;
+       } else if (msg_out->process.msg1_status == TA_HDCP2_MSG_AUTHENTICATION_STATUS__RECEIVERID_REVOKED) {
+               hdcp->connection.is_hdcp2_revoked = 1;
+               return MOD_HDCP_STATUS_HDCP2_AKE_CERT_REVOKED;
        }
 
-       return MOD_HDCP_STATUS_FAILURE;
+       return MOD_HDCP_STATUS_HDCP2_VALIDATE_AKE_CERT_FAILURE;
 }
 
 enum mod_hdcp_status mod_hdcp_hdcp2_validate_h_prime(struct mod_hdcp *hdcp)
@@ -695,6 +712,9 @@ enum mod_hdcp_status mod_hdcp_hdcp2_validate_rx_id_list(struct mod_hdcp *hdcp)
                hdcp->connection.is_km_stored = msg_out->process.is_km_stored ? 1 : 0;
                hdcp->connection.is_repeater = msg_out->process.is_repeater ? 1 : 0;
                return MOD_HDCP_STATUS_SUCCESS;
+       } else if (msg_out->process.msg1_status == TA_HDCP2_MSG_AUTHENTICATION_STATUS__RECEIVERID_REVOKED) {
+               hdcp->connection.is_hdcp2_revoked = 1;
+               return MOD_HDCP_STATUS_HDCP2_RX_ID_LIST_REVOKED;
        }
 
 

diff --git a/drivers/gpu/drm/amd/display/modules/hdcp/hdcp_psp.h b/drivers/gpu/drm/amd/display/modules/hdcp/hdcp_psp.h
index d5cb3f46606fff58e30c1a3f972d683463b3cbe8..1a663dbbf8109a9518f0e100692cb01e7859e87d 100644 (file)
--- a/drivers/gpu/drm/amd/display/modules/hdcp/hdcp_psp.h
+++ b/drivers/gpu/drm/amd/display/modules/hdcp/hdcp_psp.h
@@ -240,7 +240,8 @@ enum ta_hdcp_authentication_status {
        TA_HDCP_AUTHENTICATION_STATUS__HDCP22_AUTHENTICATION_PENDING = 0x06,
        TA_HDCP_AUTHENTICATION_STATUS__HDCP22_AUTHENTICATION_FAILED = 0x07,
        TA_HDCP_AUTHENTICATION_STATUS__HDCP22_AUTHENTICATED = 0x08,
-       TA_HDCP_AUTHENTICATION_STATUS__HDCP1_KSV_VALIDATION_FAILED = 0x09
+       TA_HDCP_AUTHENTICATION_STATUS__HDCP1_KSV_VALIDATION_FAILED = 0x09,
+       TA_HDCP_AUTHENTICATION_STATUS__HDCP1_KSV_REVOKED = 0x0A
 };
 
 enum ta_hdcp2_msg_authentication_status {
@@ -258,7 +259,8 @@ enum ta_hdcp2_msg_authentication_status {
        TA_HDCP2_MSG_AUTHENTICATION_STATUS__INVALID_SEQ_NUM,
        TA_HDCP2_MSG_AUTHENTICATION_STATUS__INVALID_SIZE,
        TA_HDCP2_MSG_AUTHENTICATION_STATUS__INVALID_LENGTH,
-       TA_HDCP2_MSG_AUTHENTICATION_STATUS__REAUTH_REQUEST
+       TA_HDCP2_MSG_AUTHENTICATION_STATUS__REAUTH_REQUEST,
+       TA_HDCP2_MSG_AUTHENTICATION_STATUS__RECEIVERID_REVOKED
 };
 
 enum ta_hdcp_content_type {