From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm0-f42.google.com (mail-wm0-f42.google.com [74.125.82.42]) by dpdk.org (Postfix) with ESMTP id C66639E7 for ; Wed, 9 Nov 2016 10:58:27 +0100 (CET) Received: by mail-wm0-f42.google.com with SMTP id a197so296327713wmd.0 for ; Wed, 09 Nov 2016 01:58:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references:mime-version:content-transfer-encoding; bh=rBL6XKJymA7gU9kLDRArcc6UTzYJgkrC34ALC4sHvBM=; b=VzMmd+gZIMmYbPQ4ex9c4VTzwjALs2GEuvtHxjlkX3+Rv44Jk87/DtQ8h04rx6Jsl5 k+uBZ6eLsN3/fnDCjBlAPlsx3/YtdByPXlezeork1UoC7Uvzd2HoIab4V1b7CJfVED1T n5uraC9m5jreBUP/oeFDqkh4msQPTvR4N1LBB/1IHxTfVReb0Lc22UEvwUeLo8GakLJp vqTW1zcBshqGUzZsfkeruzn36QlXN6NTMB3UV/5vhIcdI+mepJzzoCP3jovexnsnRSSo gXu8a8fPG8DnKZkxAPac7LstbKTNQpeQcQKBqo0MDJC9tQ0aos/PZldRWBtl7gRJZN/z C2Bw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references:mime-version :content-transfer-encoding; bh=rBL6XKJymA7gU9kLDRArcc6UTzYJgkrC34ALC4sHvBM=; b=Jmb0UqbUCBDMi7lBqwwFbHoAJgzWgzREwVCw7tiLoYWB8ahCJ9fUeoOMbUAj14COfS wq/3HQ8VuHIS5xX0nfJ66dHPKcNVGGVaBbf6np78oBXdU9cjQSRmN+dXLH9H7sJYgJMz GUKYAsIPIKMLt8MO6tHnGoc014VqXmADvwAlQBK/B20xwDD6HG8Ut3m5XvbZyxnJgeHf 2NcpExDN2OuiW8+mXz1bxVA63+/y/M750oGNt4kgzmyqd77kNkRpPV2wompS2hoQxWUv rVBI/pfCAVEdzlyHm9ENGm07+c6/aK1FNCn06+cmRRiItCjnJ33gOX3tak6Gb2kRlhWe guJQ== X-Gm-Message-State: ABUngvfysWcOOF+DMlT4yzmjEGw3VilAOgmV5WAZbaRR0B4+Nw8nfmPwtKYsBT6e7bmqAyfp X-Received: by 10.28.8.149 with SMTP id 143mr18405842wmi.47.1478685507336; Wed, 09 Nov 2016 01:58:27 -0800 (PST) Received: from ping.vm.6wind.com (guy78-3-82-239-227-177.fbx.proxad.net. [82.239.227.177]) by smtp.gmail.com with ESMTPSA id c133sm13926057wme.12.2016.11.09.01.58.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 09 Nov 2016 01:58:26 -0800 (PST) From: Nelio Laranjeiro To: stable@dpdk.org, Yuanhan Liu Cc: =?UTF-8?q?N=C3=A9lio=20Laranjeiro?= , Adrien Mazarguil Date: Wed, 9 Nov 2016 10:57:50 +0100 Message-Id: <3cf0a98c45dc3c5f0224b068e499d62124ff50e0.1478683594.git.nelio.laranjeiro@6wind.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: References: In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] [PATCH v2 11/12] net/mlx5: fix link speed capability information X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Nov 2016 09:58:28 -0000 From: Nélio Laranjeiro [ upstream commit 75ef62a9430116e7a0d00fbec68af05a5333c116 ] Make hard-coded values dynamic to return correct link speed capabilities (not all ConnectX-4 NICs support everything). Fixes: e274f5732225 ("ethdev: add speed capabilities") Signed-off-by: Nelio Laranjeiro --- drivers/net/mlx5/mlx5.h | 1 + drivers/net/mlx5/mlx5_ethdev.c | 25 +++++++++++++++---------- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h index 82172e4..79b7a60 100644 --- a/drivers/net/mlx5/mlx5.h +++ b/drivers/net/mlx5/mlx5.h @@ -135,6 +135,7 @@ struct priv { unsigned int reta_idx_n; /* RETA index size. */ struct fdir_filter_list *fdir_filter_list; /* Flow director rules. */ struct fdir_queue *fdir_drop_queue; /* Flow director drop queue. */ + uint32_t link_speed_capa; /* Link speed capabilities. */ rte_spinlock_t lock; /* Lock for control functions. */ }; diff --git a/drivers/net/mlx5/mlx5_ethdev.c b/drivers/net/mlx5/mlx5_ethdev.c index 90ad467..20c1c8a 100644 --- a/drivers/net/mlx5/mlx5_ethdev.c +++ b/drivers/net/mlx5/mlx5_ethdev.c @@ -603,15 +603,7 @@ mlx5_dev_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *info) info->hash_key_size = ((*priv->rss_conf) ? (*priv->rss_conf)[0]->rss_key_len : 0); - info->speed_capa = - ETH_LINK_SPEED_1G | - ETH_LINK_SPEED_10G | - ETH_LINK_SPEED_20G | - ETH_LINK_SPEED_25G | - ETH_LINK_SPEED_40G | - ETH_LINK_SPEED_50G | - ETH_LINK_SPEED_56G | - ETH_LINK_SPEED_100G; + info->speed_capa = priv->link_speed_capa; priv_unlock(priv); } @@ -646,7 +638,7 @@ mlx5_link_update_unlocked(struct rte_eth_dev *dev, int wait_to_complete) { struct priv *priv = mlx5_get_priv(dev); struct ethtool_cmd edata = { - .cmd = ETHTOOL_GSET + .cmd = ETHTOOL_GSET /* Deprecated since Linux v4.5. */ }; struct ifreq ifr; struct rte_eth_link dev_link; @@ -671,6 +663,19 @@ mlx5_link_update_unlocked(struct rte_eth_dev *dev, int wait_to_complete) dev_link.link_speed = 0; else dev_link.link_speed = link_speed; + priv->link_speed_capa = 0; + if (edata.supported & SUPPORTED_Autoneg) + priv->link_speed_capa |= ETH_LINK_SPEED_AUTONEG; + if (edata.supported & (SUPPORTED_1000baseT_Full | + SUPPORTED_1000baseKX_Full)) + priv->link_speed_capa |= ETH_LINK_SPEED_1G; + if (edata.supported & SUPPORTED_10000baseKR_Full) + priv->link_speed_capa |= ETH_LINK_SPEED_10G; + if (edata.supported & (SUPPORTED_40000baseKR4_Full | + SUPPORTED_40000baseCR4_Full | + SUPPORTED_40000baseSR4_Full | + SUPPORTED_40000baseLR4_Full)) + priv->link_speed_capa |= ETH_LINK_SPEED_40G; dev_link.link_duplex = ((edata.duplex == DUPLEX_HALF) ? ETH_LINK_HALF_DUPLEX : ETH_LINK_FULL_DUPLEX); dev_link.link_autoneg = !(dev->data->dev_conf.link_speeds & -- 2.1.4