diff options
| author | Mark Rustad <mark.d.rustad@intel.com> | 2015-11-05 11:02:14 -0800 |
|---|---|---|
| committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2015-12-03 02:45:13 -0800 |
| commit | 3c2f2b77a917488b56b2676b99adb5d3c07d6e68 (patch) | |
| tree | b18a76952e7751f3a544750b5ea6b0406eca9e86 /drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c | |
| parent | 36a92d7190e68e9387347695fe4625eb2c9e7e1c (diff) | |
| download | op-kernel-dev-3c2f2b77a917488b56b2676b99adb5d3c07d6e68.zip op-kernel-dev-3c2f2b77a917488b56b2676b99adb5d3c07d6e68.tar.gz | |
ixgbe: Always turn PHY power on when requested
Instead of inhibiting PHY power control when manageability is
present, only inhibit turning PHY power off when manageability
is present. Consequently, PHY power will always be turned on when
requested. Without this patch, some systems with X540 or X550
devices in some conditions will never get link.
Signed-off-by: Mark Rustad <mark.d.rustad@intel.com>
Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c')
| -rw-r--r-- | drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c index fb8673d..db0731e 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c @@ -2393,6 +2393,9 @@ s32 ixgbe_set_copper_phy_power(struct ixgbe_hw *hw, bool on) if (hw->mac.ops.get_media_type(hw) != ixgbe_media_type_copper) return 0; + if (!on && ixgbe_mng_present(hw)) + return 0; + status = hw->phy.ops.read_reg(hw, IXGBE_MDIO_VENDOR_SPECIFIC_1_CONTROL, IXGBE_MDIO_VENDOR_SPECIFIC_1_DEV_TYPE, ®); |
