Skip to contentSkip to conversation

drm/amdgpu: Disable GPU reset on SRIOV before remove pci.

PATCH In review Gavin Wan 2 participants 2 messages Oct 24, 2022

Subsystems (2)
lore
Share & tools
lore

Gavin Wan

author
#0 lore raw

PATCH 1/1 drm/amdgpu: Disable GPU reset on SRIOV before remove pci.

The change "Adjust removal control flow for smu v13_0_2" brought a bug on SRIOV envrionment. It caused unloading amdgpu failed on Guest VM. The reason is that the VF FLR was requested while unloading amdgpu driver, but VF FLR of SRIOV sequence is wrong while removing PCI device.

Change-Id I1ff8dcbffd85d7f3d8267d660fd8292423d2f70f
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +2 -1
index 16f6a313335e..ab0c856c13b0 100644
@@ -2187,7 +2187,8 @@ amdgpu_pci_remove(struct pci_dev *pdev)
 		pm_runtime_forbid(dev->dev);
 	}
 
-	if (adev->ip_versions[MP1_HWIP][0] == IP_VERSION(13, 0, 2)) {
+	if ((adev->ip_versions[MP1_HWIP][0] == IP_VERSION(13, 0, 2)) &&
+			!amdgpu_sriov_vf(adev)) {
 		bool need_to_reset_gpu = false;
 
 		if (adev->gmc.xgmi.num_physical_nodes > 1) {
Signature · 1 line
2.34.1
Acked-by on v1 1/1
#1 lore raw
Quoted 2 lines · Gavin Wan

The change "Adjust removal control flow for smu v13_0_2"

commit f5c7e7797060 ("drm/amdgpu: Adjust removal control flow for smu v13_0_2")

Quoted 6 lines

brought a bug on SRIOV envrionment. It caused unloading amdgpu failed on Guest VM. The reason is that the VF FLR was requested while unloading amdgpu driver, but VF FLR of SRIOV sequence is wrong while removing PCI device.

Please add:

Fixes f5c7e7797060 ("drm/amdgpu: Adjust removal control flow for smu v13_0_2")

With that,

Quoted 22 lines

Change-Id: I1ff8dcbffd85d7f3d8267d660fd8292423d2f70f

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +2 -2
index 16f6a313335e..ab0c856c13b0 100644
@@ -2187,7 +2187,8 @@ amdgpu_pci_remove(struct pci_dev *pdev)
                pm_runtime_forbid(dev->dev);
        }
 
-       if (adev->ip_versions[MP1_HWIP][0] == IP_VERSION(13, 0, 2)) {
+       if ((adev->ip_versions[MP1_HWIP][0] == IP_VERSION(13, 0, 2)) &&
+                       !amdgpu_sriov_vf(adev)) {
                bool need_to_reset_gpu = false;
 
                if (adev->gmc.xgmi.num_physical_nodes > 1) {
--

2.34.1