drm/amdgpu: Add poison mode query for umc v8_10_0
Subsystems (2)
PATCH 2/2 drm/amdgpu: Add poison mode query for umc v8_10_0
Add poison mode query support on umc v8_10_0.
Signed-off-by Candice Li <[email protected]>
--- drivers/gpu/drm/amd/amdgpu/umc_v8_10.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+)
drivers/gpu/drm/amd/amdgpu/umc_v8_10.c +26 -0
@@ -344,6 +344,31 @@ static void umc_v8_10_err_cnt_init(struct amdgpu_device *adev) } } +static uint32_t umc_v8_10_query_ras_poison_mode_per_channel ( +struct amdgpu_device *adev, +uint32_t umc_reg_offset) +{ +uint32_t ecc_ctrl_addr, ecc_ctrl; + + ecc_ctrl_addr = +SOC15_REG_OFFSET (UMC ,0 , regUMCCH0_0_GeccCtrl); + ecc_ctrl =RREG32_PCIE ((ecc_ctrl_addr + + umc_reg_offset) *4 ); + +return REG_GET_FIELD (ecc_ctrl, UMCCH0_0_GeccCtrl, UCFatalEn); +} + +static bool umc_v8_10_query_ras_poison_mode (struct amdgpu_device *adev) +{ +uint32_t umc_reg_offset =0 ; + +/* Enabling fatal error in umc node0 instance0 channel0 will be +* considered as fatal error mode +*/ + umc_reg_offset =get_umc_v8_10_reg_offset (adev,0 ,0 ,0 ); +return !umc_v8_10_query_ras_poison_mode_per_channel (adev, umc_reg_offset); +} +const struct amdgpu_ras_block_hw_ops umc_v8_10_ras_hw_ops = { .query_ras_error_count = umc_v8_10_query_ras_error_count, .query_ras_error_address = umc_v8_10_query_ras_error_address,
@@ -354,4 +379,5 @@ struct amdgpu_umc_ras umc_v8_10_ras = { .hw_ops = &umc_v8_10_ras_hw_ops, }, .err_cnt_init = umc_v8_10_err_cnt_init, + .query_ras_poison_mode = umc_v8_10_query_ras_poison_mode, };
Signature · 1 line
2.17.1
[AMD Official Use Only - General]
The series is: Reviewed-by: Tao Zhou <[email protected]>
Quoted 61 lines
-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of Candice Li
Sent: Monday, October 10, 2022 2:47 PM
To: [email protected]
Cc: Li, Candice <[email protected]>
Subject: [PATCH 2/2] drm/amdgpu: Add poison mode query for umcv8_10_0Add poison mode query support on umc
v8_10_0.Signed-off-by Candice Li <[email protected]>--- drivers/gpu/drm/amd/amdgpu/umc_v8_10.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+)drivers/gpu/drm/amd/amdgpu/umc_v8_10.c +25
-1@@ -344,6 +344,31 @@ static void umc_v8_10_err_cnt_init(struct amdgpu_device *adev) } } +static uint32_t umc_v8_10_query_ras_poison_mode_per_channel ( +struct amdgpu_device *adev, +uint32_t umc_reg_offset) +{ +uint32_t ecc_ctrl_addr, ecc_ctrl; + + ecc_ctrl_addr = +SOC15_REG_OFFSET (UMC ,0 , regUMCCH0_0_GeccCtrl); + ecc_ctrl =RREG32_PCIE ((ecc_ctrl_addr + + umc_reg_offset) *4 ); + +return REG_GET_FIELD (ecc_ctrl, UMCCH0_0_GeccCtrl, UCFatalEn); } + +static bool umc_v8_10_query_ras_poison_mode (struct amdgpu_device *adev) +{ +uint32_t umc_reg_offset =0 ; + +/* Enabling fatal error in umc node0 instance0 channel0 will be +* considered as fatal error mode +*/ + umc_reg_offset =get_umc_v8_10_reg_offset (adev,0 ,0 ,0 ); +return !umc_v8_10_query_ras_poison_mode_per_channel (adev, +umc_reg_offset); } +const struct amdgpu_ras_block_hw_ops umc_v8_10_ras_hw_ops = { .query_ras_error_count = umc_v8_10_query_ras_error_count, .query_ras_error_address = umc_v8_10_query_ras_error_address,@@ -354,4 +379,5 @@ struct amdgpu_umc_ras umc_v8_10_ras = { .hw_ops = &umc_v8_10_ras_hw_ops, }, .err_cnt_init = umc_v8_10_err_cnt_init, + .query_ras_poison_mode = umc_v8_10_query_ras_poison_mode, }; --2.17.1