drm/amdgpu: enable PCS error report on arcturus
authorHawking Zhang <Hawking.Zhang@amd.com>
Fri, 21 Feb 2020 14:14:05 +0000 (22:14 +0800)
committerAlex Deucher <alexander.deucher@amd.com>
Fri, 6 Mar 2020 19:31:43 +0000 (14:31 -0500)
add arcturus xgmi/wafl pcs err status group to support
PCS error detection and report on arcturus

Signed-off-by: Hawking Zhang <Hawking.Zhang@amd.com>
Reviewed-by: Guchun Chen <guchun.chen@amd.com>
Reviewed-by: Tao Zhou <tao.zhou1@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c

index e018bfa3ac6b6415ca68c4bf1569e8ed34f6cabf..59d171510ddc363f412539b85053710674d1ca67 100644 (file)
@@ -51,6 +51,21 @@ static const int wafl_pcs_err_status_reg_vg20[] = {
        smnPCS_GOPX1_0_PCS_GOPX1_PCS_ERROR_STATUS + 0x100000,
 };
 
+static const int xgmi_pcs_err_status_reg_arct[] = {
+       smnXGMI0_PCS_GOPX16_PCS_ERROR_STATUS,
+       smnXGMI0_PCS_GOPX16_PCS_ERROR_STATUS + 0x100000,
+       smnXGMI0_PCS_GOPX16_PCS_ERROR_STATUS + 0x500000,
+       smnXGMI0_PCS_GOPX16_PCS_ERROR_STATUS + 0x600000,
+       smnXGMI0_PCS_GOPX16_PCS_ERROR_STATUS + 0x700000,
+       smnXGMI0_PCS_GOPX16_PCS_ERROR_STATUS + 0x800000,
+};
+
+/* same as vg20*/
+static const int wafl_pcs_err_status_reg_arct[] = {
+       smnPCS_GOPX1_0_PCS_GOPX1_PCS_ERROR_STATUS,
+       smnPCS_GOPX1_0_PCS_GOPX1_PCS_ERROR_STATUS + 0x100000,
+};
+
 static const struct amdgpu_pcs_ras_field xgmi_pcs_ras_fields[] = {
        {"XGMI PCS DataLossErr",
         SOC15_REG_FIELD(XGMI0_PCS_GOPX16_PCS_ERROR_STATUS, DataLossErr)},
@@ -709,6 +724,22 @@ int amdgpu_xgmi_query_ras_error_count(struct amdgpu_device *adev,
        err_data->ce_count = 0;
 
        switch (adev->asic_type) {
+       case CHIP_ARCTURUS:
+               /* check xgmi pcs error */
+               for (i = 0; i < ARRAY_SIZE(xgmi_pcs_err_status_reg_arct); i++) {
+                       data = RREG32_PCIE(xgmi_pcs_err_status_reg_arct[i]);
+                       if (data)
+                               amdgpu_xgmi_query_pcs_error_status(adev,
+                                               data, &ue_cnt, &ce_cnt, true);
+               }
+               /* check wafl pcs error */
+               for (i = 0; i < ARRAY_SIZE(wafl_pcs_err_status_reg_arct); i++) {
+                       data = RREG32_PCIE(wafl_pcs_err_status_reg_arct[i]);
+                       if (data)
+                               amdgpu_xgmi_query_pcs_error_status(adev,
+                                               data, &ue_cnt, &ce_cnt, false);
+               }
+               break;
        case CHIP_VEGA20:
        default:
                /* check xgmi pcs error */