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

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

e1000e: WoL fails on device ID 0x1501 



PCI device ID 0x1501 has a hardware bug when the link downshifts for
whatever reason which requires a workaround.  The workaround already exists
for other similar devices but is not called for 0x1501 (it should be called
for any ICH8-based device that uses a GbE PHY).  There is also one other
instance when the workaround should be called - after disabling gigabit
speed when going to Sx.

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 03299e46

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

+6 −4
Original line number Diff line number Diff line
@@ -811,7 +811,7 @@ static s32 e1000_get_variants_ich8lan(struct e1000_adapter *adapter) 
	}



	if ((adapter->hw.mac.type == e1000_ich8lan) &&

	    (adapter->hw.phy.type == e1000_phy_igp_3))

	    (adapter->hw.phy.type != e1000_phy_ife))

		adapter->flags |= FLAG_LSC_GIG_SPEED_DROP;



	/* Enable workaround for 82579 w/ ME enabled */
@@ -3642,15 +3642,14 @@ void e1000e_igp3_phy_powerdown_workaround_ich8lan(struct e1000_hw *hw) 
 *  LPLU, Gig disable, MDIC PHY reset):

 *    1) Set Kumeran Near-end loopback

 *    2) Clear Kumeran Near-end loopback

 *  Should only be called for ICH8[m] devices with IGP_3 Phy.

 *  Should only be called for ICH8[m] devices with any 1G Phy.

 **/

void e1000e_gig_downshift_workaround_ich8lan(struct e1000_hw *hw)

{

	s32 ret_val;

	u16 reg_data;



	if ((hw->mac.type != e1000_ich8lan) ||

	    (hw->phy.type != e1000_phy_igp_3))

	if ((hw->mac.type != e1000_ich8lan) || (hw->phy.type == e1000_phy_ife))

		return;



	ret_val = e1000e_read_kmrn_reg(hw, E1000_KMRNCTRLSTA_DIAG_OFFSET,
@@ -3686,6 +3685,9 @@ void e1000_suspend_workarounds_ich8lan(struct e1000_hw *hw) 
	phy_ctrl |= E1000_PHY_CTRL_D0A_LPLU | E1000_PHY_CTRL_GBE_DISABLE;

	ew32(PHY_CTRL, phy_ctrl);



	if (hw->mac.type == e1000_ich8lan)

		e1000e_gig_downshift_workaround_ich8lan(hw);



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

		e1000_oem_bits_config_ich8lan(hw, false);

		e1000_phy_hw_reset_ich8lan(hw);