Skip to contentSkip to conversation

ixgbe: Always turn phy power on when requested

PATCH New Mark D Rustad 2 participants 2 messages Nov 5, 2015 – Nov 20, 2015

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
 drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c  |    3 +++
 drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c |    3 +--
 2 files changed, 4 insertions(+), 2 deletions(-)
drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c +3 -0
index fb8673d63806..db0731e05401 100644
@@ -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,
 				      &reg);
drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c +1 -2
index e44952eeab00..2358c1b7d586 100644
@@ -57,8 +57,7 @@ s32 ixgbe_get_invariants_X540(struct ixgbe_hw *hw)
 	struct ixgbe_phy_info *phy = &hw->phy;
 
 	/* set_phy_power was set by default to NULL */
-	if (!ixgbe_mng_present(hw))
-		phy->ops.set_phy_power = ixgbe_set_copper_phy_power;
+	phy->ops.set_phy_power = ixgbe_set_copper_phy_power;
 
 	mac->mcft_size = IXGBE_X540_MC_TBL_SIZE;
 	mac->vft_size = IXGBE_X540_VFT_TBL_SIZE;
#1 lore raw

PATCH 1/1 ixgbe: Always turn phy power on when requested

Quoted 10 lines

-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at lists.osuosl.org] On Behalf Of Mark D Rustad
Sent: Thursday, November 05, 2015 11:02 AM
To: intel-wired-lan at lists.osuosl.org
Subject: [Intel-wired-lan] [PATCH] ixgbe: Always turn phy power on when requested

Quoted 6 lines

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.