linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Chris Boot <bootc@bootc.net>
To: e1000-devel@lists.sourceforge.net, netdev@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, nix@esperi.org.uk,
	carolyn.wyborny@intel.com, Chris Boot <bootc@bootc.net>
Subject: [PATCH 2/2] e1000e: Remove special case for 82573/82574 ASPM L1 disablement
Date: Mon, 23 Apr 2012 22:29:38 +0100	[thread overview]
Message-ID: <1335216578-21542-3-git-send-email-bootc@bootc.net> (raw)
In-Reply-To: <1335216578-21542-1-git-send-email-bootc@bootc.net>

For the 82573, ASPM L1 gets disabled wholesale so this special-case code
is not required. For the 82574 the previous patch does the same as for
the 82573, disabling L1 on the adapter. Thus, this code is no longer
required and can be removed.

Signed-off-by: Chris Boot <bootc@bootc.net>
---
 drivers/net/ethernet/intel/e1000e/netdev.c |    8 --------
 1 file changed, 8 deletions(-)

diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
index 19ab215..ea96cfd 100644
--- a/drivers/net/ethernet/intel/e1000e/netdev.c
+++ b/drivers/net/ethernet/intel/e1000e/netdev.c
@@ -5293,14 +5293,6 @@ static int e1000_change_mtu(struct net_device *netdev, int new_mtu)
 		return -EINVAL;
 	}
 
-	/* 82573 Errata 17 */
-	if (((adapter->hw.mac.type == e1000_82573) ||
-	     (adapter->hw.mac.type == e1000_82574)) &&
-	    (max_frame > ETH_FRAME_LEN + ETH_FCS_LEN)) {
-		adapter->flags2 |= FLAG2_DISABLE_ASPM_L1;
-		e1000e_disable_aspm(adapter->pdev, PCIE_LINK_STATE_L1);
-	}
-
 	while (test_and_set_bit(__E1000_RESETTING, &adapter->state))
 		usleep_range(1000, 2000);
 	/* e1000e_down -> e1000e_reset dependent on max_frame_size & mtu */
-- 
1.7.10


  parent reply	other threads:[~2012-04-23 21:29 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-12-27 22:01 e1000e interface hang on 82574L Chris Boot
2011-12-27 22:33 ` Dave Taht
2011-12-31  9:31 ` Chris Boot
2012-01-03  0:02   ` Wyborny, Carolyn
2012-01-04 17:12     ` Chris Boot
2012-01-15 11:10       ` Chris Boot
2012-01-16 15:56         ` Wyborny, Carolyn
2012-01-16 16:04           ` Chris Boot
2012-03-17 15:59             ` Chris Boot
2012-03-17 17:54               ` Chris Boot
2012-03-17 23:50                 ` [E1000-devel] " Nix
2012-03-19 14:59                 ` Wyborny, Carolyn
2012-03-19 16:19                   ` [E1000-devel] " Nix
2012-03-19 16:29                     ` Wyborny, Carolyn
2012-03-19 17:31                       ` Nix
2012-04-06 10:17                         ` Chris Boot
2012-04-06 12:12                           ` Bjorn Helgaas
2012-04-06 13:41                             ` Henrique de Moraes Holschuh
2012-04-06 13:48                               ` Chris Boot
2012-04-06 16:05                               ` Nix
2012-04-06 16:04                             ` Nix
2012-04-23 21:29                   ` [PATCH RFC 0/2] e1000e: 82574 also needs ASPM L1 completely disabled Chris Boot
2012-04-23 21:29                     ` [PATCH 1/2] e1000e: Disable ASPM L1 on 82574 Chris Boot
2012-04-23 23:18                       ` [E1000-devel] " Jeff Kirsher
2012-04-24 11:08                       ` Nix
2012-06-01 21:17                       ` Chris Boot
2012-06-07  1:41                         ` Greg KH
2012-04-23 21:29                     ` Chris Boot [this message]
2012-04-23 23:18                       ` [E1000-devel] [PATCH 2/2] e1000e: Remove special case for 82573/82574 ASPM L1 disablement Jeff Kirsher
2012-04-23 23:11                     ` [PATCH RFC 0/2] e1000e: 82574 also needs ASPM L1 completely disabled Jesse Brandeburg
2012-04-29 16:45                       ` Nix
2012-04-29 18:03                         ` Chris Boot

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1335216578-21542-3-git-send-email-bootc@bootc.net \
    --to=bootc@bootc.net \
    --cc=carolyn.wyborny@intel.com \
    --cc=e1000-devel@lists.sourceforge.net \
    --cc=linux-kernel@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=nix@esperi.org.uk \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).