Skip to content

Commit 8736d17

Browse files
Yang Wangalexdeucher
authored andcommitted
drm/amdgpu: add RAS error info support for mmhub_v1_8
add RAS error info support for mmhub_v1_8. Signed-off-by: Yang Wang <[email protected]> Reviewed-by: Tao Zhou <[email protected]> Reviewed-by: Hawking Zhang <[email protected]> Signed-off-by: Alex Deucher <[email protected]>
1 parent 156c281 commit 8736d17

File tree

1 file changed

+13
-2
lines changed

1 file changed

+13
-2
lines changed

drivers/gpu/drm/amd/amdgpu/mmhub_v1_8.c

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -626,6 +626,14 @@ static void mmhub_v1_8_inst_query_ras_error_count(struct amdgpu_device *adev,
626626
void *ras_err_status)
627627
{
628628
struct ras_err_data *err_data = (struct ras_err_data *)ras_err_status;
629+
unsigned long ue_count = 0, ce_count = 0;
630+
631+
/* NOTE: mmhub is converted by aid_mask and the range is 0-3,
632+
* which can be used as die ID directly */
633+
struct amdgpu_smuio_mcm_config_info mcm_info = {
634+
.socket_id = adev->smuio.funcs->get_socket_id(adev),
635+
.die_id = mmhub_inst,
636+
};
629637

630638
amdgpu_ras_inst_query_ras_error_count(adev,
631639
mmhub_v1_8_ce_reg_list,
@@ -634,15 +642,18 @@ static void mmhub_v1_8_inst_query_ras_error_count(struct amdgpu_device *adev,
634642
ARRAY_SIZE(mmhub_v1_8_ras_memory_list),
635643
mmhub_inst,
636644
AMDGPU_RAS_ERROR__SINGLE_CORRECTABLE,
637-
&err_data->ce_count);
645+
&ce_count);
638646
amdgpu_ras_inst_query_ras_error_count(adev,
639647
mmhub_v1_8_ue_reg_list,
640648
ARRAY_SIZE(mmhub_v1_8_ue_reg_list),
641649
mmhub_v1_8_ras_memory_list,
642650
ARRAY_SIZE(mmhub_v1_8_ras_memory_list),
643651
mmhub_inst,
644652
AMDGPU_RAS_ERROR__MULTI_UNCORRECTABLE,
645-
&err_data->ue_count);
653+
&ue_count);
654+
655+
amdgpu_ras_error_statistic_ce_count(err_data, &mcm_info, ce_count);
656+
amdgpu_ras_error_statistic_ue_count(err_data, &mcm_info, ue_count);
646657
}
647658

648659
static void mmhub_v1_8_query_ras_error_count(struct amdgpu_device *adev,

0 commit comments

Comments
 (0)