Skip to contentSkip to conversation

drm/amdgpu: Need to disable msix when unloading driver

PATCH In review Emily Deng 3 participants 5 messages Nov 6, 2019 4 messages not in the archive

Subsystems (2)
lore
Share & tools
lore

Emily Deng

author
#0 lore raw

PATCH 1/1 drm/amdgpu: Need to disable msix when unloading driver

For driver reload test, it will report "can't enable MSI (MSI-X already enabled)".

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c +1 -1
index 6f3b03f..30d540d 100644
@@ -311,7 +311,7 @@ void amdgpu_irq_fini(struct amdgpu_device *adev)
 		drm_irq_uninstall(adev->ddev);
 		adev->irq.installed = false;
 		if (adev->irq.msi_enabled)
-			pci_disable_msi(adev->pdev);
+			pci_free_irq_vectors(adev->pdev);
 		if (!amdgpu_device_has_dc_support(adev))
 			flush_work(&adev->hotplug_work);
 	}
Signature · 6 lines
2.7.4

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): 1573021419-15518-1-git-send-email-Emily.Deng-5C7GfCeVMHo@public.gmane.org

#2 lore raw

Hi all,
Please help to review this. This is to fix driver reload issue.

Best wishes
Emily Deng

Quoted 29 lines

-----Original Message-----
From: Emily Deng <[email protected]>
Sent: Wednesday, November 6, 2019 2:24 PM
To: [email protected]
Cc: Deng, Emily <[email protected]>
Subject: [PATCH] drm/amdgpu: Need to disable msix when unloading driver

For driver reload test, it will report "can't enable MSI (MSI-X already enabled)".

---
drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 2 +-

1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c +1 -2
index 6f3b03f..30d540d 100644
@@ -311,7 +311,7 @@ void amdgpu_irq_fini(struct amdgpu_device *adev)
 		drm_irq_uninstall(adev->ddev);
 		adev->irq.installed = false;
 		if (adev->irq.msi_enabled)
-			pci_disable_msi(adev->pdev);
+			pci_free_irq_vectors(adev->pdev);
 		if (!amdgpu_device_has_dc_support(adev))
 			flush_work(&adev->hotplug_work);
 	}
--
Quoted 1 line

2.7.4

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): MN2PR12MB2975A3DFE6CCED7BB3D6D2748F790-rweVpJHSKToFlvJWC7EAqwdYzm3356FpvxpqHgZTriW3zl9H0oFU5g@public.gmane.org

#4 lore raw

Not an expert on the PCI IRQ stuff, but from what I know that looks correct to me.

Only question I can see is why don't we use pci_alloc_irq_vectors()? Alex probably needs to take a look.

Regards,
Christian.

Am 06.11.19 um 07:28 schrieb Deng, Emily:

Quoted 33 lines

Hi all,
Please help to review this. This is to fix driver reload issue.

Best wishes
Emily Deng

Quoted 26 lines

-----Original Message-----
From: Emily Deng <[email protected]>
Sent: Wednesday, November 6, 2019 2:24 PM
To: [email protected]
Cc: Deng, Emily <[email protected]>
Subject: [PATCH] drm/amdgpu: Need to disable msix when unloading driver

For driver reload test, it will report "can't enable MSI (MSI-X already enabled)".

---
drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 2 +-

1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c +1 -1
index 6f3b03f..30d540d 100644
@@ -311,7 +311,7 @@ void amdgpu_irq_fini(struct amdgpu_device *adev)
 		drm_irq_uninstall(adev->ddev);
 		adev->irq.installed = false;
 		if (adev->irq.msi_enabled)
-			pci_disable_msi(adev->pdev);
+			pci_free_irq_vectors(adev->pdev);
 		if (!amdgpu_device_has_dc_support(adev))
Quoted 8 lines
Quoted 4 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c +0 -1
 			flush_work(&adev->hotplug_work);
 	}
--

2.7.4

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): 6be1e7b9-13a9-f382-ef66-00c284a14a14-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org

#6 lore raw

Hi Christian,
We use " pci_alloc_irq_vectors " in amdgpu_irq_init. This patch use " pci_free_irq_vectors " in amdgpu_irq_fini.

Hi Alex,
Could you help to review this?

Best wishes
Emily Deng

Quoted 32 lines

-----Original Message-----
From: Christian König <[email protected]>
Sent: Wednesday, November 6, 2019 5:32 PM
To: Deng, Emily <[email protected]>; [email protected]
Subject: Re: [PATCH] drm/amdgpu: Need to disable msix when unloading driver

Not an expert on the PCI IRQ stuff, but from what I know that looks correct to me.

Only question I can see is why don't we use pci_alloc_irq_vectors()? Alex probably needs to take a look.

Regards,
Christian.

Am 06.11.19 um 07:28 schrieb Deng, Emily:

Quoted 15 lines

Hi all,
Please help to review this. This is to fix driver reload issue.

Best wishes
Emily Deng

Quoted 8 lines

-----Original Message-----
From: Emily Deng <[email protected]>
Sent: Wednesday, November 6, 2019 2:24 PM
To: [email protected]
Cc: Deng, Emily <[email protected]>
Subject: [PATCH] drm/amdgpu: Need to disable msix when unloading driver

Quoted 28 lines
Quoted 1 line
Quoted 1 line

For driver reload test, it will report "can't enable MSI (MSI-X already

enabled)".

Quoted 26 lines
Quoted 21 lines

---
drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 2 +-

1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c +1 -2
index 6f3b03f..30d540d 100644
@@ -311,7 +311,7 @@ void amdgpu_irq_fini(struct amdgpu_device *adev)
 		drm_irq_uninstall(adev->ddev);
 		adev->irq.installed = false;
 		if (adev->irq.msi_enabled)
-			pci_disable_msi(adev->pdev);
+			pci_free_irq_vectors(adev->pdev);
 		if (!amdgpu_device_has_dc_support(adev))
 			flush_work(&adev->hotplug_work);
 	}
--
Quoted 1 line

2.7.4

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): MN2PR12MB297565CEDAAF6460C71F98F28F790-rweVpJHSKToFlvJWC7EAqwdYzm3356FpvxpqHgZTriW3zl9H0oFU5g@public.gmane.org

Reviewed-by
#8 lore raw

________________________________
From: Deng, Emily <[email protected]>
Sent: Wednesday, November 6, 2019 5:09 AM
To: Koenig, Christian <[email protected]>; [email protected] <[email protected]>; Deucher, Alexander <[email protected]>
Subject: RE: [PATCH] drm/amdgpu: Need to disable msix when unloading driver

Hi Christian,
We use " pci_alloc_irq_vectors " in amdgpu_irq_init. This patch use " pci_free_irq_vectors " in amdgpu_irq_fini.

Hi Alex,
Could you help to review this?

Best wishes
Emily Deng

Quoted 32 lines

-----Original Message-----
From: Christian König <[email protected]>
Sent: Wednesday, November 6, 2019 5:32 PM
To: Deng, Emily <[email protected]>; [email protected]
Subject: Re: [PATCH] drm/amdgpu: Need to disable msix when unloading
driver

Not an expert on the PCI IRQ stuff, but from what I know that looks correct to me.

Only question I can see is why don't we use pci_alloc_irq_vectors()? Alex probably needs to take a look.

Regards,
Christian.

Am 06.11.19 um 07:28 schrieb Deng, Emily:

Quoted 15 lines

Hi all,
Please help to review this. This is to fix driver reload issue.

Best wishes
Emily Deng

Quoted 8 lines

-----Original Message-----
From: Emily Deng <[email protected]>
Sent: Wednesday, November 6, 2019 2:24 PM
To: [email protected]
Cc: Deng, Emily <[email protected]>
Subject: [PATCH] drm/amdgpu: Need to disable msix when unloading driver

Quoted 28 lines
Quoted 1 line
Quoted 1 line

For driver reload test, it will report "can't enable MSI (MSI-X already

enabled)".

Quoted 26 lines
Quoted 21 lines

---
drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 2 +-

1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c +1 -2
index 6f3b03f..30d540d 100644
@@ -311,7 +311,7 @@ void amdgpu_irq_fini(struct amdgpu_device *adev)
             drm_irq_uninstall(adev->ddev);
             adev->irq.installed = false;
             if (adev->irq.msi_enabled)
-                   pci_disable_msi(adev->pdev);
+                   pci_free_irq_vectors(adev->pdev);
             if (!amdgpu_device_has_dc_support(adev))
                     flush_work(&adev->hotplug_work);
     }
--
Quoted 1 line

2.7.4

_______________________________________________
amd-gfx mailing list [email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx