netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
To: davem@davemloft.net
Cc: Chris Boot <bootc@bootc.net>,
	netdev@vger.kernel.org, gospo@redhat.com, sassmann@redhat.com,
	Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Subject: [net-next 6/9] e1000e: Remove special case for 82573/82574 ASPM L1 disablement
Date: Thu,  3 May 2012 02:56:29 -0700	[thread overview]
Message-ID: <1336038992-3144-7-git-send-email-jeffrey.t.kirsher@intel.com> (raw)
In-Reply-To: <1336038992-3144-1-git-send-email-jeffrey.t.kirsher@intel.com>

From: Chris Boot <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>
Tested-by: Jeff Pieper <jeffrey.e.pieper@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
 drivers/net/ethernet/intel/e1000e/netdev.c |    8 --------
 1 files changed, 0 insertions(+), 8 deletions(-)

diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
index ab4505c..9c4576e 100644
--- a/drivers/net/ethernet/intel/e1000e/netdev.c
+++ b/drivers/net/ethernet/intel/e1000e/netdev.c
@@ -5272,14 +5272,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.7.6

  parent reply	other threads:[~2012-05-03  9:56 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-05-03  9:56 [net-next 0/9][pull request] Intel Wired LAN Dirver Updates Jeff Kirsher
2012-05-03  9:56 ` [net-next 1/9] e1000e: suggest a possible workaround to a device hang on 82577/8 Jeff Kirsher
2012-05-03  9:56 ` [net-next 2/9] e1000e: cleanup long [read|write]_reg_locked PHY ops function pointers Jeff Kirsher
2012-05-03  9:56 ` [net-next 3/9] e1000e: Resolve intermittent negotiation issue on 82574/82583 Jeff Kirsher
2012-05-03  9:56 ` [net-next 4/9] e1000e: Driver workaround for IPv6 Header Extension Erratum Jeff Kirsher
2012-05-03  9:56 ` [net-next 5/9] e1000e: Disable ASPM L1 on 82574 Jeff Kirsher
2012-05-03 10:08   ` Nix
2012-05-03 20:12     ` Wyborny, Carolyn
2012-05-03 20:17       ` Nix
2012-05-05 16:33         ` Nix
2012-05-09 14:02           ` Nix
2012-05-03  9:56 ` Jeff Kirsher [this message]
2012-05-03  9:56 ` [net-next 7/9] ixgbevf: Add support to recognize 100mb link speed Jeff Kirsher
2012-05-03  9:56 ` [net-next 8/9] ixgbevf: Make sure jumbo frames are set correctly after PF reset Jeff Kirsher
2012-05-03  9:56 ` [net-next 9/9] ixgbevf: Update version string Jeff Kirsher
2012-05-03 17:30 ` [net-next 0/9][pull request] Intel Wired LAN Dirver Updates David Miller

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=1336038992-3144-7-git-send-email-jeffrey.t.kirsher@intel.com \
    --to=jeffrey.t.kirsher@intel.com \
    --cc=bootc@bootc.net \
    --cc=davem@davemloft.net \
    --cc=gospo@redhat.com \
    --cc=netdev@vger.kernel.org \
    --cc=sassmann@redhat.com \
    /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).