mirror of https://gitee.com/openkylin/linux.git
[PATCH] e1000: Fix Wake-on-Lan with forced gigabit speed
If the user has forced gigabit speed, phy power management must be disabled; otherwise the NIC would try to negotiate to a linkspeed of 10/100 mbit on shutdown, which would lead to a total loss of link. This loss of link breaks Wake-on-Lan and IPMI. Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com> Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com> Signed-off-by: Arjan van de Ven <arjan@linux.intel.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
parent
0fccd0e9e3
commit
3d5460a0ba
|
@ -732,6 +732,20 @@ e1000_reset(struct e1000_adapter *adapter)
|
|||
if (e1000_init_hw(&adapter->hw))
|
||||
DPRINTK(PROBE, ERR, "Hardware Error\n");
|
||||
e1000_update_mng_vlan(adapter);
|
||||
|
||||
/* if (adapter->hwflags & HWFLAGS_PHY_PWR_BIT) { */
|
||||
if (adapter->hw.mac_type >= e1000_82544 &&
|
||||
adapter->hw.mac_type <= e1000_82547_rev_2 &&
|
||||
adapter->hw.autoneg == 1 &&
|
||||
adapter->hw.autoneg_advertised == ADVERTISE_1000_FULL) {
|
||||
uint32_t ctrl = E1000_READ_REG(&adapter->hw, CTRL);
|
||||
/* clear phy power management bit if we are in gig only mode,
|
||||
* which if enabled will attempt negotiation to 100Mb, which
|
||||
* can cause a loss of link at power off or driver unload */
|
||||
ctrl &= ~E1000_CTRL_SWDPIN3;
|
||||
E1000_WRITE_REG(&adapter->hw, CTRL, ctrl);
|
||||
}
|
||||
|
||||
/* Enable h/w to recognize an 802.1Q VLAN Ethernet packet */
|
||||
E1000_WRITE_REG(&adapter->hw, VET, ETHERNET_IEEE_VLAN_TYPE);
|
||||
|
||||
|
|
Loading…
Reference in New Issue