From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wi0-f182.google.com (mail-wi0-f182.google.com [209.85.212.182]) by dpdk.org (Postfix) with ESMTP id 2B4388E59 for ; Sat, 29 Aug 2015 02:16:23 +0200 (CEST) Received: by wiae7 with SMTP id e7so10883162wia.0 for ; Fri, 28 Aug 2015 17:16:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id:in-reply-to:references; bh=gzYRgiRopxqAv5XEQ8DEGeuSYgzyrHDf2IUV4TrqpQM=; b=icLdYjQgN1taOnFaPslhAX1NelgKyVI/Fjj6NJK7QIIlI6FMCY5QjX4k6ehNr/bMiK DmHfEogA4xjki34TO3ZinaHAqIK+E1KWcaLQzo4Dx44ergJ1X7JxrGLBNOytktUp3kkf PLm1/wqUPrP59psOyjIL0JjQgiXQXc4ERn4Fb8lt5bKOhEoZJMCPrc7L54MhUWiDemNk hbB4xwx1CyKKCU29FtHNNezIjmqN4p7fNqx+++rWHZxqvV18+BcjGrGfjrqSJsS0+Om3 q/yrtd7kWGlXgZLSt6qwzvdnqJvOPw3YpgOCbvpbIV7cs4fYnq0yoJegOwE749z5LlOr Ok9w== X-Received: by 10.194.175.233 with SMTP id cd9mr14012191wjc.68.1440807383059; Fri, 28 Aug 2015 17:16:23 -0700 (PDT) Received: from localhost.localdomain (103.Red-83-55-239.dynamicIP.rima-tde.net. [83.55.239.103]) by smtp.gmail.com with ESMTPSA id ev2sm6031154wib.21.2015.08.28.17.16.22 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 28 Aug 2015 17:16:22 -0700 (PDT) From: Marc Sune X-Google-Original-From: Marc Sune To: dev@dpdk.org Date: Sat, 29 Aug 2015 02:16:13 +0200 Message-Id: <1440807373-24770-3-git-send-email-marc.sune@bisdn.de> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1440807373-24770-1-git-send-email-marc.sune@bisdn.de> References: <1440804014-30815-1-git-send-email-marc.sune@bisdn.de> <1440807373-24770-1-git-send-email-marc.sune@bisdn.de> Subject: [dpdk-dev] [PATCH v4 2/2] Filling speed capability bitmaps in the PMDs 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: , X-List-Received-Date: Sat, 29 Aug 2015 00:16:23 -0000 Added speed capabilities to all pmds supporting physical NICs: * e1000 * ixgbe * i40 * mlx4 * fm10k Signed-off-by: Marc Sune --- drivers/net/e1000/em_ethdev.c | 6 ++++++ drivers/net/e1000/igb_ethdev.c | 6 ++++++ drivers/net/fm10k/fm10k_ethdev.c | 3 +++ drivers/net/i40e/i40e_ethdev.c | 9 +++++++++ drivers/net/ixgbe/ixgbe_ethdev.c | 10 ++++++++++ drivers/net/mlx4/mlx4.c | 6 ++++++ 6 files changed, 40 insertions(+) diff --git a/drivers/net/e1000/em_ethdev.c b/drivers/net/e1000/em_ethdev.c index f0216f9..501e8b6 100644 --- a/drivers/net/e1000/em_ethdev.c +++ b/drivers/net/e1000/em_ethdev.c @@ -933,6 +933,12 @@ eth_em_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info) dev_info->max_rx_queues = 1; dev_info->max_tx_queues = 1; + + dev_info->speed_capa = ETH_SPEED_10M_HD | + ETH_SPEED_10M | + ETH_SPEED_100M_HD | + ETH_SPEED_100M | + ETH_SPEED_1G; } /* return 0 means link status changed, -1 means not changed */ diff --git a/drivers/net/e1000/igb_ethdev.c b/drivers/net/e1000/igb_ethdev.c index 25f1755..a1c42e6 100644 --- a/drivers/net/e1000/igb_ethdev.c +++ b/drivers/net/e1000/igb_ethdev.c @@ -1588,6 +1588,12 @@ eth_igb_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info) }, .txq_flags = 0, }; + + dev_info->speed_capa = ETH_SPEED_10M_HD | + ETH_SPEED_10M | + ETH_SPEED_100M_HD | + ETH_SPEED_100M | + ETH_SPEED_1G; } static void diff --git a/drivers/net/fm10k/fm10k_ethdev.c b/drivers/net/fm10k/fm10k_ethdev.c index a69c990..875028e 100644 --- a/drivers/net/fm10k/fm10k_ethdev.c +++ b/drivers/net/fm10k/fm10k_ethdev.c @@ -964,6 +964,9 @@ fm10k_dev_infos_get(struct rte_eth_dev *dev, ETH_TXQ_FLAGS_NOOFFLOADS, }; + dev_info->speed_capa = ETH_SPEED_1G | ETH_SPEED_2_5G | + ETH_SPEED_10G | ETH_SPEED_25G | + ETH_SPEED_40G | ETH_SPEED_100G; } static int diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c index 8f340cd..0a535a2 100644 --- a/drivers/net/i40e/i40e_ethdev.c +++ b/drivers/net/i40e/i40e_ethdev.c @@ -1624,6 +1624,7 @@ static void i40e_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info) { struct i40e_pf *pf = I40E_DEV_PRIVATE_TO_PF(dev->data->dev_private); + struct i40e_hw *hw = I40E_DEV_PRIVATE_TO_HW(dev->data->dev_private); struct i40e_vsi *vsi = pf->main_vsi; dev_info->max_rx_queues = vsi->nb_qps; @@ -1683,6 +1684,14 @@ i40e_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info) dev_info->max_rx_queues += dev_info->vmdq_queue_num; dev_info->max_tx_queues += dev_info->vmdq_queue_num; } + + if (i40e_is_40G_device(hw->device_id)) + /* For XL710 */ + dev_info->speed_capa = ETH_SPEED_10G | ETH_SPEED_40G; + else + /* For X710 */ + dev_info->speed_capa = ETH_SPEED_1G | ETH_SPEED_10G; + } static int diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c index 9b65d81..11ff5ea 100644 --- a/drivers/net/ixgbe/ixgbe_ethdev.c +++ b/drivers/net/ixgbe/ixgbe_ethdev.c @@ -2417,6 +2417,16 @@ ixgbe_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info) dev_info->hash_key_size = IXGBE_HKEY_MAX_INDEX * sizeof(uint32_t); dev_info->reta_size = ETH_RSS_RETA_SIZE_128; dev_info->flow_type_rss_offloads = IXGBE_RSS_OFFLOAD_ALL; + + dev_info->speed_capa = ETH_SPEED_1G | ETH_SPEED_10G; + + if (hw->mac.type == ixgbe_mac_X540 || + hw->mac.type == ixgbe_mac_X540_vf || + hw->mac.type == ixgbe_mac_X550 || + hw->mac.type == ixgbe_mac_X550_vf) + + dev_info->speed_capa |= ETH_SPEED_100M | + ETH_SPEED_100M_HD; } static void diff --git a/drivers/net/mlx4/mlx4.c b/drivers/net/mlx4/mlx4.c index fa3cb7e..31f4970 100644 --- a/drivers/net/mlx4/mlx4.c +++ b/drivers/net/mlx4/mlx4.c @@ -3876,6 +3876,12 @@ mlx4_dev_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *info) DEV_TX_OFFLOAD_UDP_CKSUM | DEV_TX_OFFLOAD_TCP_CKSUM) : 0); + + info->speed_capa = ETH_SPEED_10G | ETH_SPEED_20G | + ETH_SPEED_25G | ETH_SPEED_40G | + ETH_SPEED_50G | ETH_SPEED_56G | + ETH_SPEED_100G; + priv_unlock(priv); } -- 2.1.4