Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/51035/?format=api
{ "id": 51035, "url": "https://patches.dpdk.org/api/patches/51035/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20190311070441.5501-7-qi.z.zhang@intel.com/", "project": { "id": 1, "url": "https://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": "<20190311070441.5501-7-qi.z.zhang@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20190311070441.5501-7-qi.z.zhang@intel.com", "date": "2019-03-11T07:04:09", "name": "[v3,06/38] net/ice/base: code clean", "commit_ref": null, "pull_url": null, "state": "changes-requested", "archived": true, "hash": "fdfe8bcad07054a26012d32a04b044ed68e84557", "submitter": { "id": 504, "url": "https://patches.dpdk.org/api/people/504/?format=api", "name": "Qi Zhang", "email": "qi.z.zhang@intel.com" }, "delegate": { "id": 1540, "url": "https://patches.dpdk.org/api/users/1540/?format=api", "username": "qzhan15", "first_name": "Qi", "last_name": "Zhang", "email": "qi.z.zhang@intel.com" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/20190311070441.5501-7-qi.z.zhang@intel.com/mbox/", "series": [ { "id": 3696, "url": "https://patches.dpdk.org/api/series/3696/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=3696", "date": "2019-03-11T07:04:03", "name": "ice share code update.", "version": 3, "mbox": "https://patches.dpdk.org/series/3696/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/51035/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/51035/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 [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id E9444548B;\n\tMon, 11 Mar 2019 08:03:07 +0100 (CET)", "from mga17.intel.com (mga17.intel.com [192.55.52.151])\n\tby dpdk.org (Postfix) with ESMTP id 88A264F9A\n\tfor <dev@dpdk.org>; Mon, 11 Mar 2019 08:03:05 +0100 (CET)", "from orsmga008.jf.intel.com ([10.7.209.65])\n\tby fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t11 Mar 2019 00:03:05 -0700", "from dpdk51.sh.intel.com ([10.67.110.160])\n\tby orsmga008.jf.intel.com with ESMTP; 11 Mar 2019 00:03:02 -0700" ], "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.58,467,1544515200\"; d=\"scan'208\";a=\"124386043\"", "From": "Qi Zhang <qi.z.zhang@intel.com>", "To": "wenzhuo.lu@intel.com,\n\tqiming.yang@intel.com", "Cc": "dev@dpdk.org, paul.m.stillwell.jr@intel.com, ferruh.yigit@intel.com,\n\tQi Zhang <qi.z.zhang@intel.com>", "Date": "Mon, 11 Mar 2019 15:04:09 +0800", "Message-Id": "<20190311070441.5501-7-qi.z.zhang@intel.com>", "X-Mailer": "git-send-email 2.13.6", "In-Reply-To": "<20190311070441.5501-1-qi.z.zhang@intel.com>", "References": "<20190228055650.25237-1-qi.z.zhang@intel.com>\n\t<20190311070441.5501-1-qi.z.zhang@intel.com>", "Subject": "[dpdk-dev] [PATCH v3 06/38] net/ice/base: code clean", "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\t<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\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "Remove unnecessary macro and data structure.\n\nSigned-off-by: Paul M Stillwell Jr <paul.m.stillwell.jr@intel.com>\nSigned-off-by: Qi Zhang <qi.z.zhang@intel.com>\n---\n drivers/net/ice/base/ice_adminq_cmd.h | 2 -\n drivers/net/ice/base/ice_flex_pipe.c | 2 -\n drivers/net/ice/base/ice_flow.c | 136 ----------------------------------\n drivers/net/ice/base/ice_type.h | 6 --\n 4 files changed, 146 deletions(-)", "diff": "diff --git a/drivers/net/ice/base/ice_adminq_cmd.h b/drivers/net/ice/base/ice_adminq_cmd.h\nindex feb980475..056a9fbef 100644\n--- a/drivers/net/ice/base/ice_adminq_cmd.h\n+++ b/drivers/net/ice/base/ice_adminq_cmd.h\n@@ -1930,8 +1930,6 @@ enum ice_adminq_opc {\n \tice_aqc_opc_move_sched_elems\t\t\t= 0x0408,\n \tice_aqc_opc_suspend_sched_elems\t\t\t= 0x0409,\n \tice_aqc_opc_resume_sched_elems\t\t\t= 0x040A,\n-\tice_aqc_opc_suspend_sched_traffic\t\t= 0x040B,\n-\tice_aqc_opc_resume_sched_traffic\t\t= 0x040C,\n \tice_aqc_opc_delete_sched_elems\t\t\t= 0x040F,\n \tice_aqc_opc_add_rl_profiles\t\t\t= 0x0410,\n \tice_aqc_opc_query_rl_profiles\t\t\t= 0x0411,\ndiff --git a/drivers/net/ice/base/ice_flex_pipe.c b/drivers/net/ice/base/ice_flex_pipe.c\nindex 66c47abda..2d23c36eb 100644\n--- a/drivers/net/ice/base/ice_flex_pipe.c\n+++ b/drivers/net/ice/base/ice_flex_pipe.c\n@@ -2247,8 +2247,6 @@ ice_find_dup_props_vsig(struct ice_hw *hw, enum ice_block blk,\n \tfor (i = 0; i < xlt2->count; i++) {\n \t\tif (xlt2->vsig_tbl[i].in_use &&\n \t\t ice_match_prop_lst(chs, &xlt2->vsig_tbl[i].prop_lst)) {\n-\t\t\t*vsig = (i | ((hw->pf_id << ICE_PF_NUM_S) &\n-\t\t\t\t ICE_PF_NUM_M));\n \t\t\t*vsig = ICE_VSIG_VALUE(i, hw->pf_id);\n \t\t\treturn ICE_SUCCESS;\n \t\t}\ndiff --git a/drivers/net/ice/base/ice_flow.c b/drivers/net/ice/base/ice_flow.c\nindex 574c927c4..03a324d49 100644\n--- a/drivers/net/ice/base/ice_flow.c\n+++ b/drivers/net/ice/base/ice_flow.c\n@@ -1554,142 +1554,6 @@ ice_flow_set_rss_seg_info(struct ice_flow_seg_info *segs, u64 hash_fields,\n \treturn ICE_SUCCESS;\n }\n \n-/* Mapping of AVF hash bit fields to an L3-L4 hash combination.\n- * As the ice_flow_avf_hdr_field represent individual bit shifts in a hash,\n- * convert its values to their appropriate flow L3, L4 values.\n- */\n-#define ICE_FLOW_AVF_RSS_IPV4_MASKS \\\n-\t(BIT_ULL(ICE_AVF_FLOW_FIELD_IPV4_OTHER) | \\\n-\t BIT_ULL(ICE_AVF_FLOW_FIELD_FRAG_IPV4))\n-#define ICE_FLOW_AVF_RSS_TCP_IPV4_MASKS \\\n-\t(BIT_ULL(ICE_AVF_FLOW_FIELD_IPV4_TCP_SYN_NO_ACK) | \\\n-\t BIT_ULL(ICE_AVF_FLOW_FIELD_IPV4_TCP))\n-#define ICE_FLOW_AVF_RSS_UDP_IPV4_MASKS \\\n-\t(BIT_ULL(ICE_AVF_FLOW_FIELD_UNICAST_IPV4_UDP) | \\\n-\t BIT_ULL(ICE_AVF_FLOW_FIELD_MULTICAST_IPV4_UDP) | \\\n-\t BIT_ULL(ICE_AVF_FLOW_FIELD_IPV4_UDP))\n-#define ICE_FLOW_AVF_RSS_ALL_IPV4_MASKS \\\n-\t(ICE_FLOW_AVF_RSS_TCP_IPV4_MASKS | ICE_FLOW_AVF_RSS_UDP_IPV4_MASKS | \\\n-\t ICE_FLOW_AVF_RSS_IPV4_MASKS | BIT_ULL(ICE_AVF_FLOW_FIELD_IPV4_SCTP))\n-\n-#define ICE_FLOW_AVF_RSS_IPV6_MASKS \\\n-\t(BIT_ULL(ICE_AVF_FLOW_FIELD_IPV6_OTHER) | \\\n-\t BIT_ULL(ICE_AVF_FLOW_FIELD_FRAG_IPV6))\n-#define ICE_FLOW_AVF_RSS_UDP_IPV6_MASKS \\\n-\t(BIT_ULL(ICE_AVF_FLOW_FIELD_UNICAST_IPV6_UDP) | \\\n-\t BIT_ULL(ICE_AVF_FLOW_FIELD_MULTICAST_IPV6_UDP) | \\\n-\t BIT_ULL(ICE_AVF_FLOW_FIELD_IPV6_UDP))\n-#define ICE_FLOW_AVF_RSS_TCP_IPV6_MASKS \\\n-\t(BIT_ULL(ICE_AVF_FLOW_FIELD_IPV6_TCP_SYN_NO_ACK) | \\\n-\t BIT_ULL(ICE_AVF_FLOW_FIELD_IPV6_TCP))\n-#define ICE_FLOW_AVF_RSS_ALL_IPV6_MASKS \\\n-\t(ICE_FLOW_AVF_RSS_TCP_IPV6_MASKS | ICE_FLOW_AVF_RSS_UDP_IPV6_MASKS | \\\n-\t ICE_FLOW_AVF_RSS_IPV6_MASKS | BIT_ULL(ICE_AVF_FLOW_FIELD_IPV6_SCTP))\n-\n-#define ICE_FLOW_MAX_CFG\t10\n-\n-/**\n- * ice_add_avf_rss_cfg - add an RSS configuration for AVF driver\n- * @hw: pointer to the hardware structure\n- * @vsi_handle: software VSI handle\n- * @avf_hash: hash bit fields (ICE_AVF_FLOW_FIELD_*) to configure\n- *\n- * This function will take the hash bitmap provided by the AVF driver via a\n- * message, convert it to ICE-compatible values, and configure RSS flow\n- * profiles.\n- */\n-enum ice_status\n-ice_add_avf_rss_cfg(struct ice_hw *hw, u16 vsi_handle, u64 avf_hash)\n-{\n-\tu64 added_cfg[ICE_FLOW_MAX_CFG], hash_flds;\n-\tenum ice_status status = ICE_SUCCESS;\n-\tu8 i, idx = 0;\n-\n-\tif (avf_hash == ICE_AVF_FLOW_FIELD_INVALID ||\n-\t !ice_is_vsi_valid(hw, vsi_handle))\n-\t\treturn ICE_ERR_PARAM;\n-\n-\t/* Make sure no unsupported bits are specified */\n-\tif (avf_hash & ~(ICE_FLOW_AVF_RSS_ALL_IPV4_MASKS |\n-\t\t\t ICE_FLOW_AVF_RSS_ALL_IPV6_MASKS))\n-\t\treturn ICE_ERR_CFG;\n-\n-\thash_flds = avf_hash;\n-\n-\t/* Always create an L3 RSS configuration for any L4 RSS configuration */\n-\tif (hash_flds & ICE_FLOW_AVF_RSS_ALL_IPV4_MASKS)\n-\t\thash_flds |= ICE_FLOW_AVF_RSS_IPV4_MASKS;\n-\n-\tif (hash_flds & ICE_FLOW_AVF_RSS_ALL_IPV6_MASKS)\n-\t\thash_flds |= ICE_FLOW_AVF_RSS_IPV6_MASKS;\n-\n-\t/* Create the corresponding RSS configuration for each valid hash bit */\n-\twhile (hash_flds) {\n-\t\tu64 rss_hash = ICE_HASH_INVALID;\n-\n-\t\tif (hash_flds & ICE_FLOW_AVF_RSS_ALL_IPV4_MASKS) {\n-\t\t\tif (hash_flds & ICE_FLOW_AVF_RSS_TCP_IPV4_MASKS) {\n-\t\t\t\trss_hash = ICE_FLOW_HASH_IPV4 |\n-\t\t\t\t\tICE_FLOW_HASH_TCP_PORT;\n-\t\t\t\thash_flds &= ~ICE_FLOW_AVF_RSS_TCP_IPV4_MASKS;\n-\t\t\t} else if (hash_flds &\n-\t\t\t\t ICE_FLOW_AVF_RSS_UDP_IPV4_MASKS) {\n-\t\t\t\trss_hash = ICE_FLOW_HASH_IPV4 |\n-\t\t\t\t\tICE_FLOW_HASH_UDP_PORT;\n-\t\t\t\thash_flds &= ~ICE_FLOW_AVF_RSS_UDP_IPV4_MASKS;\n-\t\t\t} else if (hash_flds &\n-\t\t\t\t BIT_ULL(ICE_AVF_FLOW_FIELD_IPV4_SCTP)) {\n-\t\t\t\trss_hash = ICE_FLOW_HASH_IPV4 |\n-\t\t\t\t\tICE_FLOW_HASH_SCTP_PORT;\n-\t\t\t\thash_flds &=\n-\t\t\t\t\t~BIT_ULL(ICE_AVF_FLOW_FIELD_IPV4_SCTP);\n-\t\t\t} else if (hash_flds & ICE_FLOW_AVF_RSS_IPV4_MASKS) {\n-\t\t\t\trss_hash = ICE_FLOW_HASH_IPV4;\n-\t\t\t\thash_flds &= ~ICE_FLOW_AVF_RSS_IPV4_MASKS;\n-\t\t\t}\n-\t\t} else if (hash_flds & ICE_FLOW_AVF_RSS_ALL_IPV6_MASKS) {\n-\t\t\tif (hash_flds & ICE_FLOW_AVF_RSS_TCP_IPV6_MASKS) {\n-\t\t\t\trss_hash = ICE_FLOW_HASH_IPV6 |\n-\t\t\t\t\tICE_FLOW_HASH_TCP_PORT;\n-\t\t\t\thash_flds &= ~ICE_FLOW_AVF_RSS_TCP_IPV6_MASKS;\n-\t\t\t} else if (hash_flds &\n-\t\t\t\t ICE_FLOW_AVF_RSS_UDP_IPV6_MASKS) {\n-\t\t\t\trss_hash = ICE_FLOW_HASH_IPV6 |\n-\t\t\t\t\tICE_FLOW_HASH_UDP_PORT;\n-\t\t\t\thash_flds &= ~ICE_FLOW_AVF_RSS_UDP_IPV6_MASKS;\n-\t\t\t} else if (hash_flds &\n-\t\t\t\t BIT_ULL(ICE_AVF_FLOW_FIELD_IPV6_SCTP)) {\n-\t\t\t\trss_hash = ICE_FLOW_HASH_IPV6 |\n-\t\t\t\t\tICE_FLOW_HASH_SCTP_PORT;\n-\t\t\t\thash_flds &=\n-\t\t\t\t\t~BIT_ULL(ICE_AVF_FLOW_FIELD_IPV6_SCTP);\n-\t\t\t} else if (hash_flds & ICE_FLOW_AVF_RSS_IPV6_MASKS) {\n-\t\t\t\trss_hash = ICE_FLOW_HASH_IPV6;\n-\t\t\t\thash_flds &= ~ICE_FLOW_AVF_RSS_IPV6_MASKS;\n-\t\t\t}\n-\t\t}\n-\n-\t\tif (rss_hash == ICE_HASH_INVALID)\n-\t\t\treturn ICE_ERR_OUT_OF_RANGE;\n-\n-\t\tstatus = ice_add_rss_cfg(hw, vsi_handle, rss_hash,\n-\t\t\t\t\t ICE_FLOW_SEG_HDR_NONE);\n-\t\tif (status)\n-\t\t\tbreak;\n-\t\tadded_cfg[idx++] = rss_hash;\n-\t}\n-\n-\t/* If status is not success, we must remove all hash configurations\n-\t * that were successfully added previously in this call for the vsi\n-\t */\n-\tif (status)\n-\t\tfor (i = 0; i < idx; i++)\n-\t\t\tice_rem_rss_cfg(hw, vsi_handle, added_cfg[i],\n-\t\t\t\t\tICE_FLOW_SEG_HDR_NONE);\n-\n-\treturn status;\n-}\n-\n /**\n * ice_rem_all_rss_vsi_ctx - remove all RSS configurations from VSI context\n * @hw: pointer to the hardware structure\ndiff --git a/drivers/net/ice/base/ice_type.h b/drivers/net/ice/base/ice_type.h\nindex 6bd73ed04..25d64477f 100644\n--- a/drivers/net/ice/base/ice_type.h\n+++ b/drivers/net/ice/base/ice_type.h\n@@ -733,12 +733,6 @@ struct ice_hw {\n \t/* tunneling info */\n \tstruct ice_tunnel_table tnl;\n \n-\t/* PTYPE group and XLT1 management */\n-#define ICE_MAX_PTGS\t256\n-\tstruct ice_ptg_entry ptg_tbl[ICE_BLK_COUNT][ICE_MAX_PTGS];\n-\n-#define ICE_XLT1_CNT\t1024\n-\tstruct ice_ptg_ptype xlt1_tbl[ICE_BLK_COUNT][ICE_XLT1_CNT];\n #define ICE_PKG_FILENAME\t\"package_file\"\n #define ICE_PKG_FILENAME_EXT\t\"pkg\"\n #define ICE_PKG_FILE_MAJ_VER\t1\n", "prefixes": [ "v3", "06/38" ] }