| Message ID | 1335216578-21542-2-git-send-email-bootc@bootc.net |
|---|---|
| State | Awaiting Upstream, archived |
| Delegated to: | David Miller |
| Headers | show |
On Mon, 2012-04-23 at 22:29 +0100, Chris Boot wrote: > > 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 > --- > drivers/net/ethernet/intel/e1000e/82571.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) I have added the patch to my queue, thanks Chris!
On 23 Apr 2012, Chris Boot uttered the following: > 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. FWIW, that existing code doesn't actually work in any case. I've been running with an MTU of 7200 on one such NIC for some time, and L0s and L1 are definitely enabled, even though the driver says it's turning them off. I'll try your patch shortly, probably tomorrow. (Now I only have to worry about the *other* bug that's been bruited about on this list -- the one where the card locks up if its peer shuts down. It's worrying because one of my 82574Ls has a peer that's regularly suspended... I guess I'll try and see if I can reproduce that lockup!)
On 23/04/2012 22:29, Chris Boot wrote: > 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 > --- > drivers/net/ethernet/intel/e1000e/82571.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/net/ethernet/intel/e1000e/82571.c b/drivers/net/ethernet/intel/e1000e/82571.c > index b3fdc69..c6d95f2 100644 > --- a/drivers/net/ethernet/intel/e1000e/82571.c > +++ b/drivers/net/ethernet/intel/e1000e/82571.c > @@ -2061,8 +2061,9 @@ const struct e1000_info e1000_82574_info = { > | FLAG_HAS_SMART_POWER_DOWN > | FLAG_HAS_AMT > | FLAG_HAS_CTRLEXT_ON_LOAD, > - .flags2 = FLAG2_CHECK_PHY_HANG > + .flags2 = FLAG2_CHECK_PHY_HANG > | FLAG2_DISABLE_ASPM_L0S > + | FLAG2_DISABLE_ASPM_L1 > | FLAG2_NO_DISABLE_RX, > .pba = 32, > .max_hw_frame_size = DEFAULT_JUMBO, Now that this patch is in master (d4a4206e) and has presumably been widely tested, what's the possibility of it making it into stable? I really should have included a CC to stable when I sent it... This patch should probably also be accompanied with 59aed952 (e1000e: Remove special case for 82573/82574 ASPM L1 disablement) on top, to remove a special case that's no longer required once this is applied. Thanks, Chris
On Fri, Jun 01, 2012 at 10:17:08PM +0100, Chris Boot wrote: > On 23/04/2012 22:29, Chris Boot wrote: > > 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 > > --- > > drivers/net/ethernet/intel/e1000e/82571.c | 3 ++- > > 1 file changed, 2 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/net/ethernet/intel/e1000e/82571.c b/drivers/net/ethernet/intel/e1000e/82571.c > > index b3fdc69..c6d95f2 100644 > > --- a/drivers/net/ethernet/intel/e1000e/82571.c > > +++ b/drivers/net/ethernet/intel/e1000e/82571.c > > @@ -2061,8 +2061,9 @@ const struct e1000_info e1000_82574_info = { > > | FLAG_HAS_SMART_POWER_DOWN > > | FLAG_HAS_AMT > > | FLAG_HAS_CTRLEXT_ON_LOAD, > > - .flags2 = FLAG2_CHECK_PHY_HANG > > + .flags2 = FLAG2_CHECK_PHY_HANG > > | FLAG2_DISABLE_ASPM_L0S > > + | FLAG2_DISABLE_ASPM_L1 > > | FLAG2_NO_DISABLE_RX, > > .pba = 32, > > .max_hw_frame_size = DEFAULT_JUMBO, > > Now that this patch is in master (d4a4206e) and has presumably been > widely tested, what's the possibility of it making it into stable? I > really should have included a CC to stable when I sent it... I'd be glad to apply it, but it doesn't apply properly to the 3.4-stable tree :( > This patch should probably also be accompanied with 59aed952 (e1000e: > Remove special case for 82573/82574 ASPM L1 disablement) on top, to > remove a special case that's no longer required once this is applied. As I can't apply the first one, this one shouldn't be applied either at this point in time... thanks, greg k-h -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/ethernet/intel/e1000e/82571.c b/drivers/net/ethernet/intel/e1000e/82571.c index b3fdc69..c6d95f2 100644 --- a/drivers/net/ethernet/intel/e1000e/82571.c +++ b/drivers/net/ethernet/intel/e1000e/82571.c @@ -2061,8 +2061,9 @@ const struct e1000_info e1000_82574_info = { | FLAG_HAS_SMART_POWER_DOWN | FLAG_HAS_AMT | FLAG_HAS_CTRLEXT_ON_LOAD, - .flags2 = FLAG2_CHECK_PHY_HANG + .flags2 = FLAG2_CHECK_PHY_HANG | FLAG2_DISABLE_ASPM_L0S + | FLAG2_DISABLE_ASPM_L1 | FLAG2_NO_DISABLE_RX, .pba = 32, .max_hw_frame_size = DEFAULT_JUMBO,
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 --- drivers/net/ethernet/intel/e1000e/82571.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)