Skip to content

Commit 2b961e6

Browse files
John Clementsalexdeucher
authored andcommitted
drm/amdgpu: update RAS related dmesg print
prefix RAS error related dmesg print with pci device info Reviewed-by: Hawking Zhang <[email protected]> Signed-off-by: John Clements <[email protected]> Signed-off-by: Alex Deucher <[email protected]>
1 parent 0b9ebd7 commit 2b961e6

File tree

2 files changed

+12
-7
lines changed

2 files changed

+12
-7
lines changed

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -710,14 +710,16 @@ static int gfx_v9_4_query_utc_edc_status(struct amdgpu_device *adev,
710710

711711
sec_count = REG_GET_FIELD(data, VML2_MEM_ECC_CNTL, SEC_COUNT);
712712
if (sec_count) {
713-
DRM_INFO("Instance[%d]: SubBlock %s, SEC %d\n", i,
713+
dev_info(adev->dev,
714+
"Instance[%d]: SubBlock %s, SEC %d\n", i,
714715
vml2_mems[i], sec_count);
715716
err_data->ce_count += sec_count;
716717
}
717718

718719
ded_count = REG_GET_FIELD(data, VML2_MEM_ECC_CNTL, DED_COUNT);
719720
if (ded_count) {
720-
DRM_INFO("Instance[%d]: SubBlock %s, DED %d\n", i,
721+
dev_info(adev->dev,
722+
"Instance[%d]: SubBlock %s, DED %d\n", i,
721723
vml2_mems[i], ded_count);
722724
err_data->ue_count += ded_count;
723725
}

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

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1539,8 +1539,11 @@ static const struct soc15_reg_entry mmhub_v9_4_edc_cnt_regs[] = {
15391539
{ SOC15_REG_ENTRY(MMHUB, 0, mmMMEA7_EDC_CNT3), 0, 0, 0 },
15401540
};
15411541

1542-
static int mmhub_v9_4_get_ras_error_count(const struct soc15_reg_entry *reg,
1543-
uint32_t value, uint32_t *sec_count, uint32_t *ded_count)
1542+
static int mmhub_v9_4_get_ras_error_count(struct amdgpu_device *adev,
1543+
const struct soc15_reg_entry *reg,
1544+
uint32_t value,
1545+
uint32_t *sec_count,
1546+
uint32_t *ded_count)
15441547
{
15451548
uint32_t i;
15461549
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,
15531556
mmhub_v9_4_ras_fields[i].sec_count_mask) >>
15541557
mmhub_v9_4_ras_fields[i].sec_count_shift;
15551558
if (sec_cnt) {
1556-
DRM_INFO("MMHUB SubBlock %s, SEC %d\n",
1559+
dev_info(adev->dev, "MMHUB SubBlock %s, SEC %d\n",
15571560
mmhub_v9_4_ras_fields[i].name,
15581561
sec_cnt);
15591562
*sec_count += sec_cnt;
@@ -1563,7 +1566,7 @@ static int mmhub_v9_4_get_ras_error_count(const struct soc15_reg_entry *reg,
15631566
mmhub_v9_4_ras_fields[i].ded_count_mask) >>
15641567
mmhub_v9_4_ras_fields[i].ded_count_shift;
15651568
if (ded_cnt) {
1566-
DRM_INFO("MMHUB SubBlock %s, DED %d\n",
1569+
dev_info(adev->dev, "MMHUB SubBlock %s, DED %d\n",
15671570
mmhub_v9_4_ras_fields[i].name,
15681571
ded_cnt);
15691572
*ded_count += ded_cnt;
@@ -1588,7 +1591,7 @@ static void mmhub_v9_4_query_ras_error_count(struct amdgpu_device *adev,
15881591
reg_value =
15891592
RREG32(SOC15_REG_ENTRY_OFFSET(mmhub_v9_4_edc_cnt_regs[i]));
15901593
if (reg_value)
1591-
mmhub_v9_4_get_ras_error_count(&mmhub_v9_4_edc_cnt_regs[i],
1594+
mmhub_v9_4_get_ras_error_count(adev, &mmhub_v9_4_edc_cnt_regs[i],
15921595
reg_value, &sec_count, &ded_count);
15931596
}
15941597

0 commit comments

Comments
 (0)