From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755626Ab2DWV3p (ORCPT ); Mon, 23 Apr 2012 17:29:45 -0400 Received: from kamaji.grokhost.net ([87.117.218.43]:57338 "EHLO kamaji.grokhost.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754546Ab2DWV3o (ORCPT ); Mon, 23 Apr 2012 17:29:44 -0400 From: Chris Boot 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 Subject: [PATCH 2/2] e1000e: Remove special case for 82573/82574 ASPM L1 disablement Date: Mon, 23 Apr 2012 22:29:38 +0100 Message-Id: <1335216578-21542-3-git-send-email-bootc@bootc.net> X-Mailer: git-send-email 1.7.10 In-Reply-To: <1335216578-21542-1-git-send-email-bootc@bootc.net> References: <1335216578-21542-1-git-send-email-bootc@bootc.net> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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