[Intel-wired-lan] [PATCH] ixgbe: fix AER error handling

Emil Tantilov emil.s.tantilov at intel.com
Wed Nov 16 17:48:02 UTC 2016

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 inerrupts were not freed.

Signed-off-by: Emil Tantilov <emil.s.tantilov at intel.com>
 drivers/net/ethernet/intel/ixgbe/ixgbe_main.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index 6d049d7..e545155 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -10078,7 +10078,7 @@ static pci_ers_result_t ixgbe_io_error_detected(struct pci_dev *pdev,
 	if (netif_running(netdev))
-		ixgbe_down(adapter);
+		ixgbe_close_suspend(adapter);
 	if (!test_and_set_bit(__IXGBE_DISABLED, &adapter->state))
@@ -10148,10 +10148,12 @@ static void ixgbe_io_resume(struct pci_dev *pdev)
+	rtnl_lock();
 	if (netif_running(netdev))
-		ixgbe_up(adapter);
+		ixgbe_open(netdev);
+	rtnl_unlock();
 static const struct pci_error_handlers ixgbe_err_handler = {

More information about the Intel-wired-lan mailing list