Implement PCI device reset handler to allow the network device to get re-initialized and function after a PCI-level reset.
Signed-off-by: Sergey Temerkhanov <[email protected]> Reviewed-by: Aleksandr Loktionov <[email protected]> --- drivers/net/ethernet/intel/ixgbe/ixgbe.h | 1 + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 72 +++++++++++++++++++ 2 files changed, 73 insertions(+) diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe.h b/drivers/net/ethernet/intel/ixgbe/ixgbe.h index 594ccb28da20..c4b0c5bb89c6 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe.h +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe.h @@ -912,6 +912,7 @@ enum ixgbe_state_t { __IXGBE_PTP_TX_IN_PROGRESS, __IXGBE_RESET_REQUESTED, __IXGBE_PHY_INIT_COMPLETE, + __IXGBE_PCIE_RESET_IN_PROGRESS, }; struct ixgbe_cb { diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c index 2ac274c73d61..a61ee5fff7be 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c @@ -12352,6 +12352,76 @@ static pci_ers_result_t ixgbe_io_slot_reset(struct pci_dev *pdev) return result; } +#define IXGBE_PCIE_RESET_RETRIES 1000 + +/** + * ixgbe_reset_prep - called before the pci bus is reset. + * @pdev: Pointer to PCI device + * + * Prepare the card for a reset, preventing the service task from running. + */ +static void ixgbe_reset_prep(struct pci_dev *pdev) +{ + struct ixgbe_adapter *adapter = pci_get_drvdata(pdev); + unsigned int timeout = IXGBE_PCIE_RESET_RETRIES; + + if (!adapter) + return; + + /* Prevent the service task from being requeued in the timer callback + * while we're resetting. + */ + if (test_bit(__IXGBE_SERVICE_INITED, &adapter->state)) { + timer_delete_sync(&adapter->service_timer); + /* Prevent the service task from running while we're resetting. */ + cancel_work_sync(&adapter->service_task); + } + + pci_clear_master(pdev); + + while (test_and_set_bit(__IXGBE_RESETTING, &adapter->state) && --timeout) + usleep_range(1000, 2000); + + if (!timeout) { + e_err(drv, "Timed out waiting for __IXGBE_RESETTING to be released. Reset is needed\n"); + pci_set_master(pdev); + return; + } + + set_bit(__IXGBE_PCIE_RESET_IN_PROGRESS, &adapter->state); + smp_mb__after_atomic(); +} + +/** + * ixgbe_reset_done - called after the pci bus has been reset. + * @pdev: Pointer to PCI device + * + * Allow the service task to run and schedule re-initialization. + */ +static void ixgbe_reset_done(struct pci_dev *pdev) +{ + struct ixgbe_adapter *adapter = pci_get_drvdata(pdev); + + smp_mb__before_atomic(); + if (!test_and_clear_bit(__IXGBE_PCIE_RESET_IN_PROGRESS, &adapter->state)) { + e_err(drv, "Reset done called without PCIe reset in progress\n"); + return; + } + + /* Allow the service task to run */ + if (!test_bit(__IXGBE_REMOVING, &adapter->state)) { + clear_bit(__IXGBE_RESETTING, &adapter->state); + smp_mb__after_atomic(); + } + + /* Schedule re-initialization */ + if (!test_bit(__IXGBE_DOWN, &adapter->state)) { + set_bit(__IXGBE_RESET_REQUESTED, &adapter->state); + if (test_bit(__IXGBE_SERVICE_INITED, &adapter->state)) + mod_timer(&adapter->service_timer, jiffies + 1); + } +} + /** * ixgbe_io_resume - called when traffic can start flowing again. * @pdev: Pointer to PCI device @@ -12384,6 +12454,8 @@ static const struct pci_error_handlers ixgbe_err_handler = { .error_detected = ixgbe_io_error_detected, .slot_reset = ixgbe_io_slot_reset, .resume = ixgbe_io_resume, + .reset_prepare = ixgbe_reset_prep, + .reset_done = ixgbe_reset_done, }; static DEFINE_SIMPLE_DEV_PM_OPS(ixgbe_pm_ops, ixgbe_suspend, ixgbe_resume); base-commit: c50bfa9768ff3a5163746c6362a8a910a0b4dca0 -- 2.53.0
