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

Commit 7e49d616 authored by Don Skidmore's avatar Don Skidmore Committed by Jeff Kirsher
Browse files

ixgbe: Set lan_id before using I2C 



We need to call the set_lan_id before accessing I2C and this wasn't
being done so this patch corrects that.  Likewise we do the same for
QSFP just to be consistent.

In the X550 case this is even more important as with out it the mux
is not controlled properly.

Signed-off-by: default avatarDon Skidmore <donald.c.skidmore@intel.com>
Tested-by: default avatarKrishneil Singh <krishneil.k.singh@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent a4e293a5

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

+3 −3
Original line number Diff line number Diff line
@@ -1352,6 +1352,9 @@ static s32 ixgbe_identify_qsfp_module_generic(struct ixgbe_hw *hw) 
		return IXGBE_ERR_SFP_NOT_PRESENT;

	}



	/* LAN ID is needed for sfp_type determination */

	hw->mac.ops.set_lan_id(hw);



	status = hw->phy.ops.read_i2c_eeprom(hw, IXGBE_SFF_IDENTIFIER,

					     &identifier);
@@ -1365,9 +1368,6 @@ static s32 ixgbe_identify_qsfp_module_generic(struct ixgbe_hw *hw) 


	hw->phy.id = identifier;



	/* LAN ID is needed for sfp_type determination */

	hw->mac.ops.set_lan_id(hw);



	status = hw->phy.ops.read_i2c_eeprom(hw, IXGBE_SFF_QSFP_10GBE_COMP,

					     &comp_codes_10g);

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

+2 −0
Original line number Diff line number Diff line
@@ -1457,6 +1457,8 @@ static s32 ixgbe_init_phy_ops_X550em(struct ixgbe_hw *hw) 
	ixgbe_link_speed speed;

	s32 ret_val;



	hw->mac.ops.set_lan_id(hw);



	if (hw->mac.ops.get_media_type(hw) == ixgbe_media_type_fiber) {

		phy->phy_semaphore_mask = IXGBE_GSSR_SHARED_I2C_SM;

		ixgbe_setup_mux_ctl(hw);