Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/75898/?format=api
{ "id": 75898, "url": "http://patches.dpdk.org/api/patches/75898/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20200825093116.26538-4-ophirmu@nvidia.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": "<20200825093116.26538-4-ophirmu@nvidia.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20200825093116.26538-4-ophirmu@nvidia.com", "date": "2020-08-25T09:31:06", "name": "[v2,03/13] net/mlx5: rename mlx5 enumeration REG_NONE", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "c53c5a7535337176e8f0741256953c8241a5dd9c", "submitter": { "id": 1908, "url": "http://patches.dpdk.org/api/people/1908/?format=api", "name": "Ophir Munk", "email": "ophirmu@nvidia.com" }, "delegate": { "id": 3268, "url": "http://patches.dpdk.org/api/users/3268/?format=api", "username": "rasland", "first_name": "Raslan", "last_name": "Darawsheh", "email": "rasland@nvidia.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20200825093116.26538-4-ophirmu@nvidia.com/mbox/", "series": [ { "id": 11773, "url": "http://patches.dpdk.org/api/series/11773/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=11773", "date": "2020-08-25T09:31:06", "name": "mlx5 PMD multi OS support - part #4", "version": 2, "mbox": "http://patches.dpdk.org/series/11773/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/75898/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/75898/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@inbox.dpdk.org", "Delivered-To": "patchwork@inbox.dpdk.org", "Received": [ "from dpdk.org (dpdk.org [92.243.14.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id A16B7A04B1;\n\tTue, 25 Aug 2020 11:31:31 +0200 (CEST)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 8595A1C1A4;\n\tTue, 25 Aug 2020 11:31:31 +0200 (CEST)", "from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129])\n by dpdk.org (Postfix) with ESMTP id A0ADA1C1AB\n for <dev@dpdk.org>; Tue, 25 Aug 2020 11:31:29 +0200 (CEST)", "from Internal Mail-Server by MTLPINE1 (envelope-from\n ophirmu@nvidia.com) with SMTP; 25 Aug 2020 12:31:25 +0300", "from nvidia.com (pegasus05.mtr.labs.mlnx [10.210.16.100])\n by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id 07P9VPMr030009;\n Tue, 25 Aug 2020 12:31:25 +0300" ], "From": "Ophir Munk <ophirmu@nvidia.com>", "To": "dev@dpdk.org", "Cc": "Ophir Munk <ophirmu@mellanox.com>", "Date": "Tue, 25 Aug 2020 09:31:06 +0000", "Message-Id": "<20200825093116.26538-4-ophirmu@nvidia.com>", "X-Mailer": "git-send-email 2.8.4", "In-Reply-To": "<20200825093116.26538-1-ophirmu@nvidia.com>", "References": "<20200820145028.4090-1-ophirmu@nvidia.com>\n <20200825093116.26538-1-ophirmu@nvidia.com>", "Subject": "[dpdk-dev] [PATCH v2 03/13] net/mlx5: rename mlx5 enumeration\n\tREG_NONE", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "From: Ophir Munk <ophirmu@mellanox.com>\n\nEnumerated variable REG_NONE (defined in mlx5_prm.h) is in conflict with\nWindows definition (winnt.h): #define REG_NONE ( 0ul ) // No value type\nTo enable mlx5 PMD Windows compilation - rename REG_NONE as REG_NON.\n\nSigned-off-by: Ophir Munk <ophirmu@mellanox.com>\nAcked-by: Matan Azrad <matan@mellanox.com>\n---\n drivers/common/mlx5/mlx5_prm.h | 2 +-\n drivers/net/mlx5/mlx5_flow.c | 22 +++++++++++-----------\n drivers/net/mlx5/mlx5_flow_dv.c | 8 ++++----\n 3 files changed, 16 insertions(+), 16 deletions(-)", "diff": "diff --git a/drivers/common/mlx5/mlx5_prm.h b/drivers/common/mlx5/mlx5_prm.h\nindex 69511bc..563e7c8 100644\n--- a/drivers/common/mlx5/mlx5_prm.h\n+++ b/drivers/common/mlx5/mlx5_prm.h\n@@ -539,7 +539,7 @@ enum mlx5_modification_field {\n #define MLX5_MREG_C_NUM (MLX5_MODI_META_REG_C_7 - MLX5_MODI_META_REG_C_0 + 1)\n \n enum modify_reg {\n-\tREG_NONE = 0,\n+\tREG_NON = 0,\n \tREG_A,\n \tREG_B,\n \tREG_C_0,\ndiff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c\nindex 7150173..9aad24e 100644\n--- a/drivers/net/mlx5/mlx5_flow.c\n+++ b/drivers/net/mlx5/mlx5_flow.c\n@@ -353,7 +353,7 @@ mlx5_flow_get_reg_id(struct rte_eth_dev *dev,\n \tcase MLX5_METADATA_FDB:\n \t\tswitch (config->dv_xmeta_en) {\n \t\tcase MLX5_XMETA_MODE_LEGACY:\n-\t\t\treturn REG_NONE;\n+\t\t\treturn REG_NON;\n \t\tcase MLX5_XMETA_MODE_META16:\n \t\t\treturn REG_C_0;\n \t\tcase MLX5_XMETA_MODE_META32:\n@@ -363,7 +363,7 @@ mlx5_flow_get_reg_id(struct rte_eth_dev *dev,\n \tcase MLX5_FLOW_MARK:\n \t\tswitch (config->dv_xmeta_en) {\n \t\tcase MLX5_XMETA_MODE_LEGACY:\n-\t\t\treturn REG_NONE;\n+\t\t\treturn REG_NON;\n \t\tcase MLX5_XMETA_MODE_META16:\n \t\t\treturn REG_C_1;\n \t\tcase MLX5_XMETA_MODE_META32:\n@@ -381,7 +381,7 @@ mlx5_flow_get_reg_id(struct rte_eth_dev *dev,\n \t\t\treturn priv->mtr_color_reg != REG_C_2 ? REG_C_2 :\n \t\t\t REG_C_3;\n \tcase MLX5_MTR_COLOR:\n-\t\tMLX5_ASSERT(priv->mtr_color_reg != REG_NONE);\n+\t\tMLX5_ASSERT(priv->mtr_color_reg != REG_NON);\n \t\treturn priv->mtr_color_reg;\n \tcase MLX5_COPY_MARK:\n \t\t/*\n@@ -404,7 +404,7 @@ mlx5_flow_get_reg_id(struct rte_eth_dev *dev,\n \t\t\treturn rte_flow_error_set(error, EINVAL,\n \t\t\t\t\t\t RTE_FLOW_ERROR_TYPE_ITEM,\n \t\t\t\t\t\t NULL, \"invalid tag id\");\n-\t\tif (config->flow_mreg_c[id + start_reg - REG_C_0] == REG_NONE)\n+\t\tif (config->flow_mreg_c[id + start_reg - REG_C_0] == REG_NON)\n \t\t\treturn rte_flow_error_set(error, ENOTSUP,\n \t\t\t\t\t\t RTE_FLOW_ERROR_TYPE_ITEM,\n \t\t\t\t\t\t NULL, \"unsupported tag id\");\n@@ -421,7 +421,7 @@ mlx5_flow_get_reg_id(struct rte_eth_dev *dev,\n \t\t\t\t\t\t RTE_FLOW_ERROR_TYPE_ITEM,\n \t\t\t\t\t\t\tNULL, \"invalid tag id\");\n \t\t\tif (config->flow_mreg_c\n-\t\t\t [id + 1 + start_reg - REG_C_0] != REG_NONE)\n+\t\t\t [id + 1 + start_reg - REG_C_0] != REG_NON)\n \t\t\t\treturn config->flow_mreg_c\n \t\t\t\t\t [id + 1 + start_reg - REG_C_0];\n \t\t\treturn rte_flow_error_set(error, ENOTSUP,\n@@ -459,7 +459,7 @@ mlx5_flow_ext_mreg_supported(struct rte_eth_dev *dev)\n \t * - reg_c's are preserved across different domain (FDB and NIC) on\n \t * packet loopback by flow lookup miss.\n \t */\n-\treturn config->flow_mreg_c[2] != REG_NONE;\n+\treturn config->flow_mreg_c[2] != REG_NON;\n }\n \n /**\n@@ -3011,7 +3011,7 @@ flow_mreg_add_copy_action(struct rte_eth_dev *dev, uint32_t mark_id,\n \t};\n \tstruct mlx5_flow_action_copy_mreg cp_mreg = {\n \t\t.dst = REG_B,\n-\t\t.src = REG_NONE,\n+\t\t.src = REG_NON,\n \t};\n \tstruct rte_flow_action_jump jump = {\n \t\t.group = MLX5_FLOW_MREG_ACT_TABLE_GROUP,\n@@ -3499,7 +3499,7 @@ flow_hairpin_split(struct rte_eth_dev *dev,\n \tactions_rx++;\n \tset_tag = (void *)actions_rx;\n \tset_tag->id = mlx5_flow_get_reg_id(dev, MLX5_HAIRPIN_RX, 0, NULL);\n-\tMLX5_ASSERT(set_tag->id > REG_NONE);\n+\tMLX5_ASSERT(set_tag->id > REG_NON);\n \tset_tag->data = *flow_id;\n \ttag_action->conf = set_tag;\n \t/* Create Tx item list. */\n@@ -3511,7 +3511,7 @@ flow_hairpin_split(struct rte_eth_dev *dev,\n \ttag_item = (void *)addr;\n \ttag_item->data = *flow_id;\n \ttag_item->id = mlx5_flow_get_reg_id(dev, MLX5_HAIRPIN_TX, 0, NULL);\n-\tMLX5_ASSERT(set_tag->id > REG_NONE);\n+\tMLX5_ASSERT(set_tag->id > REG_NON);\n \titem->spec = tag_item;\n \taddr += sizeof(struct mlx5_rte_flow_item_tag);\n \ttag_item = (void *)addr;\n@@ -4066,7 +4066,7 @@ flow_create_split_metadata(struct rte_eth_dev *dev,\n \t\t/* Internal PMD action to set register. */\n \t\tstruct mlx5_rte_flow_item_tag q_tag_spec = {\n \t\t\t.data = qrss_id,\n-\t\t\t.id = REG_NONE,\n+\t\t\t.id = REG_NON,\n \t\t};\n \t\tstruct rte_flow_item q_items[] = {\n \t\t\t{\n@@ -6236,7 +6236,7 @@ mlx5_flow_discover_mreg_c(struct rte_eth_dev *dev)\n \t\tflow_list_destroy(dev, NULL, flow_idx);\n \t}\n \tfor (; n < MLX5_MREG_C_NUM; ++n)\n-\t\tconfig->flow_mreg_c[n] = REG_NONE;\n+\t\tconfig->flow_mreg_c[n] = REG_NON;\n \treturn 0;\n }\n \ndiff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c\nindex dd35959..58358ce 100644\n--- a/drivers/net/mlx5/mlx5_flow_dv.c\n+++ b/drivers/net/mlx5/mlx5_flow_dv.c\n@@ -945,7 +945,7 @@ flow_dv_convert_action_modify_tcp_ack\n }\n \n static enum mlx5_modification_field reg_to_field[] = {\n-\t[REG_NONE] = MLX5_MODI_OUT_NONE,\n+\t[REG_NON] = MLX5_MODI_OUT_NONE,\n \t[REG_A] = MLX5_MODI_META_DATA_REG_A,\n \t[REG_B] = MLX5_MODI_META_DATA_REG_B,\n \t[REG_C_0] = MLX5_MODI_META_REG_C_0,\n@@ -985,7 +985,7 @@ flow_dv_convert_action_set_reg\n \t\treturn rte_flow_error_set(error, EINVAL,\n \t\t\t\t\t RTE_FLOW_ERROR_TYPE_ACTION, NULL,\n \t\t\t\t\t \"too many items to modify\");\n-\tMLX5_ASSERT(conf->id != REG_NONE);\n+\tMLX5_ASSERT(conf->id != REG_NON);\n \tMLX5_ASSERT(conf->id < RTE_DIM(reg_to_field));\n \tactions[i] = (struct mlx5_modification_cmd) {\n \t\t.action_type = MLX5_MODIFICATION_TYPE_SET,\n@@ -1035,7 +1035,7 @@ flow_dv_convert_action_set_tag\n \tret = mlx5_flow_get_reg_id(dev, MLX5_APP_TAG, conf->index, error);\n \tif (ret < 0)\n \t\treturn ret;\n-\tMLX5_ASSERT(ret != REG_NONE);\n+\tMLX5_ASSERT(ret != REG_NON);\n \tMLX5_ASSERT((unsigned int)ret < RTE_DIM(reg_to_field));\n \treg_type = reg_to_field[ret];\n \tMLX5_ASSERT(reg_type > 0);\n@@ -1558,7 +1558,7 @@ flow_dv_validate_item_tag(struct rte_eth_dev *dev,\n \tret = mlx5_flow_get_reg_id(dev, MLX5_APP_TAG, spec->index, error);\n \tif (ret < 0)\n \t\treturn ret;\n-\tMLX5_ASSERT(ret != REG_NONE);\n+\tMLX5_ASSERT(ret != REG_NON);\n \treturn 0;\n }\n \n", "prefixes": [ "v2", "03/13" ] }