hi, it's my first patch for -stable, so I hope I haven't screwed anything. If yes,please let me know. I also wonder whether following-up 59aed95263bdd0e2b48eb9be5a94346d2d4abf90 removing special case not needed after applying this fix is suitable for stable? I guess not.. BR nik
On Mon, Aug 20, 2012 at 08:23:43PM +0200, Nikola Ciprich wrote: > commit ce14e691e8091187993bceccbc4740eae0821dee > Author: Nikola Ciprich <[email protected]> > Date: Mon Aug 20 18:46:20 2012 +0200 > > backport of d4a4206ebbaf48b55803a7eb34e330530d83a889 for 3.0: > > 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 <[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]> > > diff --git a/drivers/net/e1000e/82571.c b/drivers/net/e1000e/82571.c > index 0d0ee55..8402d19 100644 > --- 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, > > -- > ------------------------------------- > Ing. Nikola CIPRICH > LinuxBox.cz, s.r.o. > 28. rijna 168, 709 00 Ostrava > > tel.: +420 591 166 214 > fax: +420 596 621 273 > mobil: +420 777 093 799 > > www.linuxbox.cz > > mobil servis: +420 737 238 656 > email servis: [email protected] > ------------------------------------- -- ------------------------------------- Ing. Nikola CIPRICH LinuxBox.cz, s.r.o. 28. rijna 168, 709 00 Ostrava tel.: +420 591 166 214 fax: +420 596 621 273 mobil: +420 777 093 799 www.linuxbox.cz mobil servis: +420 737 238 656 email servis: [email protected] -------------------------------------
pgpJgCydw7X7V.pgp
Description: PGP signature
