Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/11865/?format=api
{ "id": 11865, "url": "http://patches.dpdk.org/api/patches/11865/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1459462351-1120-9-git-send-email-marcdevel@gmail.com/", "project": { "id": 1, "url": "http://patches.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": "<1459462351-1120-9-git-send-email-marcdevel@gmail.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1459462351-1120-9-git-send-email-marcdevel@gmail.com", "date": "2016-03-31T22:12:31", "name": "[dpdk-dev,v14,8/8] ethdev: add 100G link speed", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "8483b5ba4d369417a33fe5ccd9d15269107b6187", "submitter": { "id": 314, "url": "http://patches.dpdk.org/api/people/314/?format=api", "name": "Marc Sune", "email": "marcdevel@gmail.com" }, "delegate": null, "mbox": "http://patches.dpdk.org/project/dpdk/patch/1459462351-1120-9-git-send-email-marcdevel@gmail.com/mbox/", "series": [], "comments": "http://patches.dpdk.org/api/patches/11865/comments/", "check": "pending", "checks": "http://patches.dpdk.org/api/patches/11865/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 F304C9A9B;\n\tFri, 1 Apr 2016 00:12:55 +0200 (CEST)", "from mail-wm0-f68.google.com (mail-wm0-f68.google.com\n\t[74.125.82.68]) by dpdk.org (Postfix) with ESMTP id 510E69A99\n\tfor <dev@dpdk.org>; Fri, 1 Apr 2016 00:12:55 +0200 (CEST)", "by mail-wm0-f68.google.com with SMTP id p65so94966wmp.1\n\tfor <dev@dpdk.org>; Thu, 31 Mar 2016 15:12:55 -0700 (PDT)", "from localhost.localdomain\n\t(149.red-83-32-179.dynamicip.rima-tde.net. [83.32.179.149])\n\tby smtp.gmail.com with ESMTPSA id\n\tm13sm11495604wma.3.2016.03.31.15.12.53\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);\n\tThu, 31 Mar 2016 15:12:54 -0700 (PDT)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references;\n\tbh=gnsyq4w/KQEDcw6CHmxGCikxNSblPIVYHj9WtmULyjk=;\n\tb=WLpCyOgR/06s8qSBgbUTv97zN/xudn0dftzFwEIIGT7HJYnopPFwoO7Hz3+VzGa6kl\n\tDP2cLSJICbia4o1s4skHcf8e6z6hZVjdY3iRnZBKrt2SF6hFIzztRjQf4fs4YoTmaw1Q\n\tulEHjKgkAea6ARxat4/TpKIijbZFb4Ha7Jj6KZARlWkBtjRODEMXLaW270Q8avKgZ4Jy\n\t3YeETscKGownK7ZSdKBMQrfysXqN1gGgVuKYuyStG7B+zKRwo24z+rnYK+T8OpuTNRYP\n\tgHZkXORm+7ExJYCdEdkdyKV5yKQXj4Z0tRUjjq+t/hsqZC92vlvZIVliQBP5O3WesMH6\n\tFLuw==", "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=gnsyq4w/KQEDcw6CHmxGCikxNSblPIVYHj9WtmULyjk=;\n\tb=YpU8C4FD1zaKmxK43t2OVhidWV5zc/lFnwPD1/AwV/IEJL2qv7BRNlVo26gqTnqRDo\n\t8ayXq3+FAzBfNg78SijW/qD/l5IJCsHbIEwcMYEBhdKGFqSHAOQc+W5+VKKhgNkmhfds\n\tePDAot/ssHYtvFLaA6yK6b3HROj5U8GxfPc9N27s9pLhxqDeA3gIkhswYdrwAkYglNYD\n\tuIVPufzzSBTwqSU29kHA5j5RZdF4szf+B/W6kq5+gthOfKC+d9hjIlKf7wVK2rVE9QnB\n\tHdlvutb5sBueta+sFhm4ejeOYYDdK5YzNk+iMh6UzXlGwZOnAappQ6F/OUNc3/H/v0gk\n\tA6pw==", "X-Gm-Message-State": "AD7BkJIysOQa8TqQb+kDtJ6jaTpbpC6UsxHnS+Tgt7ZFfrnD/mON6slTDz43LeqtlJBByg==", "X-Received": "by 10.194.133.101 with SMTP id pb5mr5407446wjb.106.1459462375106;\n\tThu, 31 Mar 2016 15:12:55 -0700 (PDT)", "From": "Marc Sune <marcdevel@gmail.com>", "To": "Thomas Monjalon <thomas.monjalon@6wind.com>,\n\t\"Xu, Qian Q\" <qian.q.xu@intel.com>, \"Xing,\n\tBeilei\" <beilei.xing@intel.com>, \"dev@dpdk.org\" <dev@dpdk.org>,\n\t\"Ananyev, Konstantin\" <konstantin.ananyev@intel.com>,\n\t\"Lu, Wenzhuo\" <wenzhuo.lu@intel.com>,\n\t\"Richardson, Bruce\" <bruce.richardson@intel.com>,\n\t\"Glynn, Michael J\" <michael.j.glynn@intel.com>", "Cc": "Marc Sune <marcdevel@gmail.com>", "Date": "Fri, 1 Apr 2016 00:12:31 +0200", "Message-Id": "<1459462351-1120-9-git-send-email-marcdevel@gmail.com>", "X-Mailer": "git-send-email 2.1.4", "In-Reply-To": "<1459462351-1120-1-git-send-email-marcdevel@gmail.com>", "References": "<1458955640-22951-1-git-send-email-marcdevel@gmail.com>\n\t<1459462351-1120-1-git-send-email-marcdevel@gmail.com>", "Subject": "[dpdk-dev] [PATCH v14 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": "From: Thomas Monjalon <thomas.monjalon@6wind.com>\n\nThe 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>\nSigned-off-by: Thomas Monjalon <thomas.monjalon@6wind.com>\nTested-by: Nelio Laranjeiro <nelio.laranjeiro@6wind.com>\nTested-by: Matej Vido <vido@cesnet.cz>\n---\n app/test-pmd/cmdline.c | 12 +++++++-----\n doc/guides/nics/szedata2.rst | 6 ------\n doc/guides/rel_notes/release_16_04.rst | 5 +++++\n doc/guides/testpmd_app_ug/testpmd_funcs.rst | 2 +-\n drivers/net/ena/ena_ethdev.c | 3 ++-\n drivers/net/fm10k/fm10k_ethdev.c | 2 +-\n drivers/net/mlx5/mlx5_ethdev.c | 3 ++-\n drivers/net/nfp/nfp_net.c | 2 +-\n drivers/net/szedata2/rte_eth_szedata2.c | 9 ++-------\n lib/librte_ether/rte_ethdev.c | 2 ++\n lib/librte_ether/rte_ethdev.h | 4 +++-\n 11 files changed, 26 insertions(+), 24 deletions(-)", "diff": "diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c\nindex 741cac3..c5b9479 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@@ -1022,6 +1022,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@@ -1069,7 +1071,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@@ -1079,7 +1081,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@@ -1143,7 +1145,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@@ -1154,7 +1156,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/nics/szedata2.rst b/doc/guides/nics/szedata2.rst\nindex 77c15b3..741b400 100644\n--- a/doc/guides/nics/szedata2.rst\n+++ b/doc/guides/nics/szedata2.rst\n@@ -148,9 +148,3 @@ Example output:\n TX threshold registers: pthresh=0 hthresh=0 wthresh=0\n TX RS bit threshold=0 - TXQ flags=0x0\n testpmd>\n-\n-.. note::\n-\n- Link speed API currently supports speeds up to 40 Gbps.\n- Therefore there is used 10G constant for 100 Gbps cards until the link speed\n- API is not changed.\ndiff --git a/doc/guides/rel_notes/release_16_04.rst b/doc/guides/rel_notes/release_16_04.rst\nindex c891a55..a0fc02d 100644\n--- a/doc/guides/rel_notes/release_16_04.rst\n+++ b/doc/guides/rel_notes/release_16_04.rst\n@@ -320,6 +320,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 94fba6a..aed5e47 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/ena/ena_ethdev.c b/drivers/net/ena/ena_ethdev.c\nindex 4e403af..02af67a 100644\n--- a/drivers/net/ena/ena_ethdev.c\n+++ b/drivers/net/ena/ena_ethdev.c\n@@ -1177,7 +1177,8 @@ static void ena_infos_get(struct rte_eth_dev *dev,\n \t\t\tETH_LINK_SPEED_10G |\n \t\t\tETH_LINK_SPEED_25G |\n \t\t\tETH_LINK_SPEED_40G |\n-\t\t\tETH_LINK_SPEED_50G;\n+\t\t\tETH_LINK_SPEED_50G |\n+\t\t\tETH_LINK_SPEED_100G;\n \n \t/* Get supported features from HW */\n \trc = ena_com_get_dev_attr_feat(ena_dev, &feat);\ndiff --git a/drivers/net/fm10k/fm10k_ethdev.c b/drivers/net/fm10k/fm10k_ethdev.c\nindex 2be297a..c2d377f 100644\n--- a/drivers/net/fm10k/fm10k_ethdev.c\n+++ b/drivers/net/fm10k/fm10k_ethdev.c\n@@ -1415,7 +1415,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 #ifdef RTE_LIBRTE_FM10K_RX_OLFLAGS_ENABLE\ndiff --git a/drivers/net/mlx5/mlx5_ethdev.c b/drivers/net/mlx5/mlx5_ethdev.c\nindex beecc63..36b369e 100644\n--- a/drivers/net/mlx5/mlx5_ethdev.c\n+++ b/drivers/net/mlx5/mlx5_ethdev.c\n@@ -566,7 +566,8 @@ mlx5_dev_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *info)\n \t\t\tETH_LINK_SPEED_25G |\n \t\t\tETH_LINK_SPEED_40G |\n \t\t\tETH_LINK_SPEED_50G |\n-\t\t\tETH_LINK_SPEED_56G;\n+\t\t\tETH_LINK_SPEED_56G |\n+\t\t\tETH_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 dd033f4..bcf5fa9 100644\n--- a/drivers/net/nfp/nfp_net.c\n+++ b/drivers/net/nfp/nfp_net.c\n@@ -1062,7 +1062,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_40G;\n+\tdev_info->speed_capa = ETH_LINK_SPEED_40G | ETH_LINK_SPEED_100G;\n }\n \n static const uint32_t *\ndiff --git a/drivers/net/szedata2/rte_eth_szedata2.c b/drivers/net/szedata2/rte_eth_szedata2.c\nindex ee97a4e..78c43b0 100644\n--- a/drivers/net/szedata2/rte_eth_szedata2.c\n+++ b/drivers/net/szedata2/rte_eth_szedata2.c\n@@ -1036,6 +1036,7 @@ eth_dev_info(struct rte_eth_dev *dev,\n \tdev_info->max_rx_queues = internals->max_rx_queues;\n \tdev_info->max_tx_queues = internals->max_tx_queues;\n \tdev_info->min_rx_bufsize = 0;\n+\tdev_info->speed_capa = ETH_LINK_SPEED_100G;\n }\n \n static void\n@@ -1155,13 +1156,7 @@ eth_link_update(struct rte_eth_dev *dev,\n \t\tlink.link_speed = ETH_SPEED_NUM_40G;\n \t\tbreak;\n \tcase SZEDATA2_LINK_SPEED_100G:\n-\t\t/*\n-\t\t * TODO\n-\t\t * If link_speed value from rte_eth_link structure\n-\t\t * will be changed to support 100Gbps speed change\n-\t\t * this value to 100G.\n-\t\t */\n-\t\tlink.link_speed = ETH_SPEED_NUM_10G;\n+\t\tlink.link_speed = ETH_SPEED_NUM_100G;\n \t\tbreak;\n \tdefault:\n \t\tlink.link_speed = ETH_SPEED_NUM_10G;\ndiff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.c\nindex 695b475..fd49b26 100644\n--- a/lib/librte_ether/rte_ethdev.c\n+++ b/lib/librte_ether/rte_ethdev.c\n@@ -892,6 +892,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 1342b3a..37ddd51 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", "v14", "8/8" ] }