lisa/android_kernel_xiaomi_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

igc: Remove _I_PHY_ID checking

Browse Source 
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: Sasha Neftin <sasha.neftin@intel.com>
Tested-by: Dvora Fuxbrumer <dvorax.fuxbrumer@linux.intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
Cc: Linjun Bao <meljbao@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Sasha Neftin 2021-07-07 08:14:40 +03:00 committed by Greg Kroah-Hartman
parent 05e0bb8c3c
commit ae52cf801a
3 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/net/ethernet/intel/igc/igc_base.c
View File

@ -187,15 +187,7 @@ static s32 igc_init_phy_params_base(struct igc_hw *hw)
igc_check_for_copper_link(hw); igc_check_for_copper_link(hw);
/* Verify phy id and set remaining function pointers */ phy->type = igc_phy_i225;
switch (phy->id) {
case I225_I_PHY_ID:
phy->type = igc_phy_i225;
break;
default:
ret_val = -IGC_ERR_PHY;
goto out;
}
out: out:
return ret_val; return ret_val;

3
drivers/net/ethernet/intel/igc/igc_main.c
View File

@ -2884,8 +2884,7 @@ bool igc_has_link(struct igc_adapter *adapter)
break; break;
} }
if (hw->mac.type == igc_i225 && if (hw->mac.type == igc_i225) {
hw->phy.id == I225_I_PHY_ID) {
if (!netif_carrier_ok(adapter->netdev)) { if (!netif_carrier_ok(adapter->netdev)) {
adapter->flags &= ~IGC_FLAG_NEED_LINK_UPDATE; adapter->flags &= ~IGC_FLAG_NEED_LINK_UPDATE;
} else if (!(adapter->flags & IGC_FLAG_NEED_LINK_UPDATE)) { } else if (!(adapter->flags & IGC_FLAG_NEED_LINK_UPDATE)) {

6
drivers/net/ethernet/intel/igc/igc_phy.c
View File

@ -235,8 +235,7 @@ static s32 igc_phy_setup_autoneg(struct igc_hw *hw)
return ret_val; return ret_val;
} }
if ((phy->autoneg_mask & ADVERTISE_2500_FULL) && if (phy->autoneg_mask & ADVERTISE_2500_FULL) {
hw->phy.id == I225_I_PHY_ID) {
/* Read the MULTI GBT AN Control Register - reg 7.32 */ /* Read the MULTI GBT AN Control Register - reg 7.32 */
ret_val = phy->ops.read_reg(hw, (STANDARD_AN_REG_MASK << ret_val = phy->ops.read_reg(hw, (STANDARD_AN_REG_MASK <<
MMD_DEVADDR_SHIFT) | 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, ret_val = phy->ops.write_reg(hw, PHY_1000T_CTRL,
mii_1000t_ctrl_reg); mii_1000t_ctrl_reg);
if ((phy->autoneg_mask & ADVERTISE_2500_FULL) && if (phy->autoneg_mask & ADVERTISE_2500_FULL)
hw->phy.id == I225_I_PHY_ID)
ret_val = phy->ops.write_reg(hw, ret_val = phy->ops.write_reg(hw,
(STANDARD_AN_REG_MASK << (STANDARD_AN_REG_MASK <<
MMD_DEVADDR_SHIFT) | MMD_DEVADDR_SHIFT) |