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>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c
index 43b1aaa042342fca4944f797f4757cc28635c2d2..3e7f0199926e33c2194d0819b4a1dfe80676a87e 100644 (file)
--- 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 = {