From f07b21bd988483d987f5058b61e507b7abceba8f Mon Sep 17 00:00:00 2001 From: Brian Maly Date: Wed, 7 Oct 2015 16:16:24 -0400 Subject: [PATCH] ixgbe: do not set low power mode Orabug: 21823210 The following commit added the capability of entering low power mode: ixgbe: Add a PHY power state method This works fine with newer drivers that support this capability, however older drivers that dont support this encounter a regression as they are not able to restore power mode at boot when the driver loads. This regression is encountered when booting a newer kernel/driver that supports low power mode, then doing a warm reboot to an older kernel or other OS like FreeBSD that do not know how to restore the power mode. In this case a cold reboot is required to restore power mode. Signed-off-by: Brian Maly --- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c index 236716667730..4a485ec173f0 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c @@ -5020,9 +5020,7 @@ void ixgbe_reset(struct ixgbe_adapter *adapter) ixgbe_ptp_reset(adapter); if (hw->phy.ops.set_phy_power) { - if (!netif_running(adapter->netdev) && !adapter->wol) - hw->phy.ops.set_phy_power(hw, false); - else + if (netif_running(adapter->netdev) && adapter->wol) hw->phy.ops.set_phy_power(hw, true); } } @@ -5763,8 +5761,6 @@ err_set_queues: ixgbe_free_irq(adapter); err_req_irq: ixgbe_free_all_rx_resources(adapter); - if (hw->phy.ops.set_phy_power && !adapter->wol) - hw->phy.ops.set_phy_power(&adapter->hw, false); err_setup_rx: ixgbe_free_all_tx_resources(adapter); err_setup_tx: @@ -5925,8 +5921,6 @@ static int __ixgbe_shutdown(struct pci_dev *pdev, bool *enable_wake) } *enable_wake = !!wufc; - if (hw->phy.ops.set_phy_power && !*enable_wake) - hw->phy.ops.set_phy_power(hw, false); ixgbe_release_hw_control(adapter); -- 2.50.1