aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Boot <bootc@bootc.net>2012-04-24 03:24:52 -0400
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2012-05-03 05:31:22 -0400
commitd4a4206ebbaf48b55803a7eb34e330530d83a889 (patch)
tree7b3dff1ae9a5541745ae969fba32c213aa159ca3
parentf6bd5577a39aed21cefd698bc46f70cfeaa0923c (diff)
e1000e: Disable ASPM L1 on 82574
ASPM on the 82574 causes trouble. Currently the driver disables L0s for this NIC but only disables L1 if the MTU is >1500. This patch simply causes L1 to be disabled regardless of the MTU setting. Signed-off-by: Chris Boot <bootc@bootc.net> Cc: "Wyborny, Carolyn" <carolyn.wyborny@intel.com> Cc: Nix <nix@esperi.org.uk> Link: https://lkml.org/lkml/2012/3/19/362 Tested-by: Jeff Pieper <jeffrey.e.pieper@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
-rw-r--r--drivers/net/ethernet/intel/e1000e/82571.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/e1000e/82571.c b/drivers/net/ethernet/intel/e1000e/82571.c
index 98632f4561b2..6a8a908f92b8 100644
--- a/drivers/net/ethernet/intel/e1000e/82571.c
+++ b/drivers/net/ethernet/intel/e1000e/82571.c
@@ -2072,8 +2072,9 @@ const struct e1000_info e1000_82574_info = {
2072 | FLAG_HAS_SMART_POWER_DOWN 2072 | FLAG_HAS_SMART_POWER_DOWN
2073 | FLAG_HAS_AMT 2073 | FLAG_HAS_AMT
2074 | FLAG_HAS_CTRLEXT_ON_LOAD, 2074 | FLAG_HAS_CTRLEXT_ON_LOAD,
2075 .flags2 = FLAG2_CHECK_PHY_HANG 2075 .flags2 = FLAG2_CHECK_PHY_HANG
2076 | FLAG2_DISABLE_ASPM_L0S 2076 | FLAG2_DISABLE_ASPM_L0S
2077 | FLAG2_DISABLE_ASPM_L1
2077 | FLAG2_NO_DISABLE_RX 2078 | FLAG2_NO_DISABLE_RX
2078 | FLAG2_DMA_BURST, 2079 | FLAG2_DMA_BURST,
2079 .pba = 32, 2080 .pba = 32,