Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754502AbcCYWI3 (ORCPT ); Fri, 25 Mar 2016 18:08:29 -0400 Received: from rcdn-iport-8.cisco.com ([173.37.86.79]:11857 "EHLO rcdn-iport-8.cisco.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753595AbcCYWI1 (ORCPT ); Fri, 25 Mar 2016 18:08:27 -0400 X-Greylist: delayed 578 seconds by postgrey-1.27 at vger.kernel.org; Fri, 25 Mar 2016 18:08:27 EDT X-IronPort-AV: E=Sophos;i="5.24,392,1454976000"; d="scan'208";a="84928700" From: Daniel Walker To: Jeff Kirsher , Jesse Brandeburg , Shannon Nelson , Carolyn Wyborny , Don Skidmore , Bruce Allan , John Ronciak , Mitch Williams Cc: Steve Shih , danielwa@fifo99.com, xe-kernel@external.cisco.com, intel-wired-lan@lists.osuosl.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH-RFC] drivers: net: ethernet: intel: e1000e: fix ethtool autoneg off for fiber Date: Fri, 25 Mar 2016 14:58:46 -0700 Message-Id: <1458943126-32258-1-git-send-email-danielwa@cisco.com> X-Mailer: git-send-email 2.5.0 X-Auto-Response-Suppress: DR, OOF, AutoReply Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1554 Lines: 45 From: Steve Shih This patch fixes the issues for disabling auto-negotiation and forcing speed and duplex settings for the fiber media. For fiber media, e1000_get_settings should return ETH_TP_MDI_INVALID for eth_tp_mdix_ctrl instead of ETH_TP_MDI_AUTO so subsequent e1000_set_settings call would not fail with -EOPNOTSUPP. e1000_set_spd_dplx should not automatically turn autoneg back on for forced 1000 Mbps full duplex settings. Cc: danielwa@fifo99.com Cc: xe-kernel@external.cisco.com Signed-off-by: Steve Shih --- drivers/net/ethernet/intel/e1000e/ethtool.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/intel/e1000e/ethtool.c b/drivers/net/ethernet/intel/e1000e/ethtool.c index 6cab1f3..cd03dcd 100644 --- a/drivers/net/ethernet/intel/e1000e/ethtool.c +++ b/drivers/net/ethernet/intel/e1000e/ethtool.c @@ -201,6 +201,9 @@ static int e1000_get_settings(struct net_device *netdev, else ecmd->eth_tp_mdix_ctrl = hw->phy.mdix; + if (hw->phy.media_type != e1000_media_type_copper) + ecmd->eth_tp_mdix_ctrl = ETH_TP_MDI_INVALID; + return 0; } @@ -236,8 +239,7 @@ static int e1000_set_spd_dplx(struct e1000_adapter *adapter, u32 spd, u8 dplx) mac->forced_speed_duplex = ADVERTISE_100_FULL; break; case SPEED_1000 + DUPLEX_FULL: - mac->autoneg = 1; - adapter->hw.phy.autoneg_advertised = ADVERTISE_1000_FULL; + mac->forced_speed_duplex = ADVERTISE_1000_FULL; break; case SPEED_1000 + DUPLEX_HALF: /* not supported */ default: -- 2.5.0