leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/amdgpu: update RAS related dmesg print

Browse Source 
prefix RAS error related dmesg print with pci device info

Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: John Clements <john.clements@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
John Clements 2020-04-07 16:54:33 +08:00 committed by Alex Deucher
parent b3dbd6d3ec
commit 4a06686b94
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/gpu/drm/amd/amdgpu/gfx_v9_4.c
View File

@ -710,14 +710,16 @@ static int gfx_v9_4_query_utc_edc_status(struct amdgpu_device *adev,
sec_count = REG_GET_FIELD(data, VML2_MEM_ECC_CNTL, SEC_COUNT); sec_count = REG_GET_FIELD(data, VML2_MEM_ECC_CNTL, SEC_COUNT);
if (sec_count) { if (sec_count) {
DRM_INFO("Instance[%d]: SubBlock %s, SEC %d\n", i, dev_info(adev->dev,
"Instance[%d]: SubBlock %s, SEC %d\n", i,
vml2_mems[i], sec_count); vml2_mems[i], sec_count);
err_data->ce_count += sec_count; err_data->ce_count += sec_count;
} }
ded_count = REG_GET_FIELD(data, VML2_MEM_ECC_CNTL, DED_COUNT); ded_count = REG_GET_FIELD(data, VML2_MEM_ECC_CNTL, DED_COUNT);
if (ded_count) { if (ded_count) {
DRM_INFO("Instance[%d]: SubBlock %s, DED %d\n", i, dev_info(adev->dev,
"Instance[%d]: SubBlock %s, DED %d\n", i,
vml2_mems[i], ded_count); vml2_mems[i], ded_count);
err_data->ue_count += ded_count; err_data->ue_count += ded_count;
} }

13
drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c
View File

@ -1539,8 +1539,11 @@ static const struct soc15_reg_entry mmhub_v9_4_edc_cnt_regs[] = {
{ SOC15_REG_ENTRY(MMHUB, 0, mmMMEA7_EDC_CNT3), 0, 0, 0 }, { SOC15_REG_ENTRY(MMHUB, 0, mmMMEA7_EDC_CNT3), 0, 0, 0 },
}; };
static int mmhub_v9_4_get_ras_error_count(const struct soc15_reg_entry *reg, static int mmhub_v9_4_get_ras_error_count(struct amdgpu_device *adev,
uint32_t value, uint32_t *sec_count, uint32_t *ded_count) const struct soc15_reg_entry *reg,
uint32_t value,
uint32_t *sec_count,
uint32_t *ded_count)
{ {
uint32_t i; uint32_t i;
uint32_t sec_cnt, ded_cnt; uint32_t sec_cnt, ded_cnt;
@ -1553,7 +1556,7 @@ static int mmhub_v9_4_get_ras_error_count(const struct soc15_reg_entry *reg,
mmhub_v9_4_ras_fields[i].sec_count_mask) >> mmhub_v9_4_ras_fields[i].sec_count_mask) >>
mmhub_v9_4_ras_fields[i].sec_count_shift; mmhub_v9_4_ras_fields[i].sec_count_shift;
if (sec_cnt) { if (sec_cnt) {
DRM_INFO("MMHUB SubBlock %s, SEC %d\n", dev_info(adev->dev, "MMHUB SubBlock %s, SEC %d\n",
mmhub_v9_4_ras_fields[i].name, mmhub_v9_4_ras_fields[i].name,
sec_cnt); sec_cnt);
*sec_count += sec_cnt; *sec_count += sec_cnt;
@ -1563,7 +1566,7 @@ static int mmhub_v9_4_get_ras_error_count(const struct soc15_reg_entry *reg,
mmhub_v9_4_ras_fields[i].ded_count_mask) >> mmhub_v9_4_ras_fields[i].ded_count_mask) >>
mmhub_v9_4_ras_fields[i].ded_count_shift; mmhub_v9_4_ras_fields[i].ded_count_shift;
if (ded_cnt) { if (ded_cnt) {
DRM_INFO("MMHUB SubBlock %s, DED %d\n", dev_info(adev->dev, "MMHUB SubBlock %s, DED %d\n",
mmhub_v9_4_ras_fields[i].name, mmhub_v9_4_ras_fields[i].name,
ded_cnt); ded_cnt);
*ded_count += ded_cnt; *ded_count += ded_cnt;
@ -1588,7 +1591,7 @@ static void mmhub_v9_4_query_ras_error_count(struct amdgpu_device *adev,
reg_value = reg_value =
RREG32(SOC15_REG_ENTRY_OFFSET(mmhub_v9_4_edc_cnt_regs[i])); RREG32(SOC15_REG_ENTRY_OFFSET(mmhub_v9_4_edc_cnt_regs[i]));
if (reg_value) if (reg_value)
mmhub_v9_4_get_ras_error_count(&mmhub_v9_4_edc_cnt_regs[i], mmhub_v9_4_get_ras_error_count(adev, &mmhub_v9_4_edc_cnt_regs[i],
reg_value, &sec_count, &ded_count); reg_value, &sec_count, &ded_count);
} }