Skip to content

Commit 7c9ae7f

Browse files
Carolyn WybornyJeff Kirsher
authored andcommitted
i40e: Fix for trace found with S4 state
This patch fixes a problem found in systems when entering S4 state. This patch fixes the problem by ensuring that the misc vector's IRQ is disabled as well. Without this patch a stack trace can be seen upon entering S4 state. Signed-off-by: Carolyn Wyborny <carolyn.wyborny@intel.com> Tested-by: Andrew Bowers <andrewx.bowers@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
1 parent db1a8f8 commit 7c9ae7f

File tree

1 file changed

+13
-1
lines changed

1 file changed

+13
-1
lines changed

drivers/net/ethernet/intel/i40e/i40e_main.c

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12089,7 +12089,10 @@ static int i40e_suspend(struct pci_dev *pdev, pm_message_t state)
1208912089
wr32(hw, I40E_PFPM_WUFC, (pf->wol_en ? I40E_PFPM_WUFC_MAG_MASK : 0));
1209012090

1209112091
i40e_stop_misc_vector(pf);
12092-
12092+
if (pf->msix_entries) {
12093+
synchronize_irq(pf->msix_entries[0].vector);
12094+
free_irq(pf->msix_entries[0].vector, pf);
12095+
}
1209312096
retval = pci_save_state(pdev);
1209412097
if (retval)
1209512098
return retval;
@@ -12129,6 +12132,15 @@ static int i40e_resume(struct pci_dev *pdev)
1212912132
/* handling the reset will rebuild the device state */
1213012133
if (test_and_clear_bit(__I40E_SUSPENDED, pf->state)) {
1213112134
clear_bit(__I40E_DOWN, pf->state);
12135+
if (pf->msix_entries) {
12136+
err = request_irq(pf->msix_entries[0].vector,
12137+
i40e_intr, 0, pf->int_name, pf);
12138+
if (err) {
12139+
dev_err(&pf->pdev->dev,
12140+
"request_irq for %s failed: %d\n",
12141+
pf->int_name, err);
12142+
}
12143+
}
1213212144
i40e_reset_and_rebuild(pf, false, false);
1213312145
}
1213412146

0 commit comments

Comments
 (0)