e1000e: disable broken PHY wakeup for ICH10 LOMs, use MAC wakeup instead
When support for 82577/82578 was added[1] in 2.6.31, PHY wakeup was in-
advertently enabled (even though it does not function properly) on ICH10
LOMs. This patch makes it so that the ICH10 LOMs use MAC wakeup instead
as was done with the initial support for those devices (i.e. 82567LM-3,
82567LF-3 and 82567V-4).
[1] commit a4f58f5455
Reported-by: Aurelien Jarno <aurelien@aurel32.net>
Cc: <stable@kernel.org>
Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
This commit is contained in:
parent
9dc441f3c5
commit
4def99bbfd
|
@ -5967,7 +5967,8 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
|
|||
/* APME bit in EEPROM is mapped to WUC.APME */
|
||||
eeprom_data = er32(WUC);
|
||||
eeprom_apme_mask = E1000_WUC_APME;
|
||||
if (eeprom_data & E1000_WUC_PHY_WAKE)
|
||||
if ((hw->mac.type > e1000_ich10lan) &&
|
||||
(eeprom_data & E1000_WUC_PHY_WAKE))
|
||||
adapter->flags2 |= FLAG2_HAS_PHY_WAKEUP;
|
||||
} else if (adapter->flags & FLAG_APME_IN_CTRL3) {
|
||||
if (adapter->flags & FLAG_APME_CHECK_PORT_B &&
|
||||
|
|
Loading…
Reference in a new issue