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 <brian.maly@oracle.com>

diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index 236716667730c053a66ea7427052217bcf6b6ad9..4a485ec173f062e6de980ff4ab9ab5f2ee4349d9 100644 (file)
--- 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);