iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ixgbe: fix AER error handling

Browse Source 
[ Upstream commit 126db13fa0 ]

Make sure that we free the IRQs in ixgbe_io_error_detected() when
responding to an PCIe AER error and also restore them when the
interface recovers from it.

Previously it was possible to trigger BUG_ON() check in free_msix_irqs()
in the case where we call ixgbe_remove() after a failed recovery from
AER error because the interrupts were not freed.

Signed-off-by: Emil Tantilov <emil.s.tantilov@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Emil Tantilov
2016-11-16 09:48:02 -08:00
committed by Greg Kroah-Hartman
parent 6c7999904f
commit 6a4ef8b6ce
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
View File

@ -10027,7 +10027,7 @@ skip_bad_vf_detection:
} }
if (netif_running(netdev)) if (netif_running(netdev))
ixgbe_down(adapter); ixgbe_close_suspend(adapter);
if (!test_and_set_bit(__IXGBE_DISABLED, &adapter->state)) if (!test_and_set_bit(__IXGBE_DISABLED, &adapter->state))
pci_disable_device(pdev); pci_disable_device(pdev);
@ -10097,10 +10097,12 @@ static void ixgbe_io_resume(struct pci_dev *pdev)
} }
#endif #endif
rtnl_lock();
if (netif_running(netdev)) if (netif_running(netdev))
ixgbe_up(adapter); ixgbe_open(netdev);
netif_device_attach(netdev); netif_device_attach(netdev);
rtnl_unlock();
} }
static const struct pci_error_handlers ixgbe_err_handler = { static const struct pci_error_handlers ixgbe_err_handler = {