| From 4def99bbfd46e05c5e03b5b282cb4ee30e27ff19 Mon Sep 17 00:00:00 2001 |
| From: Bruce Allan <bruce.w.allan@intel.com> |
| Date: Wed, 2 Feb 2011 09:30:36 +0000 |
| Subject: e1000e: disable broken PHY wakeup for ICH10 LOMs, use MAC wakeup instead |
| |
| From: Bruce Allan <bruce.w.allan@intel.com> |
| |
| commit 4def99bbfd46e05c5e03b5b282cb4ee30e27ff19 upstream. |
| |
| 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 a4f58f5455ba0efda36fb33c37074922d1527a10 |
| |
| Reported-by: Aurelien Jarno <aurelien@aurel32.net> |
| Signed-off-by: Bruce Allan <bruce.w.allan@intel.com> |
| Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| --- |
| drivers/net/e1000e/netdev.c | 3 ++- |
| 1 file changed, 2 insertions(+), 1 deletion(-) |
| |
| --- a/drivers/net/e1000e/netdev.c |
| +++ b/drivers/net/e1000e/netdev.c |
| @@ -5186,7 +5186,8 @@ static int __devinit e1000_probe(struct |
| /* 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 && |
