lkml.org 
[lkml]   [2017]   [Nov]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL for-3.18 21/27] ixgbe: fix AER error handling
    Date
    From: Emil Tantilov <emil.s.tantilov@intel.com>

    [ Upstream commit 126db13fa0e6d05c9f94e0125f61e773bd5ab079 ]

    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>
    ---
    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 cc51554c9e99..f2b91915210e 100644
    --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
    +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
    @@ -8575,7 +8575,7 @@ skip_bad_vf_detection:
    }

    if (netif_running(netdev))
    - ixgbe_down(adapter);
    + ixgbe_close_suspend(adapter);

    if (!test_and_set_bit(__IXGBE_DISABLED, &adapter->state))
    pci_disable_device(pdev);
    @@ -8645,10 +8645,12 @@ static void ixgbe_io_resume(struct pci_dev *pdev)
    }

    #endif
    + rtnl_lock();
    if (netif_running(netdev))
    - ixgbe_up(adapter);
    + ixgbe_open(netdev);

    netif_device_attach(netdev);
    + rtnl_unlock();
    }

    static const struct pci_error_handlers ixgbe_err_handler = {
    --
    2.11.0
    \
     
     \ /
      Last update: 2017-11-08 21:59    [W:5.662 / U:0.248 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site