56 lines
2.1 KiB
Diff
56 lines
2.1 KiB
Diff
From: Bruce Allan <bruce.w.allan@intel.com>
|
|
Date: Wed, 22 Sep 2010 17:15:54 +0000 (+0000)
|
|
Subject: e1000e: 82566DC fails to get link
|
|
X-Git-Tag: v2.6.36-rc6~6^2~23
|
|
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=5f3eed6fe0e36e4b56c8dd9160241a868ee0de2a
|
|
|
|
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 e98cac447cc1cc418dff1d610a5c79c4f2bdec7f
|
|
[2] commit 3f0c16e84438d657d29446f85fe375794a93f159
|
|
|
|
CC: stable@kernel.org
|
|
Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
|
|
Tested-by: Jeff Pieper <jeffrey.e.pieper@intel.com>
|
|
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
---
|
|
|
|
diff --git a/drivers/net/e1000e/ich8lan.c b/drivers/net/e1000e/ich8lan.c
|
|
index fc8c3ce..6f9cb0d 100644
|
|
--- a/drivers/net/e1000e/ich8lan.c
|
|
+++ b/drivers/net/e1000e/ich8lan.c
|
|
@@ -932,7 +932,6 @@ out:
|
|
**/
|
|
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:
|