drm/amdgpu: update athub interrupt harvesting handle
Subsystems (2)
PATCH v4 1/1 drm/amdgpu: update athub interrupt harvesting handle
GCEA/MMHUB EA error should not result to DF freeze, this is fixed in next generation, but for some reasons the GCEA/MMHUB EA error will result to DF freeze in previous generation, diver should avoid to indicate GCEA/MMHUB EA error as hw fatal error in kernel message by read GCEA/MMHUB err status registers.
Changed from V1:
make query_ras_error_status function more general make read mmhub er status register more friendly
Changed from V2:
move ras error status query function into do_recovery workqueue
Changed from V3:
remove useless code from V2, print GCEA error status instance number
--- drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 43 ++++++++++++++++++- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 1 + drivers/gpu/drm/amd/amdgpu/gfx_v9_4.c | 29 +++++++++++++ drivers/gpu/drm/amd/amdgpu/gfx_v9_4.h | 2 + drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c | 29 +++++++++++++ .../amd/include/asic_reg/gc/gc_9_4_1_offset.h | 4 +- 8 files changed, 108 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h +1 -0
@@ -217,6 +217,7 @@ struct amdgpu_gfx_funcs {int (*query_ras_error_count) (struct amdgpu_device *adev,void *ras_error_status);void (*reset_ras_error_count) (struct amdgpu_device *adev);void (*init_spm_golden)(struct amdgpu_device *adev); +void (*query_ras_error_status) (struct amdgpu_device *adev); };struct sq_work {
drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.h +1 -0
@@ -40,6 +40,7 @@ struct amdgpu_mmhub_funcs { uint64_t page_table_base);void (*update_power_gating)(struct amdgpu_device *adev,bool enable); +void (*query_ras_error_status)(struct amdgpu_device *adev); };struct amdgpu_mmhub {
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +42 -1
56 lines not on this page · raw message
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +1 -0
@@ -2075,6 +2075,7 @@ static const struct amdgpu_gfx_funcs gfx_v9_4_gfx_funcs = { .ras_error_inject = &gfx_v9_4_ras_error_inject, .query_ras_error_count = &gfx_v9_4_query_ras_error_count, .reset_ras_error_count = &gfx_v9_4_reset_ras_error_count, + .query_ras_error_status = &gfx_v9_4_query_ras_error_status, };static int gfx_v9_0_gpu_early_init (struct amdgpu_device *adev)
drivers/gpu/drm/amd/amdgpu/gfx_v9_4.c +29 -0
@@ -992,3 +992,32 @@ int gfx_v9_4_ras_error_inject(struct amdgpu_device *adev, void *inject_if)return ret; } + +static const struct soc15_reg_entry gfx_v9_4_rdrsp_status_regs = + {SOC15_REG_ENTRY (GC ,0 , mmGCEA_ERR_STATUS),0 ,1 ,32 }; + +void gfx_v9_4_query_ras_error_status (struct amdgpu_device *adev) +{ +uint32_t i, j; +uint32_t reg_value; + +if (!amdgpu_ras_is_supported (adev,AMDGPU_RAS_BLOCK__GFX )) +return ; + +mutex_lock (&adev->grbm_idx_mutex); + +for (i =0 ; i < gfx_v9_4_rdrsp_status_regs.se_num; i++) { +for (j =0 ; j < gfx_v9_4_rdrsp_status_regs.instance; + j++) { +gfx_v9_4_select_se_sh (adev, i,0 , j); + reg_value =RREG32 (SOC15_REG_ENTRY_OFFSET ( + gfx_v9_4_rdrsp_status_regs)); +if (reg_value) +dev_warn (adev->dev,"GCEA err detected at instance: %d, status: 0x%x!\n" , + j, reg_value); + } + } + +gfx_v9_4_select_se_sh (adev,0xffffffff ,0xffffffff ,0xffffffff ); +mutex_unlock (&adev->grbm_idx_mutex); +}
drivers/gpu/drm/amd/amdgpu/gfx_v9_4.h +2 -0
@@ -34,4 +34,6 @@ int gfx_v9_4_ras_error_inject(struct amdgpu_device *adev,void gfx_v9_4_reset_ras_error_count (struct amdgpu_device *adev); +void gfx_v9_4_query_ras_error_status (struct amdgpu_device *adev); +#endif /* __GFX_V9_4_H__ */
drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c +29 -0
@@ -1624,6 +1624,34 @@ static void mmhub_v9_4_reset_ras_error_count(struct amdgpu_device *adev) } } +static const struct soc15_reg_entry mmhub_v9_4_err_status_regs[] = { + {SOC15_REG_ENTRY (MMHUB ,0 , mmMMEA0_ERR_STATUS),0 ,0 ,0 }, + {SOC15_REG_ENTRY (MMHUB ,0 , mmMMEA1_ERR_STATUS),0 ,0 ,0 }, + {SOC15_REG_ENTRY (MMHUB ,0 , mmMMEA2_ERR_STATUS),0 ,0 ,0 }, + {SOC15_REG_ENTRY (MMHUB ,0 , mmMMEA3_ERR_STATUS),0 ,0 ,0 }, + {SOC15_REG_ENTRY (MMHUB ,0 , mmMMEA4_ERR_STATUS),0 ,0 ,0 }, + {SOC15_REG_ENTRY (MMHUB ,0 , mmMMEA5_ERR_STATUS),0 ,0 ,0 }, + {SOC15_REG_ENTRY (MMHUB ,0 , mmMMEA6_ERR_STATUS),0 ,0 ,0 }, + {SOC15_REG_ENTRY (MMHUB ,0 , mmMMEA7_ERR_STATUS),0 ,0 ,0 }, +}; + +static void mmhub_v9_4_query_ras_error_status (struct amdgpu_device *adev) +{ +int i; +uint32_t reg_value; + +if (!amdgpu_ras_is_supported (adev,AMDGPU_RAS_BLOCK__MMHUB )) +return ; + +for (i =0 ; i <ARRAY_SIZE (mmhub_v9_4_err_status_regs); i++) { + reg_value = +RREG32 (SOC15_REG_ENTRY_OFFSET (mmhub_v9_4_err_status_regs[i])); +if (reg_value) +dev_warn (adev->dev,"MMHUB EA err detected at instance: %d, status: 0x%x!\n" , + i, reg_value); + } +} +const struct amdgpu_mmhub_funcs mmhub_v9_4_funcs = { .ras_late_init = amdgpu_mmhub_ras_late_init, .query_ras_error_count = mmhub_v9_4_query_ras_error_count,
@@ -1636,4 +1664,5 @@ const struct amdgpu_mmhub_funcs mmhub_v9_4_funcs = { .set_clockgating = mmhub_v9_4_set_clockgating, .get_clockgating = mmhub_v9_4_get_clockgating, .setup_vm_pt_regs = mmhub_v9_4_setup_vm_pt_regs, + .query_ras_error_status = mmhub_v9_4_query_ras_error_status, };
drivers/gpu/drm/amd/include/asic_reg/gc/gc_9_4_1_offset.h +3 -1
@@ -205,6 +205,8 @@#define mmGCEA_EDC_CNT2_BASE_IDX 0#define mmGCEA_EDC_CNT3 0x071b#define mmGCEA_EDC_CNT3_BASE_IDX 0 +#define mmGCEA_ERR_STATUS 0x0712 +#define mmGCEA_ERR_STATUS_BASE_IDX 0// addressBlock: gc_gfxudec // base address: 0x30000
@@ -261,4 +263,4 @@#define mmRLC_EDC_CNT2 0x4d41#define mmRLC_EDC_CNT2_BASE_IDX 1 -#endif +#endif
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
[AMD Public Use]
Regards,
Hawking
-----Original Message-----
From: Stanley.Yang <[email protected]>
Sent: Monday, September 21, 2020 21:48
To: [email protected]
Cc: Zhang, Hawking <[email protected]>; Chen, Guchun <[email protected]>; Clements, John <[email protected]>; Li, Dennis <[email protected]>; Zhou1, Tao <[email protected]>; Yang, Stanley <[email protected]>
Subject: [PATCH V4 1/1] drm/amdgpu: update athub interrupt harvesting handle
GCEA/MMHUB EA error should not result to DF freeze, this is fixed in next generation, but for some reasons the GCEA/MMHUB EA error will result to DF freeze in previous generation, diver should avoid to indicate GCEA/MMHUB EA error as hw fatal error in kernel message by read GCEA/MMHUB err status registers.
Changed from V1:
make query_ras_error_status function more general make read mmhub er status register more friendly
Changed from V2:
move ras error status query function into do_recovery workqueue
Changed from V3:
remove useless code from V2, print GCEA error status instance number
--- drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 43 ++++++++++++++++++- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 1 + drivers/gpu/drm/amd/amdgpu/gfx_v9_4.c | 29 +++++++++++++ drivers/gpu/drm/amd/amdgpu/gfx_v9_4.h | 2 + drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c | 29 +++++++++++++ .../amd/include/asic_reg/gc/gc_9_4_1_offset.h | 4 +- 8 files changed, 108 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h +1 -0
@@ -217,6 +217,7 @@ struct amdgpu_gfx_funcs {int (*query_ras_error_count) (struct amdgpu_device *adev,void *ras_error_status);void (*reset_ras_error_count) (struct amdgpu_device *adev);void (*init_spm_golden)(struct amdgpu_device *adev); +void (*query_ras_error_status) (struct amdgpu_device *adev); };struct sq_work {
drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.h +1 -0
@@ -40,6 +40,7 @@ struct amdgpu_mmhub_funcs { uint64_t page_table_base);void (*update_power_gating)(struct amdgpu_device *adev,bool enable); +void (*query_ras_error_status)(struct amdgpu_device *adev); };struct amdgpu_mmhub {
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +41 -1
55 lines not on this page · raw message
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +1 -0
@@ -2075,6 +2075,7 @@ static const struct amdgpu_gfx_funcs gfx_v9_4_gfx_funcs = { .ras_error_inject = &gfx_v9_4_ras_error_inject, .query_ras_error_count = &gfx_v9_4_query_ras_error_count, .reset_ras_error_count = &gfx_v9_4_reset_ras_error_count, + .query_ras_error_status = &gfx_v9_4_query_ras_error_status, }; static int gfx_v9_0_gpu_early_init(struct amdgpu_device *adev) diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_4.c b/drivers/gpu/drm/amd/amdgpu/gfx_v9_4.c
index bd85aed3523a..bc699d680ce8 100644
drivers/gpu/drm/amd/amdgpu/gfx_v9_4.c +28 -0
@@ -992,3 +992,32 @@ int gfx_v9_4_ras_error_inject(struct amdgpu_device *adev, void *inject_if)return ret; } + +static const struct soc15_reg_entry gfx_v9_4_rdrsp_status_regs = + {SOC15_REG_ENTRY (GC ,0 , mmGCEA_ERR_STATUS),0 ,1 ,32 }; + +void gfx_v9_4_query_ras_error_status (struct amdgpu_device *adev) { +uint32_t i, j; +uint32_t reg_value; + +if (!amdgpu_ras_is_supported (adev,AMDGPU_RAS_BLOCK__GFX )) +return ; + +mutex_lock (&adev->grbm_idx_mutex); + +for (i =0 ; i < gfx_v9_4_rdrsp_status_regs.se_num; i++) { +for (j =0 ; j < gfx_v9_4_rdrsp_status_regs.instance; + j++) { +gfx_v9_4_select_se_sh (adev, i,0 , j); + reg_value =RREG32 (SOC15_REG_ENTRY_OFFSET ( + gfx_v9_4_rdrsp_status_regs)); +if (reg_value) +dev_warn (adev->dev,"GCEA err detected at instance: %d, status: 0x%x!\n" , + j, reg_value); + } + } + +gfx_v9_4_select_se_sh (adev,0xffffffff ,0xffffffff ,0xffffffff ); +mutex_unlock (&adev->grbm_idx_mutex); +}
drivers/gpu/drm/amd/amdgpu/gfx_v9_4.h +2 -0
@@ -34,4 +34,6 @@ int gfx_v9_4_ras_error_inject(struct amdgpu_device *adev,void gfx_v9_4_reset_ras_error_count (struct amdgpu_device *adev); +void gfx_v9_4_query_ras_error_status (struct amdgpu_device *adev); +#endif /* __GFX_V9_4_H__ */
drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c +27 -0
@@ -1624,6 +1624,34 @@ static void mmhub_v9_4_reset_ras_error_count(struct amdgpu_device *adev) } } +static const struct soc15_reg_entry mmhub_v9_4_err_status_regs[] = { + {SOC15_REG_ENTRY (MMHUB ,0 , mmMMEA0_ERR_STATUS),0 ,0 ,0 }, + {SOC15_REG_ENTRY (MMHUB ,0 , mmMMEA1_ERR_STATUS),0 ,0 ,0 }, + {SOC15_REG_ENTRY (MMHUB ,0 , mmMMEA2_ERR_STATUS),0 ,0 ,0 }, + {SOC15_REG_ENTRY (MMHUB ,0 , mmMMEA3_ERR_STATUS),0 ,0 ,0 }, + {SOC15_REG_ENTRY (MMHUB ,0 , mmMMEA4_ERR_STATUS),0 ,0 ,0 }, + {SOC15_REG_ENTRY (MMHUB ,0 , mmMMEA5_ERR_STATUS),0 ,0 ,0 }, + {SOC15_REG_ENTRY (MMHUB ,0 , mmMMEA6_ERR_STATUS),0 ,0 ,0 }, + {SOC15_REG_ENTRY (MMHUB ,0 , mmMMEA7_ERR_STATUS),0 ,0 ,0 }, }; + +static void mmhub_v9_4_query_ras_error_status (struct amdgpu_device +*adev) { +int i; +uint32_t reg_value; + +if (!amdgpu_ras_is_supported (adev,AMDGPU_RAS_BLOCK__MMHUB )) +return ; + +for (i =0 ; i <ARRAY_SIZE (mmhub_v9_4_err_status_regs); i++) { + reg_value = +RREG32 (SOC15_REG_ENTRY_OFFSET (mmhub_v9_4_err_status_regs[i])); +if (reg_value) +dev_warn (adev->dev,"MMHUB EA err detected at instance: %d, status: 0x%x!\n" , + i, reg_value); + } +} + const struct amdgpu_mmhub_funcs mmhub_v9_4_funcs = { .ras_late_init = amdgpu_mmhub_ras_late_init, .query_ras_error_count = mmhub_v9_4_query_ras_error_count, @@ -1636,4 +1664,5 @@ const struct amdgpu_mmhub_funcs mmhub_v9_4_funcs = {
.set_clockgating = mmhub_v9_4_set_clockgating, .get_clockgating = mmhub_v9_4_get_clockgating, .setup_vm_pt_regs = mmhub_v9_4_setup_vm_pt_regs,
+ .query_ras_error_status = mmhub_v9_4_query_ras_error_status,
};
drivers/gpu/drm/amd/include/asic_reg/gc/gc_9_4_1_offset.h +3 -1
@@ -205,6 +205,8 @@#define mmGCEA_EDC_CNT2_BASE_IDX 0#define mmGCEA_EDC_CNT3 0x071b#define mmGCEA_EDC_CNT3_BASE_IDX 0 +#define mmGCEA_ERR_STATUS 0x0712 +#define mmGCEA_ERR_STATUS_BASE_IDX 0// addressBlock: gc_gfxudec // base address: 0x30000
@@ -261,4 +263,4 @@#define mmRLC_EDC_CNT2 0x4d41#define mmRLC_EDC_CNT2_BASE_IDX 1 -#endif +#endif
--
2.17.1
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx