drm/amd/display: Remove register from DCN35 DMCUB diagnostic collection
authorNicholas Kazlauskas <nicholas.kazlauskas@amd.com>
Tue, 28 May 2024 19:25:30 +0000 (15:25 -0400)
committerAlex Deucher <alexander.deucher@amd.com>
Fri, 14 Jun 2024 20:17:16 +0000 (16:17 -0400)
[Why]
These registers should not be read from driver and triggering the
security violation when DMCUB work times out and diagnostics are
collected blocks Z8 entry.

[How]
Remove the register read from DCN35.

Reviewed-by: Duncan Ma <duncan.ma@amd.com>
Acked-by: Zaeem Mohamed <zaeem.mohamed@amd.com>
Signed-off-by: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>
Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/display/dmub/src/dmub_dcn35.c

index 7f53074f4e48a5488f77d1ce3f4e10e25fe8f1f9..80da117356c0483e939efe96227390db6b56ece8 100644 (file)
@@ -462,7 +462,7 @@ uint32_t dmub_dcn35_get_current_time(struct dmub_srv *dmub)
 void dmub_dcn35_get_diagnostic_data(struct dmub_srv *dmub, struct dmub_diagnostic_data *diag_data)
 {
        uint32_t is_dmub_enabled, is_soft_reset, is_sec_reset;
-       uint32_t is_traceport_enabled, is_cw0_enabled, is_cw6_enabled;
+       uint32_t is_traceport_enabled, is_cw6_enabled;
 
        if (!dmub || !diag_data)
                return;
@@ -513,9 +513,6 @@ void dmub_dcn35_get_diagnostic_data(struct dmub_srv *dmub, struct dmub_diagnosti
        REG_GET(DMCUB_CNTL, DMCUB_TRACEPORT_EN, &is_traceport_enabled);
        diag_data->is_traceport_en  = is_traceport_enabled;
 
-       REG_GET(DMCUB_REGION3_CW0_TOP_ADDRESS, DMCUB_REGION3_CW0_ENABLE, &is_cw0_enabled);
-       diag_data->is_cw0_enabled = is_cw0_enabled;
-
        REG_GET(DMCUB_REGION3_CW6_TOP_ADDRESS, DMCUB_REGION3_CW6_ENABLE, &is_cw6_enabled);
        diag_data->is_cw6_enabled = is_cw6_enabled;