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

Commit ae52cf80 authored by Sasha Neftin's avatar Sasha Neftin Committed by Greg Kroah-Hartman
Browse files

igc: Remove _I_PHY_ID checking 



commit 7c496de538eebd8212dc2a3c9a468386b264d0d4 upstream.

i225 devices have only one PHY vendor. There is no point checking
_I_PHY_ID during the link establishment and auto-negotiation process.
This patch comes to clean up these pointless checkings.

Signed-off-by: default avatarSasha Neftin <sasha.neftin@intel.com>
Tested-by: default avatarDvora Fuxbrumer <dvorax.fuxbrumer@linux.intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
Cc: Linjun Bao <meljbao@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 05e0bb8c

drivers/net/ethernet/intel/igc/igc_base.c

+1 −9
Original line number Diff line number Diff line
@@ -187,15 +187,7 @@ static s32 igc_init_phy_params_base(struct igc_hw *hw) 


	igc_check_for_copper_link(hw);



	/* Verify phy id and set remaining function pointers */

	switch (phy->id) {

	case I225_I_PHY_ID:

	phy->type = igc_phy_i225;

		break;

	default:

		ret_val = -IGC_ERR_PHY;

		goto out;

	}



out:

	return ret_val;

drivers/net/ethernet/intel/igc/igc_main.c

+1 −2
Original line number Diff line number Diff line
@@ -2884,8 +2884,7 @@ bool igc_has_link(struct igc_adapter *adapter) 
		break;

	}



	if (hw->mac.type == igc_i225 &&

	    hw->phy.id == I225_I_PHY_ID) {

	if (hw->mac.type == igc_i225) {

		if (!netif_carrier_ok(adapter->netdev)) {

			adapter->flags &= ~IGC_FLAG_NEED_LINK_UPDATE;

		} else if (!(adapter->flags & IGC_FLAG_NEED_LINK_UPDATE)) {

drivers/net/ethernet/intel/igc/igc_phy.c

+2 −4
Original line number Diff line number Diff line
@@ -235,8 +235,7 @@ static s32 igc_phy_setup_autoneg(struct igc_hw *hw) 
			return ret_val;

	}



	if ((phy->autoneg_mask & ADVERTISE_2500_FULL) &&

	    hw->phy.id == I225_I_PHY_ID) {

	if (phy->autoneg_mask & ADVERTISE_2500_FULL) {

		/* Read the MULTI GBT AN Control Register - reg 7.32 */

		ret_val = phy->ops.read_reg(hw, (STANDARD_AN_REG_MASK <<

					    MMD_DEVADDR_SHIFT) |
@@ -376,8 +375,7 @@ static s32 igc_phy_setup_autoneg(struct igc_hw *hw) 
		ret_val = phy->ops.write_reg(hw, PHY_1000T_CTRL,

					     mii_1000t_ctrl_reg);



	if ((phy->autoneg_mask & ADVERTISE_2500_FULL) &&

	    hw->phy.id == I225_I_PHY_ID)

	if (phy->autoneg_mask & ADVERTISE_2500_FULL)

		ret_val = phy->ops.write_reg(hw,

					     (STANDARD_AN_REG_MASK <<

					     MMD_DEVADDR_SHIFT) |