Skip to contentSkip to conversation

ixgbe: Set lan_id before using I2C

PATCH New Don Skidmore 1 participant 1 message Jun 5, 2015

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
 drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c  |    6 +++---
 drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c |    2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)
drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c +3 -3
index ac6c0af..526a20b 100644
@@ -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
index 0736513..7b5b48e 100644
@@ -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);