drm/amdgpu: Update RAS XGMI Error Query

John Clements · alexdeucher · commit f24d991bb964 · 2021-08-24T15:36:43.000-04:00
Resolve bug querying error on unsupported ASIC

Reviewed-by: Hawking Zhang &lt;Hawking.Zhang@amd.com&gt;
Signed-off-by: John Clements &lt;john.clements@amd.com&gt;
Signed-off-by: Alex Deucher &lt;alexander.deucher@amd.com&gt;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c
@@ -848,7 +848,6 @@ static int amdgpu_xgmi_query_ras_error_count(struct amdgpu_device *adev,
 		}
 		break;
 	case CHIP_VEGA20:
-	default:
 		/* check xgmi pcs error */
 		for (i = 0; i < ARRAY_SIZE(xgmi_pcs_err_status_reg_vg20); i++) {
 			data = RREG32_PCIE(xgmi_pcs_err_status_reg_vg20[i]);
@@ -864,6 +863,9 @@ static int amdgpu_xgmi_query_ras_error_count(struct amdgpu_device *adev,
 						data, &ue_cnt, &ce_cnt, false);
 		}
 		break;
+	default:
+		dev_warn(adev->dev, "XGMI RAS error query not supported");
+		break;
 	}
 
 	adev->gmc.xgmi.ras_funcs->reset_ras_error_count(adev);

Original file line number	Diff line number	Diff line change
`@@ -848,7 +848,6 @@ static int amdgpu_xgmi_query_ras_error_count(struct amdgpu_device *adev,`
`848`	`848`	`}`
`849`	`849`	`break;`
`850`	`850`	`case CHIP_VEGA20:`
`851`		`- default:`
`852`	`851`	`/* check xgmi pcs error */`
`853`	`852`	`for (i = 0; i < ARRAY_SIZE(xgmi_pcs_err_status_reg_vg20); i++) {`
`854`	`853`	`data = RREG32_PCIE(xgmi_pcs_err_status_reg_vg20[i]);`
`@@ -864,6 +863,9 @@ static int amdgpu_xgmi_query_ras_error_count(struct amdgpu_device *adev,`
`864`	`863`	`data, &ue_cnt, &ce_cnt, false);`
`865`	`864`	`}`
`866`	`865`	`break;`
	`866`	`+ default:`
	`867`	`+ dev_warn(adev->dev, "XGMI RAS error query not supported");`
	`868`	`+ break;`
`867`	`869`	`}`
`868`	`870`
`869`	`871`	`adev->gmc.xgmi.ras_funcs->reset_ras_error_count(adev);`