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

Commit 5f3eed6f authored by Bruce Allan's avatar Bruce Allan Committed by David S. Miller
Browse files

e1000e: 82566DC fails to get link 



Two recent patches to cleanup the reset[1] and initial PHY configuration[2]
code paths for ICH/PCH devices inadvertently left out a 10msec delay and
device ID check respectively which are necessary for the 82566DC (device id
0x104b) to be configured properly, otherwise it will not get link.

[1] commit e98cac44
[2] commit 3f0c16e8

CC: stable@kernel.org
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>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 87fb7410

drivers/net/e1000e/ich8lan.c

+5 −2
Original line number Diff line number Diff line
@@ -932,7 +932,6 @@ static s32 e1000_write_smbus_addr(struct e1000_hw *hw) 
 **/

static s32 e1000_sw_lcd_config_ich8lan(struct e1000_hw *hw)

{

	struct e1000_adapter *adapter = hw->adapter;

	struct e1000_phy_info *phy = &hw->phy;

	u32 i, data, cnf_size, cnf_base_addr, sw_cfg_mask;

	s32 ret_val = 0;
@@ -950,7 +949,8 @@ static s32 e1000_sw_lcd_config_ich8lan(struct e1000_hw *hw) 
		if (phy->type != e1000_phy_igp_3)

			return ret_val;



		if (adapter->pdev->device == E1000_DEV_ID_ICH8_IGP_AMT) {

		if ((hw->adapter->pdev->device == E1000_DEV_ID_ICH8_IGP_AMT) ||

		    (hw->adapter->pdev->device == E1000_DEV_ID_ICH8_IGP_C)) {

			sw_cfg_mask = E1000_FEXTNVM_SW_CONFIG;

			break;

		}
@@ -1626,6 +1626,9 @@ static s32 e1000_post_phy_reset_ich8lan(struct e1000_hw *hw) 
	if (e1000_check_reset_block(hw))

		goto out;



	/* Allow time for h/w to get to quiescent state after reset */

	msleep(10);



	/* Perform any necessary post-reset workarounds */

	switch (hw->mac.type) {

	case e1000_pchlan: