Commit f2e2b3ab authored Jun 17, 2010 by Bruce Allan Committed by David S. Miller Jun 23, 2010

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

parent 0c6bdb30

drivers/net/e1000e/netdev.c

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -3184,8 +3184,6 @@ void e1000e_reset(struct e1000_adapter *adapter)
	e1000_get_hw_control(adapter);		e1000_get_hw_control(adapter);

	ew32(WUC, 0);		ew32(WUC, 0);
	if (adapter->flags2 & FLAG2_HAS_PHY_WAKEUP)
	e1e_wphy(&adapter->hw, BM_WUC, 0);

	if (mac->ops.init_hw(hw))		if (mac->ops.init_hw(hw))
	e_err("Hardware Error\n");		e_err("Hardware Error\n");