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

Commit 5c092749 authored by Tony Nguyen's avatar Tony Nguyen Committed by Jeff Kirsher
Browse files

ixgbe: Fix check for ixgbe_phy_x550em_ext_t reset 



The generic PHY reset check we had previously is not sufficient for the
ixgbe_phy_x550em_ext_t PHY type.  Check 1.CC02.0 instead - same as
ixgbe_init_ext_t_x550().

Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent cb8e0514

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

+21 −4
Original line number Diff line number Diff line
@@ -452,12 +452,29 @@ s32 ixgbe_reset_phy_generic(struct ixgbe_hw *hw) 
	 */

	for (i = 0; i < 30; i++) {

		msleep(100);

		hw->phy.ops.read_reg(hw, MDIO_CTRL1, MDIO_MMD_PHYXS, &ctrl);

		if (hw->phy.type == ixgbe_phy_x550em_ext_t) {

			status = hw->phy.ops.read_reg(hw,

						  IXGBE_MDIO_TX_VENDOR_ALARMS_3,

						  MDIO_MMD_PMAPMD, &ctrl);

			if (status)

				return status;



			if (ctrl & IXGBE_MDIO_TX_VENDOR_ALARMS_3_RST_MASK) {

				udelay(2);

				break;

			}

		} else {

			status = hw->phy.ops.read_reg(hw, MDIO_CTRL1,

						      MDIO_MMD_PHYXS, &ctrl);

			if (status)

				return status;



			if (!(ctrl & MDIO_CTRL1_RESET)) {

				udelay(2);

				break;

			}

		}

	}



	if (ctrl & MDIO_CTRL1_RESET) {

		hw_dbg(hw, "PHY reset polling failed to complete.\n");