Skip to contentSkip to conversation

drm/amdgpu: correct single device PCIe reset flow for DPC

PATCH New Ce Sun 1 participant 1 message Apr 10

Subsystems (2)
lore
Share & tools
lore

Ce Sun

author
#0 lore raw

PATCH 1/1 drm/amdgpu: correct single device PCIe reset flow for DPC

For triggering the dpc event with a single device, we still need to set the in_link_reset flag and the dpc status.

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +11 -6
index deb41c095b59..ecc6e96cb5e5 100644
@@ -5524,6 +5524,8 @@ static void amdgpu_device_recovery_prepare(struct amdgpu_device *adev,
 		if (!list_is_first(&adev->reset_list, device_list))
 			list_rotate_to_front(&adev->reset_list, device_list);
 	} else {
+		if (amdgpu_reset_in_dpc(adev))
+			adev->pcie_reset_ctx.in_link_reset = true;
 		list_add_tail(&adev->reset_list, device_list);
 	}
 }
@@ -6291,7 +6293,11 @@ pci_ers_result_t amdgpu_pci_error_detected(struct pci_dev *pdev, pci_channel_sta
 			amdgpu_reset_set_dpc_status(adev, true);
 
 			mutex_lock(&hive->hive_lock);
+		} else {
+			if (amdgpu_device_bus_status_check(adev))
+				amdgpu_reset_set_dpc_status(adev, true);
 		}
+
 		memset(&reset_context, 0, sizeof(reset_context));
 		INIT_LIST_HEAD(&device_list);
 
@@ -6406,13 +6412,10 @@ pci_ers_result_t amdgpu_pci_slot_reset(struct pci_dev *pdev)
 	set_bit(AMDGPU_NEED_FULL_RESET, &reset_context.flags);
 	set_bit(AMDGPU_SKIP_COREDUMP, &reset_context.flags);
 
-	if (hive) {
+	if (hive)
 		reset_context.hive = hive;
-		list_for_each_entry(tmp_adev, &hive->device_list, gmc.xgmi.head)
-			tmp_adev->pcie_reset_ctx.in_link_reset = true;
-	} else {
+	else
 		set_bit(AMDGPU_SKIP_HW_RESET, &reset_context.flags);
-	}
 
 	r = amdgpu_device_asic_reset(adev, &device_list, &reset_context);
 out:
@@ -6467,8 +6470,10 @@ void amdgpu_pci_resume(struct pci_dev *pdev)
 			tmp_adev->pcie_reset_ctx.in_link_reset = false;
 			list_add_tail(&tmp_adev->reset_list, &device_list);
 		}
-	} else
+	} else {
+		adev->pcie_reset_ctx.in_link_reset = false;
 		list_add_tail(&adev->reset_list, &device_list);
+	}
 
 	amdgpu_device_sched_resume(&device_list, NULL, NULL);
 	amdgpu_device_gpu_resume(adev, &device_list, false);
Signature · 1 line
2.34.1