Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/11513/?format=api
http://patchwork.dpdk.org/api/patches/11513/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/1457992546-32230-9-git-send-email-thomas.monjalon@6wind.com/", "project": { "id": 1, "url": "http://patchwork.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<1457992546-32230-9-git-send-email-thomas.monjalon@6wind.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1457992546-32230-9-git-send-email-thomas.monjalon@6wind.com", "date": "2016-03-14T21:55:46", "name": "[dpdk-dev,v10,8/8] ethdev: add 100G link speed", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "af729a8e90ec0b4d14895fbb3dc63b5483fe6f0d", "submitter": { "id": 1, "url": "http://patchwork.dpdk.org/api/people/1/?format=api", "name": "Thomas Monjalon", "email": "thomas.monjalon@6wind.com" }, "delegate": { "id": 1, "url": "http://patchwork.dpdk.org/api/users/1/?format=api", "username": "tmonjalo", "first_name": "Thomas", "last_name": "Monjalon", "email": "thomas@monjalon.net" }, "mbox": "http://patchwork.dpdk.org/project/dpdk/patch/1457992546-32230-9-git-send-email-thomas.monjalon@6wind.com/mbox/", "series": [], "comments": "http://patchwork.dpdk.org/api/patches/11513/comments/", "check": "pending", "checks": "http://patchwork.dpdk.org/api/patches/11513/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@dpdk.org", "Delivered-To": "patchwork@dpdk.org", "Received": [ "from [92.243.14.124] (localhost [IPv6:::1])\n\tby dpdk.org (Postfix) with ESMTP id 7B009567C;\n\tMon, 14 Mar 2016 22:57:38 +0100 (CET)", "from mail-wm0-f47.google.com (mail-wm0-f47.google.com\n\t[74.125.82.47]) by dpdk.org (Postfix) with ESMTP id E24D32C6B\n\tfor <dev@dpdk.org>; Mon, 14 Mar 2016 22:57:34 +0100 (CET)", "by mail-wm0-f47.google.com with SMTP id p65so120092322wmp.1\n\tfor <dev@dpdk.org>; Mon, 14 Mar 2016 14:57:34 -0700 (PDT)", "from XPS13.localdomain (91.111.75.86.rev.sfr.net. [86.75.111.91])\n\tby smtp.gmail.com with ESMTPSA id\n\tw133sm17918804wmd.3.2016.03.14.14.57.32\n\t(version=TLSv1/SSLv3 cipher=OTHER);\n\tMon, 14 Mar 2016 14:57:34 -0700 (PDT)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=6wind-com.20150623.gappssmtp.com; s=20150623;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references;\n\tbh=nS69nlGD5HX/PaTnBuWUpY5QZpeMLc7VhWZ7f2dYg/E=;\n\tb=gMvkYlekdB2mgp3zdMIl4kw2tby8h08cIrnJEQRJCur+84l92qMqZXG1oeGfkwNI80\n\trpr0aAN9jW2hdg1GE6d8ZXC8CQMv7vRKyoBP2GPb6axlrC82qg1uZJk1QpXWuYgbKrjD\n\t4M4eoKYI60kjtmBt47lu7ethwQXwLT0jtfYBDhcCongs4HBzNuSkdgtD3GK8rzp8Huie\n\tVaLGlaFJGDHmzTJjQG577wRPobnO3rZx65SgAsMxHOyMTnPHbhUJAtVndz2hPTMugiQZ\n\tp/ucfWiIDNV4f5bcR2a5GeS2V4YAuKjaSCVmZREFzNuckapV/y2cH2begWHunQnRef1/\n\tmm3Q==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20130820;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references;\n\tbh=nS69nlGD5HX/PaTnBuWUpY5QZpeMLc7VhWZ7f2dYg/E=;\n\tb=cnflxEswWoZdmDk2btZGVzSWRa3cpL6VrJFRB2UTczL8nUlrQpeKsWDoe9PlLS6vD5\n\twAQkdd1/7zYIE47SS331gE0XfEo/xkblxk45cfaZYwSMu53oaO8zZHP9ydBuPeaZ+EZE\n\tT5c9+P8YVlePhVXlEajowDWqUoTjKcQWbF2GvxHsbJHyy4a3ICFJXehRLNCdsv/zNfEj\n\tXFgRwgf7wruUtnWw5c6zsK1bmoKwAMWxGeDDRhjWWA0Vrh0sHa9Z2KgvsD0qffnAKcXJ\n\tScvPSViZ+h9b5z+QEEevOhVmm7bVH+P384qpO0sc20tJvdPIxa5ictW1V2hHiXlQJLYG\n\tvITA==", "X-Gm-Message-State": "AD7BkJLPCW/yFyMB7cvPGyRo465wxWlWh0mzivsY0LGGh647OwUBhc4j/t89UCaEoeASAEpS", "X-Received": "by 10.194.174.134 with SMTP id\n\tbs6mr26308743wjc.111.1457992654800; \n\tMon, 14 Mar 2016 14:57:34 -0700 (PDT)", "From": "Thomas Monjalon <thomas.monjalon@6wind.com>", "To": "marcdevel@gmail.com, bruce.richardson@intel.com, declan.doherty@intel.com,\n\tkonstantin.ananyev@intel.com, wenzhuo.lu@intel.com,\n\thelin.zhang@intel.com, jing.d.chen@intel.com, harish.patil@qlogic.com,\n\trahul.lakkireddy@chelsio.com, johndale@cisco.com, vido@cesnet.cz,\n\tadrien.mazarguil@6wind.com, alejandro.lucero@netronome.com", "Cc": "dev@dpdk.org", "Date": "Mon, 14 Mar 2016 22:55:46 +0100", "Message-Id": "<1457992546-32230-9-git-send-email-thomas.monjalon@6wind.com>", "X-Mailer": "git-send-email 2.7.0", "In-Reply-To": "<1457992546-32230-1-git-send-email-thomas.monjalon@6wind.com>", "References": "<1456793151-1475-1-git-send-email-marcdevel@gmail.com>\n\t<1457992546-32230-1-git-send-email-thomas.monjalon@6wind.com>", "Subject": "[dpdk-dev] [PATCH v10 8/8] ethdev: add 100G link speed", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "patches and discussions about DPDK <dev.dpdk.org>", "List-Unsubscribe": "<http://dpdk.org/ml/options/dev>,\n\t<mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://dpdk.org/ml/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<http://dpdk.org/ml/listinfo/dev>,\n\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "The link speed configuration is now done with bitmaps so 100G speed\nrequires only a new bit flag.\nThe actual link speed is a number so its size must be increased from\n16-bit to 32-bit.\n\nSigned-off-by: Marc Sune <marcdevel@gmail.com>\nTested-by: Nelio Laranjeiro <nelio.laranjeiro@6wind.com>\nSigned-off-by: Thomas Monjalon <thomas.monjalon@6wind.com>\n---\n app/test-pmd/cmdline.c | 12 +++++++-----\n doc/guides/rel_notes/release_16_04.rst | 5 +++++\n doc/guides/testpmd_app_ug/testpmd_funcs.rst | 2 +-\n drivers/net/fm10k/fm10k_ethdev.c | 2 +-\n drivers/net/mlx5/mlx5_ethdev.c | 2 +-\n drivers/net/nfp/nfp_net.c | 2 +-\n drivers/net/szedata2/rte_eth_szedata2.c | 1 +\n lib/librte_ether/rte_ethdev.c | 2 ++\n lib/librte_ether/rte_ethdev.h | 4 +++-\n 9 files changed, 22 insertions(+), 10 deletions(-)", "diff": "diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c\nindex 3bc7bb4..3337b7b 100644\n--- a/app/test-pmd/cmdline.c\n+++ b/app/test-pmd/cmdline.c\n@@ -549,7 +549,7 @@ static void cmd_help_long_parsed(void *parsed_result,\n \t\t\t\" Detach physical or virtual dev by port_id\\n\\n\"\n \n \t\t\t\"port config (port_id|all)\"\n-\t\t\t\" speed (10|100|1000|10000|40000|auto)\"\n+\t\t\t\" speed (10|100|1000|10000|40000|100000|auto)\"\n \t\t\t\" duplex (half|full|auto)\\n\"\n \t\t\t\" Set speed and duplex for all ports or port_id\\n\\n\"\n \n@@ -1017,6 +1017,8 @@ parse_and_check_speed_duplex(char *speedstr, char *duplexstr, uint32_t *speed)\n \t\t\t*speed = ETH_LINK_SPEED_10G;\n \t\t} else if (!strcmp(speedstr, \"40000\")) {\n \t\t\t*speed = ETH_LINK_SPEED_40G;\n+\t\t} else if (!strcmp(speedstr, \"100000\")) {\n+\t\t\t*speed = ETH_LINK_SPEED_100G;\n \t\t} else if (!strcmp(speedstr, \"auto\")) {\n \t\t\t*speed = ETH_LINK_SPEED_AUTONEG;\n \t\t} else {\n@@ -1064,7 +1066,7 @@ cmdline_parse_token_string_t cmd_config_speed_all_item1 =\n \tTOKEN_STRING_INITIALIZER(struct cmd_config_speed_all, item1, \"speed\");\n cmdline_parse_token_string_t cmd_config_speed_all_value1 =\n \tTOKEN_STRING_INITIALIZER(struct cmd_config_speed_all, value1,\n-\t\t\t\t\t\t\"10#100#1000#10000#40000#auto\");\n+\t\t\t\t\t\t\"10#100#1000#10000#40000#100000#auto\");\n cmdline_parse_token_string_t cmd_config_speed_all_item2 =\n \tTOKEN_STRING_INITIALIZER(struct cmd_config_speed_all, item2, \"duplex\");\n cmdline_parse_token_string_t cmd_config_speed_all_value2 =\n@@ -1074,7 +1076,7 @@ cmdline_parse_token_string_t cmd_config_speed_all_value2 =\n cmdline_parse_inst_t cmd_config_speed_all = {\n \t.f = cmd_config_speed_all_parsed,\n \t.data = NULL,\n-\t.help_str = \"port config all speed 10|100|1000|10000|40000|auto duplex \"\n+\t.help_str = \"port config all speed 10|100|1000|10000|40000|100000|auto duplex \"\n \t\t\t\t\t\t\t\"half|full|auto\",\n \t.tokens = {\n \t\t(void *)&cmd_config_speed_all_port,\n@@ -1138,7 +1140,7 @@ cmdline_parse_token_string_t cmd_config_speed_specific_item1 =\n \t\t\t\t\t\t\t\t\"speed\");\n cmdline_parse_token_string_t cmd_config_speed_specific_value1 =\n \tTOKEN_STRING_INITIALIZER(struct cmd_config_speed_specific, value1,\n-\t\t\t\t\t\t\"10#100#1000#10000#40000#auto\");\n+\t\t\t\t\t\t\"10#100#1000#10000#40000#100000#auto\");\n cmdline_parse_token_string_t cmd_config_speed_specific_item2 =\n \tTOKEN_STRING_INITIALIZER(struct cmd_config_speed_specific, item2,\n \t\t\t\t\t\t\t\t\"duplex\");\n@@ -1149,7 +1151,7 @@ cmdline_parse_token_string_t cmd_config_speed_specific_value2 =\n cmdline_parse_inst_t cmd_config_speed_specific = {\n \t.f = cmd_config_speed_specific_parsed,\n \t.data = NULL,\n-\t.help_str = \"port config X speed 10|100|1000|10000|40000|auto duplex \"\n+\t.help_str = \"port config X speed 10|100|1000|10000|40000|100000|auto duplex \"\n \t\t\t\t\t\t\t\"half|full|auto\",\n \t.tokens = {\n \t\t(void *)&cmd_config_speed_specific_port,\ndiff --git a/doc/guides/rel_notes/release_16_04.rst b/doc/guides/rel_notes/release_16_04.rst\nindex f6d00f5..4700899 100644\n--- a/doc/guides/rel_notes/release_16_04.rst\n+++ b/doc/guides/rel_notes/release_16_04.rst\n@@ -157,6 +157,11 @@ EAL\n Drivers\n ~~~~~~~\n \n+* **ethdev: Fixed overflow for 100Gbps.**\n+\n+ 100Gbps in Mbps (100000) was exceeding 16-bit max value of ``link_speed``\n+ in ``rte_eth_link``.\n+\n * **ethdev: Fixed byte order consistency between fdir flow and mask.**\n \n Fixed issue in ethdev library that the structure for setting\ndiff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst b/doc/guides/testpmd_app_ug/testpmd_funcs.rst\nindex efaf2b5..cb49495 100644\n--- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst\n+++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst\n@@ -1155,7 +1155,7 @@ port config - speed\n \n Set the speed and duplex mode for all ports or a specific port::\n \n- testpmd> port config (port_id|all) speed (10|100|1000|10000|auto) \\\n+ testpmd> port config (port_id|all) speed (10|100|1000|10000|40000|100000|auto) \\\n duplex (half|full|auto)\n \n port config - queues/descriptors\ndiff --git a/drivers/net/fm10k/fm10k_ethdev.c b/drivers/net/fm10k/fm10k_ethdev.c\nindex 4d8c6bf..b4a0523 100644\n--- a/drivers/net/fm10k/fm10k_ethdev.c\n+++ b/drivers/net/fm10k/fm10k_ethdev.c\n@@ -1336,7 +1336,7 @@ fm10k_dev_infos_get(struct rte_eth_dev *dev,\n \n \tdev_info->speed_capa = ETH_LINK_SPEED_1G | ETH_LINK_SPEED_2_5G |\n \t\t\tETH_LINK_SPEED_10G | ETH_LINK_SPEED_25G |\n-\t\t\tETH_LINK_SPEED_40G;\n+\t\t\tETH_LINK_SPEED_40G | ETH_LINK_SPEED_100G;\n }\n \n static int\ndiff --git a/drivers/net/mlx5/mlx5_ethdev.c b/drivers/net/mlx5/mlx5_ethdev.c\nindex 7494f69..6f82a3d 100644\n--- a/drivers/net/mlx5/mlx5_ethdev.c\n+++ b/drivers/net/mlx5/mlx5_ethdev.c\n@@ -525,7 +525,7 @@ mlx5_dev_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *info)\n \tinfo->reta_size = priv->ind_table_max_size;\n \tinfo->speed_capa = ETH_LINK_SPEED_1G | ETH_LINK_SPEED_10G |\n \t\t\tETH_LINK_SPEED_25G | ETH_LINK_SPEED_40G |\n-\t\t\tETH_LINK_SPEED_50G;\n+\t\t\tETH_LINK_SPEED_50G | ETH_LINK_SPEED_100G;\n \tpriv_unlock(priv);\n }\n \ndiff --git a/drivers/net/nfp/nfp_net.c b/drivers/net/nfp/nfp_net.c\nindex be1a364..00f0ce9 100644\n--- a/drivers/net/nfp/nfp_net.c\n+++ b/drivers/net/nfp/nfp_net.c\n@@ -1072,7 +1072,7 @@ nfp_net_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)\n \tdev_info->reta_size = NFP_NET_CFG_RSS_ITBL_SZ;\n \tdev_info->hash_key_size = NFP_NET_CFG_RSS_KEY_SZ;\n \n-\tdev_info->speed_capa = ETH_LINK_SPEED_50G;\n+\tdev_info->speed_capa = ETH_LINK_SPEED_50G | ETH_LINK_SPEED_100G;\n }\n \n static uint32_t\ndiff --git a/drivers/net/szedata2/rte_eth_szedata2.c b/drivers/net/szedata2/rte_eth_szedata2.c\nindex 38be554..fa7c09d 100644\n--- a/drivers/net/szedata2/rte_eth_szedata2.c\n+++ b/drivers/net/szedata2/rte_eth_szedata2.c\n@@ -1218,6 +1218,7 @@ eth_dev_info(struct rte_eth_dev *dev,\n \tdev_info->max_tx_queues = (uint16_t)internals->nb_tx_queues;\n \tdev_info->min_rx_bufsize = 0;\n \tdev_info->pci_dev = NULL;\n+\tdev_info->speed_capa = ETH_LINK_SPEED_100G;\n }\n \n static void\ndiff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.c\nindex 4594f41..ab39296 100644\n--- a/lib/librte_ether/rte_ethdev.c\n+++ b/lib/librte_ether/rte_ethdev.c\n@@ -888,6 +888,8 @@ rte_eth_speed_bitflag(uint32_t speed, int duplex)\n \t\treturn ETH_LINK_SPEED_50G;\n \tcase ETH_SPEED_NUM_56G:\n \t\treturn ETH_LINK_SPEED_56G;\n+\tcase ETH_SPEED_NUM_100G:\n+\t\treturn ETH_LINK_SPEED_100G;\n \tdefault:\n \t\treturn 0;\n \t}\ndiff --git a/lib/librte_ether/rte_ethdev.h b/lib/librte_ether/rte_ethdev.h\nindex 5e3bd04..e215d55 100644\n--- a/lib/librte_ether/rte_ethdev.h\n+++ b/lib/librte_ether/rte_ethdev.h\n@@ -259,6 +259,7 @@ struct rte_eth_stats {\n #define ETH_LINK_SPEED_40G (1 << 11) /**< 40 Gbps */\n #define ETH_LINK_SPEED_50G (1 << 12) /**< 50 Gbps */\n #define ETH_LINK_SPEED_56G (1 << 13) /**< 56 Gbps */\n+#define ETH_LINK_SPEED_100G (1 << 14) /**< 100 Gbps */\n \n /**\n * Ethernet numeric link speeds in Mbps\n@@ -275,12 +276,13 @@ struct rte_eth_stats {\n #define ETH_SPEED_NUM_40G 40000 /**< 40 Gbps */\n #define ETH_SPEED_NUM_50G 50000 /**< 50 Gbps */\n #define ETH_SPEED_NUM_56G 56000 /**< 56 Gbps */\n+#define ETH_SPEED_NUM_100G 100000 /**< 100 Gbps */\n \n /**\n * A structure used to retrieve link-level information of an Ethernet port.\n */\n struct rte_eth_link {\n-\tuint16_t link_speed; /**< ETH_SPEED_NUM_ */\n+\tuint32_t link_speed; /**< ETH_SPEED_NUM_ */\n \tuint16_t link_duplex : 1; /**< ETH_LINK_[HALF/FULL]_DUPLEX */\n \tuint16_t link_autoneg : 1; /**< ETH_LINK_SPEED_[AUTONEG/FIXED] */\n \tuint16_t link_status : 1; /**< ETH_LINK_[DOWN/UP] */\n", "prefixes": [ "dpdk-dev", "v10", "8/8" ] }{ "id": 11513, "url": "