Skip to content

Commit d406aec

Browse files
Hawking Zhangalexdeucher
authored andcommitted
drm/amdgpu: correct acclerator check architecutre dump
So driver doesn't touch invalid aca entries. Signed-off-by: Hawking Zhang <[email protected]> Reviewed-by: Yang Wang <[email protected]> Signed-off-by: Alex Deucher <[email protected]>
1 parent 27d80f7 commit d406aec

File tree

2 files changed

+11
-6
lines changed

2 files changed

+11
-6
lines changed

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

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -202,10 +202,17 @@ int amdgpu_mca_smu_set_debug_mode(struct amdgpu_device *adev, bool enable)
202202

203203
static void amdgpu_mca_smu_mca_bank_dump(struct amdgpu_device *adev, int idx, struct mca_bank_entry *entry)
204204
{
205-
int i;
206-
207-
for (i = 0; i < ARRAY_SIZE(entry->regs); i++)
208-
dev_dbg(adev->dev, "mca entry[%02d].regs[%02d]=0x%016llx\n", idx, i, entry->regs[i]);
205+
dev_info(adev->dev, "[Hardware error] Accelerator Check Architecture events logged\n");
206+
dev_info(adev->dev, "[Hardware error] aca entry[%02d].STATUS=0x%016llx\n",
207+
idx, entry->regs[MCA_REG_IDX_STATUS]);
208+
dev_info(adev->dev, "[Hardware error] aca entry[%02d].ADDR=0x%016llx\n",
209+
idx, entry->regs[MCA_REG_IDX_ADDR]);
210+
dev_info(adev->dev, "[Hardware error] aca entry[%02d].MISC0=0x%016llx\n",
211+
idx, entry->regs[MCA_REG_IDX_MISC0]);
212+
dev_info(adev->dev, "[Hardware error] aca entry[%02d].IPID=0x%016llx\n",
213+
idx, entry->regs[MCA_REG_IDX_IPID]);
214+
dev_info(adev->dev, "[Hardware error] aca entry[%02d].SYND=0x%016llx\n",
215+
idx, entry->regs[MCA_REG_IDX_SYND]);
209216
}
210217

211218
int amdgpu_mca_smu_log_ras_error(struct amdgpu_device *adev, enum amdgpu_ras_block blk, enum amdgpu_mca_error_type type, struct ras_err_data *err_data)

drivers/gpu/drm/amd/amdgpu/amdgpu_mca.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,11 +79,9 @@ struct amdgpu_mca {
7979
};
8080

8181
enum mca_reg_idx {
82-
MCA_REG_IDX_CONTROL = 0,
8382
MCA_REG_IDX_STATUS = 1,
8483
MCA_REG_IDX_ADDR = 2,
8584
MCA_REG_IDX_MISC0 = 3,
86-
MCA_REG_IDX_CONFIG = 4,
8785
MCA_REG_IDX_IPID = 5,
8886
MCA_REG_IDX_SYND = 6,
8987
MCA_REG_IDX_COUNT = 16,

0 commit comments

Comments
 (0)