Commit 0b9ebd7e authored by John Clements's avatar John Clements Committed by Alex Deucher
Browse files

drm/amdgpu: resolve mGPU RAS query instability



upon receiving uncorrectable error, query every GPU node for ras errors

Reviewed-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: default avatarJohn Clements <john.clements@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent dec78805
Loading
Loading
Loading
Loading
+15 −5
Original line number Diff line number Diff line
@@ -1424,12 +1424,22 @@ static void amdgpu_ras_do_recovery(struct work_struct *work)
{
	struct amdgpu_ras *ras =
		container_of(work, struct amdgpu_ras, recovery_work);
	struct amdgpu_device *remote_adev = NULL;
	struct amdgpu_device *adev = ras->adev;
	struct list_head device_list, *device_list_handle =  NULL;
	struct amdgpu_hive_info *hive = amdgpu_get_xgmi_hive(adev, false);

	/* Build list of devices to query RAS related errors */
	if  (hive && adev->gmc.xgmi.num_physical_nodes > 1) {
		device_list_handle = &hive->device_list;
	} else {
		list_add_tail(&adev->gmc.xgmi.head, &device_list);
		device_list_handle = &device_list;
	}

	/*
	 * Query and print non zero error counter per IP block for
	 * awareness before recovering GPU.
	 */
	amdgpu_ras_log_on_err_counter(ras->adev);
	list_for_each_entry(remote_adev, device_list_handle, gmc.xgmi.head) {
		amdgpu_ras_log_on_err_counter(remote_adev);
	}

	if (amdgpu_device_should_recover_gpu(ras->adev))
		amdgpu_device_gpu_recover(ras->adev, 0);