drm/amdgpu: toggle DF-Cstate when accessing UMC ras error related registers
Subsystems (2)
PATCH 1/1 drm/amdgpu: toggle DF-Cstate when accessing UMC ras error related registers
On arcturus, DF-Cstate needs to be toggled off/on
before and after accessing UMC error counter and
error address registers, otherwise, clearing such
registers may fail.
--- drivers/gpu/drm/amd/amdgpu/umc_v6_1.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
drivers/gpu/drm/amd/amdgpu/umc_v6_1.c +16 -0
@@ -186,6 +186,10 @@ static void umc_v6_1_query_ras_error_count(struct amdgpu_device *adev,if (rsmu_umc_index_state)umc_v6_1_disable_umc_index_mode (adev); +if ((adev->asic_type ==CHIP_ARCTURUS ) && +amdgpu_dpm_set_df_cstate (adev,DF_CSTATE_DISALLOW )) +DRM_WARN ("Fail to disable DF-Cstate.\n" ); + LOOP_UMC_INST_AND_CH(umc_inst, ch_inst) { umc_reg_offset = get_umc_6_reg_offset(adev, umc_inst,
@@ -199,6 +203,10 @@ static void umc_v6_1_query_ras_error_count(struct amdgpu_device *adev, &(err_data->ue_count)); } +if ((adev->asic_type ==CHIP_ARCTURUS ) && +amdgpu_dpm_set_df_cstate (adev,DF_CSTATE_ALLOW )) +DRM_WARN ("Fail to enable DF-Cstate\n" ); +if (rsmu_umc_index_state)umc_v6_1_enable_umc_index_mode (adev); }
@@ -288,6 +296,10 @@ static void umc_v6_1_query_ras_error_address(struct amdgpu_device *adev,if (rsmu_umc_index_state)umc_v6_1_disable_umc_index_mode (adev); +if ((adev->asic_type ==CHIP_ARCTURUS ) && +amdgpu_dpm_set_df_cstate (adev,DF_CSTATE_DISALLOW )) +DRM_WARN ("Fail to disable DF-Cstate.\n" ); + LOOP_UMC_INST_AND_CH(umc_inst, ch_inst) { umc_reg_offset = get_umc_6_reg_offset(adev, umc_inst,
@@ -300,6 +312,10 @@ static void umc_v6_1_query_ras_error_address(struct amdgpu_device *adev, umc_inst); } +if ((adev->asic_type ==CHIP_ARCTURUS ) && +amdgpu_dpm_set_df_cstate (adev,DF_CSTATE_ALLOW )) +DRM_WARN ("Fail to enable DF-Cstate\n" ); +if (rsmu_umc_index_state)umc_v6_1_enable_umc_index_mode (adev); }
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
[AMD Official Use Only - Internal Distribution Only]
We can also define a macro to replace the code, and only the macro should be updated for new ASICs in the future. But either way is fine for me currently, the patch is:
Quoted 72 lines
-----Original Message-----
From: Chen, Guchun <[email protected]>
Sent: 2020年3月4日 22:47
To: [email protected]; Zhang, Hawking <[email protected]>; Li, Dennis <[email protected]>; Zhou1, Tao <[email protected]>; Clements, John <[email protected]>
Cc: Chen, Guchun <[email protected]>
Subject: [PATCH] drm/amdgpu: toggle DF-Cstate when accessing UMC ras error related registersOn arcturus, DF-Cstate needs to be toggled off/on before and after accessing UMC error counter and error address registers, otherwise, clearing such registers may fail.
Signed-off-by Guchun Chen <[email protected]>--- drivers/gpu/drm/amd/amdgpu/umc_v6_1.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)drivers/gpu/drm/amd/amdgpu/umc_v6_1.c +4
-0@@ -186,6 +186,10 @@ static void umc_v6_1_query_ras_error_count(struct amdgpu_device *adev, if (rsmu_umc_index_state) umc_v6_1_disable_umc_index_mode(adev); +if ((adev->asic_type ==CHIP_ARCTURUS ) && +amdgpu_dpm_set_df_cstate (adev,DF_CSTATE_DISALLOW )) +DRM_WARN ("Fail to disable DF-Cstate.\n" ); + LOOP_UMC_INST_AND_CH(umc_inst, ch_inst) { umc_reg_offset = get_umc_6_reg_offset(adev,drivers/gpu/drm/amd/amdgpu/umc_v6_1.c +4
-0umc_inst,@@ -199,6 +203,10 @@ static void umc_v6_1_query_ras_error_count(struct amdgpu_device *adev, &(err_data- >ue_count)); } +if ((adev->asic_type ==CHIP_ARCTURUS ) && +amdgpu_dpm_set_df_cstate (adev,DF_CSTATE_ALLOW )) +DRM_WARN ("Fail to enable DF-Cstate\n" ); +if (rsmu_umc_index_state)drivers/gpu/drm/amd/amdgpu/umc_v6_1.c +4
-0umc_v6_1_enable_umc_index_mode (adev); }@@ -288,6 +296,10 @@ static void umc_v6_1_query_ras_error_address(struct amdgpu_device *adev, if (rsmu_umc_index_state) umc_v6_1_disable_umc_index_mode(adev); +if ((adev->asic_type ==CHIP_ARCTURUS ) && +amdgpu_dpm_set_df_cstate (adev,DF_CSTATE_DISALLOW )) +DRM_WARN ("Fail to disable DF-Cstate.\n" ); + LOOP_UMC_INST_AND_CH(umc_inst, ch_inst) { umc_reg_offset = get_umc_6_reg_offset(adev,drivers/gpu/drm/amd/amdgpu/umc_v6_1.c +4
-0umc_inst,@@ -300,6 +312,10 @@ static void umc_v6_1_query_ras_error_address(struct amdgpu_device *adev, umc_inst); } +if ((adev->asic_type ==CHIP_ARCTURUS ) && +amdgpu_dpm_set_df_cstate (adev,DF_CSTATE_ALLOW )) +DRM_WARN ("Fail to enable DF-Cstate\n" ); +if (rsmu_umc_index_state)umc_v6_1_enable_umc_index_mode (adev);
Quoted 3 lines
}
--
2.17.1
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
[AMD Official Use Only - Internal Distribution Only]
-----Original Message-----
From: Chen, Guchun <[email protected]>
Sent: Wednesday, March 4, 2020 10:47 PM
To: [email protected]; Zhang, Hawking <[email protected]>; Li, Dennis <[email protected]>; Zhou1, Tao <[email protected]>; Clements, John <[email protected]>
Cc: Chen, Guchun <[email protected]>
Subject: [PATCH] drm/amdgpu: toggle DF-Cstate when accessing UMC ras error related registers
On arcturus, DF-Cstate needs to be toggled off/on before and after accessing UMC error counter and error address registers, otherwise, clearing such registers may fail.
--- drivers/gpu/drm/amd/amdgpu/umc_v6_1.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
drivers/gpu/drm/amd/amdgpu/umc_v6_1.c +16 -0
@@ -186,6 +186,10 @@ static void umc_v6_1_query_ras_error_count(struct amdgpu_device *adev,if (rsmu_umc_index_state)umc_v6_1_disable_umc_index_mode (adev); +if ((adev->asic_type ==CHIP_ARCTURUS ) && +amdgpu_dpm_set_df_cstate (adev,DF_CSTATE_DISALLOW )) +DRM_WARN ("Fail to disable DF-Cstate.\n" ); + LOOP_UMC_INST_AND_CH(umc_inst, ch_inst) { umc_reg_offset = get_umc_6_reg_offset(adev, umc_inst,
@@ -199,6 +203,10 @@ static void umc_v6_1_query_ras_error_count(struct amdgpu_device *adev, &(err_data->ue_count)); } +if ((adev->asic_type ==CHIP_ARCTURUS ) && +amdgpu_dpm_set_df_cstate (adev,DF_CSTATE_ALLOW )) +DRM_WARN ("Fail to enable DF-Cstate\n" ); +if (rsmu_umc_index_state)umc_v6_1_enable_umc_index_mode (adev); }
@@ -288,6 +296,10 @@ static void umc_v6_1_query_ras_error_address(struct amdgpu_device *adev,if (rsmu_umc_index_state)umc_v6_1_disable_umc_index_mode (adev); +if ((adev->asic_type ==CHIP_ARCTURUS ) && +amdgpu_dpm_set_df_cstate (adev,DF_CSTATE_DISALLOW )) +DRM_WARN ("Fail to disable DF-Cstate.\n" ); + LOOP_UMC_INST_AND_CH(umc_inst, ch_inst) { umc_reg_offset = get_umc_6_reg_offset(adev, umc_inst,
@@ -300,6 +312,10 @@ static void umc_v6_1_query_ras_error_address(struct amdgpu_device *adev, umc_inst); } +if ((adev->asic_type ==CHIP_ARCTURUS ) && +amdgpu_dpm_set_df_cstate (adev,DF_CSTATE_ALLOW )) +DRM_WARN ("Fail to enable DF-Cstate\n" ); +if (rsmu_umc_index_state)umc_v6_1_enable_umc_index_mode (adev); }
--
2.17.1
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx