diff options
author | Bruce Allan <bruce.w.allan@intel.com> | 2009-11-20 18:24:11 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-11-21 14:33:58 -0500 |
commit | bb436b20fe0ea4231a233aae7f0f7de3a3f2f5c3 (patch) | |
tree | 168d6084a2d2352c7236d13a4b2d9b1db37051d3 /drivers/net/e1000e/ich8lan.c | |
parent | 98086a954a75152f8b09c131fa443205bae5fde1 (diff) |
e1000e: disable K1 on PCH LOM when in PHY loopback mode
When performing the ethtool PHY loopback test on PCH-based LOMs (82577 and
82578), disable K1 (a MAC-PHY interconnect low power mode) otherwise
packets might get corrupted.
Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/e1000e/ich8lan.c')
-rw-r--r-- | drivers/net/e1000e/ich8lan.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/e1000e/ich8lan.c b/drivers/net/e1000e/ich8lan.c index 51ddb04ab195..bd9002e72cb6 100644 --- a/drivers/net/e1000e/ich8lan.c +++ b/drivers/net/e1000e/ich8lan.c | |||
@@ -224,7 +224,6 @@ static s32 e1000_led_off_pchlan(struct e1000_hw *hw); | |||
224 | static s32 e1000_set_lplu_state_pchlan(struct e1000_hw *hw, bool active); | 224 | static s32 e1000_set_lplu_state_pchlan(struct e1000_hw *hw, bool active); |
225 | static void e1000_lan_init_done_ich8lan(struct e1000_hw *hw); | 225 | static void e1000_lan_init_done_ich8lan(struct e1000_hw *hw); |
226 | static s32 e1000_k1_gig_workaround_hv(struct e1000_hw *hw, bool link); | 226 | static s32 e1000_k1_gig_workaround_hv(struct e1000_hw *hw, bool link); |
227 | static s32 e1000_configure_k1_ich8lan(struct e1000_hw *hw, bool k1_enable); | ||
228 | 227 | ||
229 | static inline u16 __er16flash(struct e1000_hw *hw, unsigned long reg) | 228 | static inline u16 __er16flash(struct e1000_hw *hw, unsigned long reg) |
230 | { | 229 | { |
@@ -1023,7 +1022,7 @@ out: | |||
1023 | * | 1022 | * |
1024 | * Success returns 0, Failure returns -E1000_ERR_PHY (-2) | 1023 | * Success returns 0, Failure returns -E1000_ERR_PHY (-2) |
1025 | **/ | 1024 | **/ |
1026 | static s32 e1000_configure_k1_ich8lan(struct e1000_hw *hw, bool k1_enable) | 1025 | s32 e1000_configure_k1_ich8lan(struct e1000_hw *hw, bool k1_enable) |
1027 | { | 1026 | { |
1028 | s32 ret_val = 0; | 1027 | s32 ret_val = 0; |
1029 | u32 ctrl_reg = 0; | 1028 | u32 ctrl_reg = 0; |