Skip to content

Commit

Permalink
ixgbe: avoid duplicate code in suspend and stop paths
Browse files Browse the repository at this point in the history
Resume path calls .open but suspend path cannot call .stop because
fdirs should not be freed and control over hardware should not be
released until WoL is configured.  To avoid having to duplicate all
changes made in .stop on suspend path split out part of .stop that
is relevant during suspend and call it from .stop and during suspend.

This fix also ensures that ixgbe_ptp_suspend is called during the
suspend path, and helps avoid similar errors. We can't call
ixgbe_ptp_stop, since it will free the PTP clock device, which we
shouldn't be doing during a suspend path.

Signed-off-by: Jakub Kicinski <kubakici@wp.pl>
Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
  • Loading branch information
Jacob Keller authored and Jeff Kirsher committed May 27, 2014
1 parent 9966d1e commit a0cccce
Showing 1 changed file with 14 additions and 11 deletions.
25 changes: 14 additions & 11 deletions drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -5659,6 +5659,17 @@ static int ixgbe_open(struct net_device *netdev)
return err;
}

static void ixgbe_close_suspend(struct ixgbe_adapter *adapter)
{
ixgbe_ptp_suspend(adapter);

ixgbe_down(adapter);
ixgbe_free_irq(adapter);

ixgbe_free_all_tx_resources(adapter);
ixgbe_free_all_rx_resources(adapter);
}

/**
* ixgbe_close - Disables a network interface
* @netdev: network interface device structure
Expand All @@ -5676,14 +5687,10 @@ static int ixgbe_close(struct net_device *netdev)

ixgbe_ptp_stop(adapter);

ixgbe_down(adapter);
ixgbe_free_irq(adapter);
ixgbe_close_suspend(adapter);

ixgbe_fdir_filter_exit(adapter);

ixgbe_free_all_tx_resources(adapter);
ixgbe_free_all_rx_resources(adapter);

ixgbe_release_hw_control(adapter);

return 0;
Expand Down Expand Up @@ -5750,12 +5757,8 @@ static int __ixgbe_shutdown(struct pci_dev *pdev, bool *enable_wake)
netif_device_detach(netdev);

rtnl_lock();
if (netif_running(netdev)) {
ixgbe_down(adapter);
ixgbe_free_irq(adapter);
ixgbe_free_all_tx_resources(adapter);
ixgbe_free_all_rx_resources(adapter);
}
if (netif_running(netdev))
ixgbe_close_suspend(adapter);
rtnl_unlock();

ixgbe_clear_interrupt_scheme(adapter);
Expand Down

0 comments on commit a0cccce

Please sign in to comment.