Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3c2f2b77 authored by Mark Rustad's avatar Mark Rustad Committed by Jeff Kirsher
Browse files

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: default avatarMark Rustad <mark.d.rustad@intel.com>
Tested-by: default avatarPhil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 36a92d71

drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c

+3 −0
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -57,7 +57,6 @@ 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;



	mac->mcft_size = IXGBE_X540_MC_TBL_SIZE;