[Public] Please fix the // comment style before submitting and modify commit message as 'VF FLR'
Reviewed-by: Lijo Lazar <[email protected]> -----Original Message----- From: amd-gfx <[email protected]> On Behalf Of Peng Ju Zhou Sent: Wednesday, July 7, 2021 10:47 AM To: [email protected] Cc: Deng, Emily <[email protected]> Subject: [PATCH v5] drm/amdgpu: Restore msix after FLR From: "Emily.Deng" <[email protected]> After FLR, the msix will be cleared, so need to re-enable it. Signed-off-by: Emily.Deng <[email protected]> Signed-off-by: Peng Ju Zhou <[email protected]> --- drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c index 90f50561b43a..dbc0e5bb203d 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c @@ -277,6 +277,21 @@ static bool amdgpu_msi_ok(struct amdgpu_device *adev) return true; } +static void amdgpu_restore_msix(struct amdgpu_device *adev) { + u16 ctrl; + + pci_read_config_word(adev->pdev, adev->pdev->msix_cap + PCI_MSIX_FLAGS, &ctrl); + if (!(ctrl & PCI_MSIX_FLAGS_ENABLE)) + return; + + // re-set MSIX when VF FLR if VF MSIX enabled. + ctrl &= ~PCI_MSIX_FLAGS_ENABLE; + pci_write_config_word(adev->pdev, adev->pdev->msix_cap + PCI_MSIX_FLAGS, ctrl); + ctrl |= PCI_MSIX_FLAGS_ENABLE; + pci_write_config_word(adev->pdev, adev->pdev->msix_cap + +PCI_MSIX_FLAGS, ctrl); } + /** * amdgpu_irq_init - initialize interrupt handling * @@ -558,6 +573,9 @@ void amdgpu_irq_gpu_reset_resume_helper(struct amdgpu_device *adev) { int i, j, k; + if (amdgpu_sriov_vf(adev)) + amdgpu_restore_msix(adev); + for (i = 0; i < AMDGPU_IRQ_CLIENTID_MAX; ++i) { if (!adev->irq.client[i].sources) continue; -- 2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=04%7C01%7Clijo.lazar%40amd.com%7C8ebf5732b5944fc4749708d941067351%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637612318247594022%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=DVF94WDoFExFyt31rGSRBMZ00gI1FJZPiSduOWXnfA0%3D&reserved=0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
