From: Bruce Allan Date: Thu, 17 Jun 2010 18:59:06 +0000 (+0000) Subject: e1000e: do not touch PHY page 800 registers when link speed is 1000Mbps X-Git-Tag: v2.6.36-rc1~571^2~517 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f2e2b3abe4f491130cfda814a8547783b08f10c2;p=profile%2Fivi%2Fkernel-x86-ivi.git e1000e: do not touch PHY page 800 registers when link speed is 1000Mbps The PHY on 82577/82578 has issues when the registers on page 800 are accessed when in gigabit mode. Do not clear the Wakeup Control register when resetting the part since it is on page 800 (and will be cleared on reset anyway). Signed-off-by: Bruce Allan Tested-by: Jeff Pieper Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller --- diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c index 2a71889..aa14976 100644 --- a/drivers/net/e1000e/netdev.c +++ b/drivers/net/e1000e/netdev.c @@ -3184,8 +3184,6 @@ void e1000e_reset(struct e1000_adapter *adapter) e1000_get_hw_control(adapter); ew32(WUC, 0); - if (adapter->flags2 & FLAG2_HAS_PHY_WAKEUP) - e1e_wphy(&adapter->hw, BM_WUC, 0); if (mac->ops.init_hw(hw)) e_err("Hardware Error\n");