From patchwork Wed Nov 17 23:29:10 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jesse Brandeburg X-Patchwork-Id: 71637 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id E5570B85C9 for ; Thu, 18 Nov 2010 10:30:06 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751480Ab0KQX3O (ORCPT ); Wed, 17 Nov 2010 18:29:14 -0500 Received: from mga11.intel.com ([192.55.52.93]:1634 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751142Ab0KQX3L (ORCPT ); Wed, 17 Nov 2010 18:29:11 -0500 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga102.fm.intel.com with ESMTP; 17 Nov 2010 15:29:11 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.59,213,1288594800"; d="scan'208";a="858737543" Received: from jbrandeb-ich9b.jf.intel.com ([134.134.3.214]) by fmsmga001.fm.intel.com with ESMTP; 17 Nov 2010 15:29:11 -0800 Received: from jbrandeb-ich9b.jf.intel.com (localhost.localdomain [127.0.0.1]) by jbrandeb-ich9b.jf.intel.com (8.14.4/8.14.4) with ESMTP id oAHNTAZ9003560 for ; Wed, 17 Nov 2010 15:29:10 -0800 From: Jesse Brandeburg Subject: [RFC PATCH 1/3] e1000e: implement MDI-X control To: netdev@vger.kernel.org Date: Wed, 17 Nov 2010 15:29:10 -0800 Message-ID: <20101117232910.3513.99143.stgit@jbrandeb-ich9b.jf.intel.com> In-Reply-To: <20101117232645.3513.20655.stgit@jbrandeb-ich9b.jf.intel.com> References: <20101117232645.3513.20655.stgit@jbrandeb-ich9b.jf.intel.com> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org some users report issues with link failing when connected to certain switches. This gives the user the ability to control the MDI-X state from the driver. This is in regards to the related ethtool patch and bugzilla.kernel.org bug 11998 Signed-off-by: Jesse Brandeburg CC: bruce.w.allan@intel.com CC: n.poppelier@xs4all.nl CC: bastien@durel.org CC: jsveiga@it.eng.br --- drivers/net/e1000e/e1000.h | 1 - drivers/net/e1000e/ethtool.c | 4 ++++ drivers/net/e1000e/netdev.c | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) -- 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/e1000e/e1000.h b/drivers/net/e1000e/e1000.h index fdc67fe..10469b2 100644 --- a/drivers/net/e1000e/e1000.h +++ b/drivers/net/e1000e/e1000.h @@ -81,7 +81,6 @@ struct e1000_info; /* How many Rx Buffers do we bundle into one write to the hardware ? */ #define E1000_RX_BUFFER_WRITE 16 /* Must be power of 2 */ -#define AUTO_ALL_MODES 0 #define E1000_EEPROM_APME 0x0400 #define E1000_MNG_VLAN_NONE (-1) diff --git a/drivers/net/e1000e/ethtool.c b/drivers/net/e1000e/ethtool.c index 8984d16..f518c9b 100644 --- a/drivers/net/e1000e/ethtool.c +++ b/drivers/net/e1000e/ethtool.c @@ -285,6 +285,10 @@ static int e1000_set_settings(struct net_device *netdev, } } + /* MDI-X => 2; MDI =>1; Auto =>0 */ + if (ecmd->eth_tp_mdix && (hw->phy.media_type == e1000_media_type_copper)) + hw->phy.mdix = ecmd->eth_tp_mdix; + /* reset the link */ if (netif_running(adapter->netdev)) { diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c index 68e79c2..9e7d864 100644 --- a/drivers/net/e1000e/netdev.c +++ b/drivers/net/e1000e/netdev.c @@ -5842,7 +5842,7 @@ static int __devinit e1000_probe(struct pci_dev *pdev, /* Copper options */ if (adapter->hw.phy.media_type == e1000_media_type_copper) { - adapter->hw.phy.mdix = AUTO_ALL_MODES; + adapter->hw.phy.mdix = ETH_TP_MDI_INVALID; adapter->hw.phy.disable_polarity_correction = 0; adapter->hw.phy.ms_type = e1000_ms_hw_default; }