3.0-stable review patch. If anyone has any objections, please let me know.
------------------ From: Chris Boot <[email protected]> commit d4a4206ebbaf48b55803a7eb34e330530d83a889 upstream. 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 <[email protected]> Cc: "Wyborny, Carolyn" <[email protected]> Cc: Nix <[email protected]> Link: https://lkml.org/lkml/2012/3/19/362 Tested-by: Jeff Pieper <[email protected]> Signed-off-by: Jeff Kirsher <[email protected]> Signed-off-by: Nikola Ciprich <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]> --- drivers/net/e1000e/82571.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/drivers/net/e1000e/82571.c +++ b/drivers/net/e1000e/82571.c @@ -2088,7 +2088,8 @@ struct e1000_info e1000_82574_info = { | FLAG_HAS_AMT | FLAG_HAS_CTRLEXT_ON_LOAD, .flags2 = FLAG2_CHECK_PHY_HANG - | FLAG2_DISABLE_ASPM_L0S, + | FLAG2_DISABLE_ASPM_L0S + | FLAG2_DISABLE_ASPM_L1, .pba = 32, .max_hw_frame_size = DEFAULT_JUMBO, .get_variants = e1000_get_variants_82571, -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
