提交 a0cccce2 编写于 作者: J Jacob Keller 提交者: Jeff Kirsher

ixgbe: avoid duplicate code in suspend and stop paths

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: NJakub Kicinski <kubakici@wp.pl>
Signed-off-by: NJacob Keller <jacob.e.keller@intel.com>
Tested-by: NPhil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: NJeff Kirsher <jeffrey.t.kirsher@intel.com>
上级 9966d1ee
...@@ -5659,6 +5659,17 @@ static int ixgbe_open(struct net_device *netdev) ...@@ -5659,6 +5659,17 @@ static int ixgbe_open(struct net_device *netdev)
return err; 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 * ixgbe_close - Disables a network interface
* @netdev: network interface device structure * @netdev: network interface device structure
...@@ -5676,14 +5687,10 @@ static int ixgbe_close(struct net_device *netdev) ...@@ -5676,14 +5687,10 @@ static int ixgbe_close(struct net_device *netdev)
ixgbe_ptp_stop(adapter); ixgbe_ptp_stop(adapter);
ixgbe_down(adapter); ixgbe_close_suspend(adapter);
ixgbe_free_irq(adapter);
ixgbe_fdir_filter_exit(adapter); ixgbe_fdir_filter_exit(adapter);
ixgbe_free_all_tx_resources(adapter);
ixgbe_free_all_rx_resources(adapter);
ixgbe_release_hw_control(adapter); ixgbe_release_hw_control(adapter);
return 0; return 0;
...@@ -5750,12 +5757,8 @@ static int __ixgbe_shutdown(struct pci_dev *pdev, bool *enable_wake) ...@@ -5750,12 +5757,8 @@ static int __ixgbe_shutdown(struct pci_dev *pdev, bool *enable_wake)
netif_device_detach(netdev); netif_device_detach(netdev);
rtnl_lock(); rtnl_lock();
if (netif_running(netdev)) { if (netif_running(netdev))
ixgbe_down(adapter); ixgbe_close_suspend(adapter);
ixgbe_free_irq(adapter);
ixgbe_free_all_tx_resources(adapter);
ixgbe_free_all_rx_resources(adapter);
}
rtnl_unlock(); rtnl_unlock();
ixgbe_clear_interrupt_scheme(adapter); ixgbe_clear_interrupt_scheme(adapter);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册