From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ananda Sathyanarayana Subject: [PATCH] E1000: fix for forced speed/duplex config Date: Tue, 1 Nov 2016 15:47:04 -0700 Message-ID: <1478040424-102624-1-git-send-email-ananda@versa-networks.com> Cc: dev@dpdk.org To: wenzhuo.lu@intel.com Return-path: Received: from mail-pf0-f175.google.com (mail-pf0-f175.google.com [209.85.192.175]) by dpdk.org (Postfix) with ESMTP id 80EA32C0C for ; Wed, 2 Nov 2016 00:34:28 +0100 (CET) Received: by mail-pf0-f175.google.com with SMTP id n85so102767614pfi.1 for ; Tue, 01 Nov 2016 16:34:28 -0700 (PDT) List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" >>From the code, it looks like, hw->mac.autoneg, variable is used to switch between calling either autoneg function or forcing speed/duplex function. But this variable is not modified in eth_em_start/eth_igb_start routines (it is always set to 1) even while forcing the link speed. Following discussion thread has some more information on this http://dpdk.org/ml/archives/dev/2016-October/049272.html Signed-off-by: Ananda Sathyanarayana --- drivers/net/e1000/em_ethdev.c | 16 ++++++++++++++-- drivers/net/e1000/igb_ethdev.c | 16 ++++++++++++++-- 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/drivers/net/e1000/em_ethdev.c b/drivers/net/e1000/em_ethdev.c index 7cf5f0c..a2412f5 100644 --- a/drivers/net/e1000/em_ethdev.c +++ b/drivers/net/e1000/em_ethdev.c @@ -639,6 +639,7 @@ eth_em_start(struct rte_eth_dev *dev) speeds = &dev->data->dev_conf.link_speeds; if (*speeds == ETH_LINK_SPEED_AUTONEG) { hw->phy.autoneg_advertised = E1000_ALL_SPEED_DUPLEX; + hw->mac.autoneg = 1; } else { num_speeds = 0; autoneg = (*speeds & ETH_LINK_SPEED_FIXED) == 0; @@ -672,9 +673,20 @@ eth_em_start(struct rte_eth_dev *dev) hw->phy.autoneg_advertised |= ADVERTISE_1000_FULL; num_speeds++; } - if (num_speeds == 0 || (!autoneg && (num_speeds > 1))) + if (num_speeds == 0 || (!autoneg && (num_speeds > 1))) { goto error_invalid_config; - } + } + /* + * Set/reset the mac.autoneg based on the link speed, + * fixed or not + */ + if (!autoneg) { + hw->mac.autoneg = 0; + hw->mac.forced_speed_duplex = hw->phy.autoneg_advertised; + } else { + hw->mac.autoneg = 1; + } + } e1000_setup_link(hw); diff --git a/drivers/net/e1000/igb_ethdev.c b/drivers/net/e1000/igb_ethdev.c index 4924396..9fb498f 100644 --- a/drivers/net/e1000/igb_ethdev.c +++ b/drivers/net/e1000/igb_ethdev.c @@ -1327,6 +1327,7 @@ eth_igb_start(struct rte_eth_dev *dev) speeds = &dev->data->dev_conf.link_speeds; if (*speeds == ETH_LINK_SPEED_AUTONEG) { hw->phy.autoneg_advertised = E1000_ALL_SPEED_DUPLEX; + hw->mac.autoneg = 1; } else { num_speeds = 0; autoneg = (*speeds & ETH_LINK_SPEED_FIXED) == 0; @@ -1360,9 +1361,20 @@ eth_igb_start(struct rte_eth_dev *dev) hw->phy.autoneg_advertised |= ADVERTISE_1000_FULL; num_speeds++; } - if (num_speeds == 0 || (!autoneg && (num_speeds > 1))) + if (num_speeds == 0 || (!autoneg && (num_speeds > 1))) { goto error_invalid_config; - } + } + /* + * Set/reset the mac.autoneg based on the link speed, + * fixed or not + */ + if (!autoneg) { + hw->mac.autoneg = 0; + hw->mac.forced_speed_duplex = hw->phy.autoneg_advertised; + } else { + hw->mac.autoneg = 1; + } + } e1000_setup_link(hw); -- 1.9.1