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

Commit ea8179a7 authored by Bruce Allan's avatar Bruce Allan Committed by Jeff Kirsher
Browse files

e1000e: long access timeouts when I217/I218 MAC and PHY are out of sync 



When the MAC and PHY are in two different modes (different power levels
and interconnect speeds), it could take a long time before a PHY register
access timed out using the existing MAC-PHY interconnect configuration
coded into the driver for ICH- and PCH-based LOMs.  Introduce an I217/I218-
specific .setup_physical_interface operation which does not override the
interconnect configuration in the NVM.

Signed-off-by: default avatarBruce Allan <bruce.w.allan@intel.com>
Tested-by: default avatarJeff Pieper <jeffrey.e.pieper@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 86a80eab

drivers/net/ethernet/intel/e1000e/ich8lan.c

+28 −1
Original line number Diff line number Diff line
@@ -142,6 +142,7 @@ static void e1000_rar_set_pch2lan(struct e1000_hw *hw, u8 *addr, u32 index); 
static void e1000_rar_set_pch_lpt(struct e1000_hw *hw, u8 *addr, u32 index);

static s32 e1000_k1_workaround_lv(struct e1000_hw *hw);

static void e1000_gate_hw_phy_config_ich8lan(struct e1000_hw *hw, bool gate);

static s32 e1000_setup_copper_link_pch_lpt(struct e1000_hw *hw);



static inline u16 __er16flash(struct e1000_hw *hw, unsigned long reg)

{
@@ -636,6 +637,8 @@ static s32 e1000_init_mac_params_ich8lan(struct e1000_hw *hw) 
	if (mac->type == e1000_pch_lpt) {

		mac->rar_entry_count = E1000_PCH_LPT_RAR_ENTRIES;

		mac->ops.rar_set = e1000_rar_set_pch_lpt;

		mac->ops.setup_physical_interface =

		    e1000_setup_copper_link_pch_lpt;

	}



	/* Enable PCS Lock-loss workaround for ICH8 */
@@ -3788,7 +3791,6 @@ static s32 e1000_setup_copper_link_ich8lan(struct e1000_hw *hw) 
		break;

	case e1000_phy_82577:

	case e1000_phy_82579:

	case e1000_phy_i217:

		ret_val = e1000_copper_link_setup_82577(hw);

		if (ret_val)

			return ret_val;
@@ -3823,6 +3825,31 @@ static s32 e1000_setup_copper_link_ich8lan(struct e1000_hw *hw) 
	return e1000e_setup_copper_link(hw);

}



/**

 *  e1000_setup_copper_link_pch_lpt - Configure MAC/PHY interface

 *  @hw: pointer to the HW structure

 *

 *  Calls the PHY specific link setup function and then calls the

 *  generic setup_copper_link to finish configuring the link for

 *  Lynxpoint PCH devices

 **/

static s32 e1000_setup_copper_link_pch_lpt(struct e1000_hw *hw)

{

	u32 ctrl;

	s32 ret_val;



	ctrl = er32(CTRL);

	ctrl |= E1000_CTRL_SLU;

	ctrl &= ~(E1000_CTRL_FRCSPD | E1000_CTRL_FRCDPX);

	ew32(CTRL, ctrl);



	ret_val = e1000_copper_link_setup_82577(hw);

	if (ret_val)

		return ret_val;



	return e1000e_setup_copper_link(hw);

}



/**

 *  e1000_get_link_up_info_ich8lan - Get current link speed and duplex

 *  @hw: pointer to the HW structure