From patchwork Wed Oct 26 09:44:01 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?N=C3=A9lio_Laranjeiro?= X-Patchwork-Id: 16797 X-Patchwork-Delegate: bruce.richardson@intel.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 9715568EE; Wed, 26 Oct 2016 11:44:28 +0200 (CEST) Received: from mail-wm0-f54.google.com (mail-wm0-f54.google.com [74.125.82.54]) by dpdk.org (Postfix) with ESMTP id 38CB3590E for ; Wed, 26 Oct 2016 11:44:27 +0200 (CEST) Received: by mail-wm0-f54.google.com with SMTP id e69so15746577wmg.0 for ; Wed, 26 Oct 2016 02:44:27 -0700 (PDT) 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; bh=SkzyFmWtPDNJhaCMK4MRsP5Wgh7U9qnRVCNMBGX0eaI=; b=K7dbyY707l1Vq5Lf2wYnfPTiZQQBb6ib9APU7tSSlIVvK3RbS9L3iPrhlRXmdt5J3L lPgBGmdsOzIt7GpOkDH51S34ER/EGRZE4DrRljJep+iyceg+JOShyT8AjwF3MtxUH+jd dPwQHMPcl+kPzWnUeOkrg37yHQO19qrPA+LFaU0YbN5B40q5/Z5bgVJUP4opvzvHDfdQ h57cUhp4yb1QN6cyIpfLhqJ/OstE826eFe7Eu83WFxeLmeFvy0YR2tVdk0x0pOm6Y6OR wDwmu8JlUIDRDFfxFFSmzuyLqb6Sh/VOwwYtCF3xZEDzzfjSZB6jcsbmYzLP/0RpEhxE iVIA== 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; bh=SkzyFmWtPDNJhaCMK4MRsP5Wgh7U9qnRVCNMBGX0eaI=; b=ZQqAfMaV6YSYAVoZGFiXgu54SOLyPaA30fGv2iYXBxjqTtFl8ey4ZWALWev01IeL4K 4d0NelJ2wW5xfCxLnI0w9Yo475yb0+VucTPH0tO5WrIPNL/EDryt+rZla48oHzPHIuye +Pj0nW5yTOyIfNF8OJsGV/6yLF0/VBlIHn7znGUAx3hy14MpRFichMB1eOGf5grBrywe uFR8e9BIWTbIK4lEPcDzhitHJiesiOUxU6JwfeAVMyx6yeRxDBK1GnHSqmOgyRQaJdZN JAful5rLUUXkBzUVv/BiJDk98j46EduqBu/QPntD68ACircju9jMyoFon1ivajGbl98q DDow== X-Gm-Message-State: ABUngvcDcX39e7NEl5Tj4pi1iU45HcD1Ih09lLDbSCGU5f0ZRgEC75FWffPV3bxRg7K9BbTN X-Received: by 10.194.125.114 with SMTP id mp18mr1337242wjb.106.1477475066901; Wed, 26 Oct 2016 02:44:26 -0700 (PDT) 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 b8sm1574180wjq.40.2016.10.26.02.44.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 26 Oct 2016 02:44:26 -0700 (PDT) From: Nelio Laranjeiro To: dev@dpdk.org Date: Wed, 26 Oct 2016 11:44:01 +0200 Message-Id: X-Mailer: git-send-email 2.1.4 In-Reply-To: References: In-Reply-To: References: Subject: [dpdk-dev] [PATCH 1/2] net/mlx5: fix link speed capability information X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list 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" 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 000fb38..d7976cb 100644 --- a/drivers/net/mlx5/mlx5.h +++ b/drivers/net/mlx5/mlx5.h @@ -139,6 +139,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 b8b3ea9..042c9bc 100644 --- a/drivers/net/mlx5/mlx5_ethdev.c +++ b/drivers/net/mlx5/mlx5_ethdev.c @@ -604,15 +604,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); } @@ -647,7 +639,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; @@ -672,6 +664,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 &