aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYang Wang <kevinyang.wang@amd.com>2024-02-22 10:11:20 +0800
committerAlex Deucher <alexander.deucher@amd.com>2024-03-20 13:38:15 -0400
commit62d2aaa7d466ec286ca871e9fc628cedaffb41b1 (patch)
treefde55c3b83338dded0442c406baad1c4ffb8713a
parentdrm/amdgpu: support utcl2 RAS poison query for mmhub (diff)
downloadlinux-stable-62d2aaa7d466ec286ca871e9fc628cedaffb41b1.tar.xz
linux-stable-62d2aaa7d466ec286ca871e9fc628cedaffb41b1.zip
drm/amdgpu: refine aca error cache for xgmi v6.4.0
refine aca error cache for xgmi v6.4.0 Signed-off-by: Yang Wang <kevinyang.wang@amd.com> Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c
index 43b1aaa04234..3e7f0199926e 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c
@@ -1039,11 +1039,12 @@ static int xgmi_v6_4_0_aca_bank_generate_report(struct aca_handle *handle, struc
struct aca_bank_report *report, void *data)
{
struct amdgpu_device *adev = handle->adev;
+ struct aca_bank_info info;
const char *error_str;
u64 status, count;
int ret, ext_error_code;
- ret = aca_bank_info_decode(bank, &report->info);
+ ret = aca_bank_info_decode(bank, &info);
if (ret)
return ret;
@@ -1056,18 +1057,21 @@ static int xgmi_v6_4_0_aca_bank_generate_report(struct aca_handle *handle, struc
dev_info(adev->dev, "%s detected\n", error_str);
count = ACA_REG__MISC0__ERRCNT(bank->regs[ACA_REG_IDX_MISC0]);
+
switch (type) {
case ACA_SMU_TYPE_UE:
- report->count[ACA_ERROR_TYPE_UE] = ext_error_code == 0 ? count : 0ULL;
+ count = ext_error_code == 0 ? count : 0ULL;
+ ret = aca_error_cache_log_bank_error(handle, &info, ACA_ERROR_TYPE_UE, count);
break;
case ACA_SMU_TYPE_CE:
- report->count[ACA_ERROR_TYPE_CE] = ext_error_code == 6 ? count : 0ULL;
+ count = ext_error_code == 6 ? count : 0ULL;
+ ret = aca_error_cache_log_bank_error(handle, &info, ACA_ERROR_TYPE_CE, count);
break;
default:
return -EINVAL;
}
- return 0;
+ return ret;
}
static const struct aca_bank_ops xgmi_v6_4_0_aca_bank_ops = {