From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm0-f47.google.com (mail-wm0-f47.google.com [74.125.82.47]) by dpdk.org (Postfix) with ESMTP id 5355BFFA for ; Tue, 8 Nov 2016 11:37:55 +0100 (CET) Received: by mail-wm0-f47.google.com with SMTP id a197so236359517wmd.0 for ; Tue, 08 Nov 2016 02:37:55 -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=ZEgneea1Yn0dX0245KmV9jkxRtV94SYn3IMGb64SEKY=; b=qI5VFXnTNEVjx9A9LwyXenxFs/fGZwP1oHnCXer9OCQ7XX4BfuDG4+e52fygHhR3xZ UN2jd4CkzwNwj+ODwDKQ7lNs0IJvhOrTU2OqRdiK2+YFLj4zdADfi590ABVwrlKOiqXC gPqHpGGf4rx56OzctwQcDRjqwle7arbW9EdxI4jR67Wyc0dMZYasr3wE4OWsRK5ccZJn axWYIujy+GNKqyiIKe8Wy1/5+A5QkJ5X2Yj+VyQYRZRX4f8P71Q7BEOoN2NMx3jbvAF6 T+GWpXnfAYSCQzN28bclOJrcCLEyXxqHdcjdqrBaVBsiLXssJY3s0HKPN6fmgdVcNrMN Hwfg== 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=ZEgneea1Yn0dX0245KmV9jkxRtV94SYn3IMGb64SEKY=; b=Q5xATjcxQp1L5SF0Yntt8MjTO/yMLLmFLz0gFY14vu4tEXEVRtKLf+iFihCOWli1y+ NUcItMgw3ytkzXWCx6SEKv42Qqbhh0iDqLaZbTvoAAFRcbc0XM03tOLahe7MGm2tH4Ic Veqct/GJhJJJ42/rD7+FVaw+iv7GHagX5Ei6eQhA7l+VeKZNPrgueYVmTu7T63OJZi9o XMGuHOoIeQM4LiH1BHIjqnXZi5ZtwXFl6Gg7fUpxd/fb/KGs44SqS0+2y5/utWFXmYIe SexuVI4VNHzaBQQyPndSY/fy/JDDvCAMWLvKt8cFXLJPkFJ8iDRxKVQbwoZmIdGV3aqI lRnA== X-Gm-Message-State: ABUngvdyrcbZ1cJLphoUFHXFoyqQ8e30Ah+IJMxk5h8xJZmqHFeIqz7nYO/KMGPfgSarHXyd X-Received: by 10.194.235.103 with SMTP id ul7mr11475477wjc.201.1478601474850; Tue, 08 Nov 2016 02:37:54 -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 k74sm18837414wmd.18.2016.11.08.02.37.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 08 Nov 2016 02:37:54 -0800 (PST) From: Nelio Laranjeiro To: stable@dpdk.org, Yuanhan Liu Cc: =?UTF-8?q?N=C3=A9lio=20Laranjeiro?= , Adrien Mazarguil Date: Tue, 8 Nov 2016 11:36:54 +0100 Message-Id: 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 13/14] 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: Tue, 08 Nov 2016 10:37:55 -0000 From: Nélio Laranjeiro 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 29d2aec..614085c 100644 --- a/drivers/net/mlx5/mlx5_ethdev.c +++ b/drivers/net/mlx5/mlx5_ethdev.c @@ -600,15 +600,7 @@ mlx5_dev_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *info) * size if it is not fixed. * The API should be updated to solve this problem. */ info->reta_size = priv->ind_table_max_size; - 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); } @@ -643,7 +635,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; @@ -668,6 +660,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