Skip to content

Commit 4def99b

Browse files
bwallanJeff Kirsher
authored andcommitted
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 a4f58f5 Reported-by: Aurelien Jarno <[email protected]> Cc: <[email protected]> Signed-off-by: Bruce Allan <[email protected]> Signed-off-by: Jeff Kirsher <[email protected]>
1 parent 9dc441f commit 4def99b

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

drivers/net/e1000e/netdev.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5967,7 +5967,8 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
59675967
/* APME bit in EEPROM is mapped to WUC.APME */
59685968
eeprom_data = er32(WUC);
59695969
eeprom_apme_mask = E1000_WUC_APME;
5970-
if (eeprom_data & E1000_WUC_PHY_WAKE)
5970+
if ((hw->mac.type > e1000_ich10lan) &&
5971+
(eeprom_data & E1000_WUC_PHY_WAKE))
59715972
adapter->flags2 |= FLAG2_HAS_PHY_WAKEUP;
59725973
} else if (adapter->flags & FLAG_APME_IN_CTRL3) {
59735974
if (adapter->flags & FLAG_APME_CHECK_PORT_B &&

0 commit comments

Comments
 (0)