Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/71025/?format=api
{ "id": 71025, "url": "http://patches.dpdk.org/api/patches/71025/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20200609120001.35110-17-qi.z.zhang@intel.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": "<20200609120001.35110-17-qi.z.zhang@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20200609120001.35110-17-qi.z.zhang@intel.com", "date": "2020-06-09T11:59:25", "name": "[v2,16/52] net/ice/base: cleanup comment formatting", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "05f00e2817b6b1e503f3972365c21603cee04d87", "submitter": { "id": 504, "url": "http://patches.dpdk.org/api/people/504/?format=api", "name": "Qi Zhang", "email": "qi.z.zhang@intel.com" }, "delegate": { "id": 31221, "url": "http://patches.dpdk.org/api/users/31221/?format=api", "username": "yexl", "first_name": "xiaolong", "last_name": "ye", "email": "xiaolong.ye@intel.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20200609120001.35110-17-qi.z.zhang@intel.com/mbox/", "series": [ { "id": 10359, "url": "http://patches.dpdk.org/api/series/10359/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=10359", "date": "2020-06-09T11:59:09", "name": "net/ice: base code update", "version": 2, "mbox": "http://patches.dpdk.org/series/10359/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/71025/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/71025/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 0DFB3A0516;\n\tTue, 9 Jun 2020 13:58:59 +0200 (CEST)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id E27261BEC0;\n\tTue, 9 Jun 2020 13:56:56 +0200 (CEST)", "from mga18.intel.com (mga18.intel.com [134.134.136.126])\n by dpdk.org (Postfix) with ESMTP id 972301B13C\n for <dev@dpdk.org>; Tue, 9 Jun 2020 13:56:44 +0200 (CEST)", "from fmsmga005.fm.intel.com ([10.253.24.32])\n by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 09 Jun 2020 04:56:41 -0700", "from dpdk51.sh.intel.com ([10.67.111.82])\n by fmsmga005.fm.intel.com with ESMTP; 09 Jun 2020 04:56:32 -0700" ], "IronPort-SDR": [ "\n uNS2Jov/BeCJG27rfSH26hz5cXFrAIPICl04HL80a/rMzlaSNOmUcX2oau0aZ2BRwDJIjLfbB8\n oS6CssbteT0g==", "\n YNgW1sUHs76/35EQXQcMqyyvB0x/H8hl+C0O7e5pJgCVGL1pvu+/W4d0gbS3un2L9Y3UKL5HRc\n f7NPqRbcpznw==" ], "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.73,492,1583222400\"; d=\"scan'208\";a=\"473044086\"", "From": "Qi Zhang <qi.z.zhang@intel.com>", "To": "qiming.yang@intel.com", "Cc": "xiaolong.ye@intel.com, dev@dpdk.org, Qi Zhang <qi.z.zhang@intel.com>,\n Bruce Allan <bruce.w.allan@intel.com>,\n \"Paul M . Stillwell Jr\" <paul.m.stillwell.jr@intel.com>", "Date": "Tue, 9 Jun 2020 19:59:25 +0800", "Message-Id": "<20200609120001.35110-17-qi.z.zhang@intel.com>", "X-Mailer": "git-send-email 2.13.6", "In-Reply-To": "<20200609120001.35110-1-qi.z.zhang@intel.com>", "References": "<20200603024016.30636-1-qi.z.zhang@intel.com>\n <20200609120001.35110-1-qi.z.zhang@intel.com>", "Subject": "[dpdk-dev] [PATCH v2 16/52] net/ice/base: cleanup comment formatting", "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": "Add missing space between end of comment text and comment terminator,\nand remove unnecessary punctuation.\n\nSigned-off-by: Bruce Allan <bruce.w.allan@intel.com>\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_acl.c | 25 +++++++++---------\n drivers/net/ice/base/ice_acl_ctrl.c | 23 ++++++++--------\n drivers/net/ice/base/ice_adminq_cmd.h | 50 +++++++++++++++++++----------------\n drivers/net/ice/base/ice_bitops.h | 10 +++----\n drivers/net/ice/base/ice_common.c | 4 +--\n drivers/net/ice/base/ice_fdir.c | 3 +--\n drivers/net/ice/base/ice_flex_pipe.c | 12 ++++-----\n drivers/net/ice/base/ice_flow.c | 34 ++++++++++++------------\n drivers/net/ice/base/ice_flow.h | 4 +--\n drivers/net/ice/base/ice_sched.c | 17 ++++++------\n drivers/net/ice/base/ice_switch.c | 8 +++---\n drivers/net/ice/base/ice_switch.h | 3 +--\n drivers/net/ice/base/ice_type.h | 4 +--\n 13 files changed, 97 insertions(+), 100 deletions(-)", "diff": "diff --git a/drivers/net/ice/base/ice_acl.c b/drivers/net/ice/base/ice_acl.c\nindex 31244cb4b..fd12507d7 100644\n--- a/drivers/net/ice/base/ice_acl.c\n+++ b/drivers/net/ice/base/ice_acl.c\n@@ -123,7 +123,7 @@ ice_aq_program_acl_entry(struct ice_hw *hw, u8 tcam_idx, u16 entry_idx,\n * @buf: address of indirect data buffer\n * @cd: pointer to command details structure or NULL\n *\n- * Query ACL entry (direct 0x0C24)\n+ * Query ACL entry (direct 0x0C24)\n *\n * NOTE: Caller of this API to parse 'buf' appropriately since it contains\n * response (key and key invert)\n@@ -250,7 +250,7 @@ ice_aq_query_actpair(struct ice_hw *hw, u8 act_mem_idx, u16 act_entry_idx,\n * @hw: pointer to the HW struct\n * @cd: pointer to command details structure or NULL\n *\n- * ACL - de-allocate (direct 0x0C1A) resources. Used by SW to release all the\n+ * De-allocate ACL resources (direct 0x0C1A). Used by SW to release all the\n * resources allocated for it using a single command\n */\n enum ice_status ice_aq_dealloc_acl_res(struct ice_hw *hw, struct ice_sq_cd *cd)\n@@ -263,7 +263,7 @@ enum ice_status ice_aq_dealloc_acl_res(struct ice_hw *hw, struct ice_sq_cd *cd)\n }\n \n /**\n- * ice_acl_prof_aq_send - sending acl profile aq commands\n+ * ice_acl_prof_aq_send - sending ACL profile AQ commands\n * @hw: pointer to the HW struct\n * @opc: command opcode\n * @prof_id: profile ID\n@@ -294,7 +294,7 @@ ice_acl_prof_aq_send(struct ice_hw *hw, u16 opc, u8 prof_id,\n * @buf: ptr to buffer\n * @cd: pointer to command details structure or NULL\n *\n- * ACL - program ACL profile extraction (indirect 0x0C1D)\n+ * Program ACL profile extraction (indirect 0x0C1D)\n */\n enum ice_status\n ice_prgm_acl_prof_extrt(struct ice_hw *hw, u8 prof_id,\n@@ -312,7 +312,7 @@ ice_prgm_acl_prof_extrt(struct ice_hw *hw, u8 prof_id,\n * @buf: ptr to buffer (which will contain response of this command)\n * @cd: pointer to command details structure or NULL\n *\n- * ACL - query ACL profile (indirect 0x0C21)\n+ * Query ACL profile (indirect 0x0C21)\n */\n enum ice_status\n ice_query_acl_prof(struct ice_hw *hw, u8 prof_id,\n@@ -354,7 +354,7 @@ static enum ice_status ice_aq_acl_cntrs_chk_params(struct ice_acl_cntrs *cntrs)\n \t\t\tstatus = ICE_ERR_OUT_OF_RANGE;\n \t\tbreak;\n \tdefault:\n-\t\t/* Unspecified counter type - Invalid or error*/\n+\t\t/* Unspecified counter type - Invalid or error */\n \t\tstatus = ICE_ERR_PARAM;\n \t}\n \n@@ -367,7 +367,7 @@ static enum ice_status ice_aq_acl_cntrs_chk_params(struct ice_acl_cntrs *cntrs)\n * @cntrs: ptr to buffer describing input and output params\n * @cd: pointer to command details structure or NULL\n *\n- * ACL - allocate (indirect 0x0C16) counters. This function attempts to\n+ * Allocate ACL counters (indirect 0x0C16). This function attempts to\n * allocate a contiguous block of counters. In case of failures, caller can\n * attempt to allocate a smaller chunk. The allocation is considered\n * unsuccessful if returned counter value is invalid. In this case it returns\n@@ -410,8 +410,7 @@ ice_aq_alloc_acl_cntrs(struct ice_hw *hw, struct ice_acl_cntrs *cntrs,\n * @cntrs: ptr to buffer describing input and output params\n * @cd: pointer to command details structure or NULL\n *\n- * ACL - de-allocate (direct 0x0C17) counters.\n- * This function deallocate ACL counters.\n+ * De-allocate ACL counters (direct 0x0C17)\n */\n enum ice_status\n ice_aq_dealloc_acl_cntrs(struct ice_hw *hw, struct ice_acl_cntrs *cntrs,\n@@ -443,7 +442,7 @@ ice_aq_dealloc_acl_cntrs(struct ice_hw *hw, struct ice_acl_cntrs *cntrs,\n * @cntr_val: pointer to counter or packet counter value\n * @cd: pointer to command details structure or NULL\n *\n- * ACL - query ACL counter (direct 0x0C27)\n+ * Query ACL counter (direct 0x0C27)\n */\n enum ice_status\n ice_aq_query_acl_cntrs(struct ice_hw *hw, u8 bank, u16 index, u64 *cntr_val,\n@@ -478,7 +477,7 @@ ice_aq_query_acl_cntrs(struct ice_hw *hw, u8 bank, u16 index, u64 *cntr_val,\n * @buf: pointer to input buffer\n * @cd: pointer to command details structure or NULL\n *\n- * ACL - program ACL profile ranges (indirect 0x0C1E)\n+ * Program ACL profile ranges (indirect 0x0C1E)\n */\n enum ice_status\n ice_prog_acl_prof_ranges(struct ice_hw *hw, u8 prof_id,\n@@ -501,7 +500,7 @@ ice_prog_acl_prof_ranges(struct ice_hw *hw, u8 prof_id,\n * @buf: pointer to response buffer\n * @cd: pointer to command details structure or NULL\n *\n- * ACL - query ACL profile ranges (indirect 0x0C22)\n+ * Query ACL profile ranges (indirect 0x0C22)\n */\n enum ice_status\n ice_query_acl_prof_ranges(struct ice_hw *hw, u8 prof_id,\n@@ -571,7 +570,7 @@ ice_aq_dealloc_acl_scen(struct ice_hw *hw, u16 scen_id, struct ice_sq_cd *cd)\n /**\n * ice_aq_update_query_scen - update or query ACL scenario\n * @hw: pointer to the HW struct\n- * @opcode: aq command opcode for either query or update scenario\n+ * @opcode: AQ command opcode for either query or update scenario\n * @scen_id: scen_id to be updated or queried\n * @buf: address of indirect data buffer\n * @cd: pointer to command details structure or NULL\ndiff --git a/drivers/net/ice/base/ice_acl_ctrl.c b/drivers/net/ice/base/ice_acl_ctrl.c\nindex 39b399dd4..5310b9d9f 100644\n--- a/drivers/net/ice/base/ice_acl_ctrl.c\n+++ b/drivers/net/ice/base/ice_acl_ctrl.c\n@@ -12,6 +12,7 @@\n #define ICE_ACL_TBL_TCAM_ENTRY_IDX(e) ((e) % ICE_AQC_ACL_TCAM_DEPTH)\n \n #define ICE_ACL_SCEN_ENTRY_INVAL 0xFFFF\n+\n /**\n * ice_acl_init_entry\n * @scen: pointer to the scenario struct\n@@ -20,8 +21,7 @@\n */\n static void ice_acl_init_entry(struct ice_acl_scen *scen)\n {\n-\t/**\n-\t * low priority: start from the highest index, 25% of total entries\n+\t/* low priority: start from the highest index, 25% of total entries\n \t * normal priority: start from the highest index, 50% of total entries\n \t * high priority: start from the lowest index, 25% of total entries\n \t */\n@@ -44,8 +44,9 @@ static void ice_acl_init_entry(struct ice_acl_scen *scen)\n * Returns ICE_ACL_SCEN_ENTRY_INVAL if fails\n * Returns index on success\n */\n-static u16 ice_acl_scen_assign_entry_idx(struct ice_acl_scen *scen,\n-\t\t\t\t\t enum ice_acl_entry_prior prior)\n+static u16\n+ice_acl_scen_assign_entry_idx(struct ice_acl_scen *scen,\n+\t\t\t enum ice_acl_entry_prior prior)\n {\n \tu16 first_idx, last_idx, i;\n \ts8 step;\n@@ -198,7 +199,7 @@ static enum ice_status ice_acl_init_tbl(struct ice_hw *hw)\n \n /**\n * ice_acl_assign_act_mems_to_tcam\n- * @tbl: pointer to acl table structure\n+ * @tbl: pointer to ACL table structure\n * @cur_tcam: Index of current TCAM. Value = 0 to (ICE_AQC_ACL_SLICES - 1)\n * @cur_mem_idx: Index of current action memory bank. Value = 0 to\n *\t\t (ICE_AQC_MAX_ACTION_MEMORIES - 1)\n@@ -229,7 +230,7 @@ ice_acl_assign_act_mems_to_tcam(struct ice_acl_tbl *tbl, u8 cur_tcam,\n \n /**\n * ice_acl_divide_act_mems_to_tcams\n- * @tbl: pointer to acl table structure\n+ * @tbl: pointer to ACL table structure\n *\n * Figure out how to divide given action memory banks to given TCAMs. This\n * division is for SW book keeping. In the time when scenario is created,\n@@ -351,7 +352,7 @@ ice_acl_create_tbl(struct ice_hw *hw, struct ice_acl_tbl_params *params)\n \t\t\t\tCPU_TO_LE16(params->dep_tbls[i]);\n \t}\n \n-\t/* call the aq command to create the ACL table with these values */\n+\t/* call the AQ command to create the ACL table with these values */\n \tstatus = ice_aq_alloc_acl_tbl(hw, &tbl_alloc, NULL);\n \n \tif (status) {\n@@ -660,7 +661,7 @@ ice_acl_set_scen_chnk_msk(struct ice_aqc_acl_scen *scen_buf,\n \n /**\n * ice_acl_assign_act_mem_for_scen\n- * @tbl: pointer to acl table structure\n+ * @tbl: pointer to ACL table structure\n * @scen: pointer to the scenario struct\n * @scen_buf: pointer to the available space for the scenario\n * @current_tcam_idx: theoretical index of the TCAM that we associated those\n@@ -897,7 +898,7 @@ enum ice_status ice_acl_destroy_tbl(struct ice_hw *hw)\n \t\t}\n \t}\n \n-\t/* call the aq command to destroy the ACL table */\n+\t/* call the AQ command to destroy the ACL table */\n \tstatus = ice_aq_dealloc_acl_tbl(hw, hw->acl_tbl->id, &resp_buf, NULL);\n \n \tif (status) {\n@@ -1107,7 +1108,7 @@ ice_acl_rem_entry(struct ice_hw *hw, struct ice_acl_scen *scen, u16 entry_idx)\n \t\t\t\t\t\t NULL);\n \t\tif (status)\n \t\t\tice_debug(hw, ICE_DBG_ACL,\n-\t\t\t\t \"aq program acl entry failed status: %d\\n\",\n+\t\t\t\t \"AQ program ACL entry failed status: %d\\n\",\n \t\t\t\t status);\n \t}\n \n@@ -1164,7 +1165,7 @@ enum ice_status ice_acl_destroy_scen(struct ice_hw *hw, u16 scen_id)\n \t\t\t}\n \t\t}\n \n-\t/* Call the aq command to destroy the targeted scenario */\n+\t/* Call the AQ command to destroy the targeted scenario */\n \tstatus = ice_aq_dealloc_acl_scen(hw, scen_id, NULL);\n \n \tif (status) {\ndiff --git a/drivers/net/ice/base/ice_adminq_cmd.h b/drivers/net/ice/base/ice_adminq_cmd.h\nindex a5d689dc8..dec4c38cf 100644\n--- a/drivers/net/ice/base/ice_adminq_cmd.h\n+++ b/drivers/net/ice/base/ice_adminq_cmd.h\n@@ -533,7 +533,7 @@ struct ice_aqc_vsi_props {\n \tu8 q_opt_reserved[3];\n \t/* outer up section */\n \t__le32 outer_up_table; /* same structure and defines as ingress tbl */\n-\t/* acl section */\n+\t/* ACL section */\n \t__le16 acl_def_act;\n #define ICE_AQ_VSI_ACL_DEF_RX_PROF_S\t0\n #define ICE_AQ_VSI_ACL_DEF_RX_PROF_M\t(0xF << ICE_AQ_VSI_ACL_DEF_RX_PROF_S)\n@@ -675,7 +675,7 @@ struct ice_aqc_storm_cfg {\n \n #define ICE_MAX_NUM_RECIPES 64\n \n-/* Add/Get Recipe (indirect 0x0290/0x0292)*/\n+/* Add/Get Recipe (indirect 0x0290/0x0292) */\n struct ice_aqc_add_get_recipe {\n \t__le16 num_sub_recipes;\t/* Input in Add cmd, Output in Get cmd */\n \t__le16 return_index;\t/* Input, used for Get cmd only */\n@@ -2020,7 +2020,7 @@ struct ice_aqc_clear_fd_table {\n \tu8 reserved[12];\n };\n \n-/* ACL - allocate (indirect 0x0C10) table */\n+/* Allocate ACL table (indirect 0x0C10) */\n #define ICE_AQC_ACL_KEY_WIDTH\t\t40\n #define ICE_AQC_ACL_KEY_WIDTH_BYTES\t5\n #define ICE_AQC_ACL_TCAM_DEPTH\t\t512\n@@ -2065,9 +2065,9 @@ struct ice_aqc_acl_alloc_table_data {\n \t__le16 alloc_ids[ICE_AQC_MAX_CONCURRENT_ACL_TBL];\n };\n \n-/* ACL - deallocate (indirect 0x0C11) table\n- * ACL - allocate (indirect 0x0C12) action-pair\n- * ACL - deallocate (indirect 0x0C13) action-pair\n+/* Deallocate ACL table (indirect 0x0C11)\n+ * Allocate ACL action-pair (indirect 0x0C12)\n+ * Deallocate ACL action-pair (indirect 0x0C13)\n */\n \n /* Following structure is common and used in case of deallocation\n@@ -2126,7 +2126,7 @@ struct ice_aqc_acl_generic {\n \tu8 act_mem[ICE_AQC_MAX_ACTION_MEMORIES];\n };\n \n-/* ACL - allocate (indirect 0x0C14) scenario. This command doesn't have separate\n+/* Allocate ACL scenario (indirect 0x0C14). This command doesn't have separate\n * response buffer since original command buffer gets updated with\n * 'scen_id' in case of success\n */\n@@ -2144,7 +2144,7 @@ struct ice_aqc_acl_alloc_scen {\n \t__le32 addr_low;\n };\n \n-/* ACL - de-allocate (direct 0x0C15) scenario. This command doesn't need\n+/* De-allocate ACL scenario (direct 0x0C15). This command doesn't need\n * separate response buffer since nothing to be returned as a response\n * except status.\n */\n@@ -2153,8 +2153,9 @@ struct ice_aqc_acl_dealloc_scen {\n \tu8 reserved[14];\n };\n \n-/* ACL - update (direct 0x0C1B) scenario */\n-/* ACL - query (direct 0x0C23) scenario */\n+/* Update ACL scenario (direct 0x0C1B)\n+ * Query ACL scenario (direct 0x0C23)\n+ */\n struct ice_aqc_acl_update_query_scen {\n \t__le16 scen_id;\n \tu8 reserved[6];\n@@ -2202,7 +2203,7 @@ struct ice_aqc_acl_scen {\n \tu8 act_mem_cfg[ICE_AQC_MAX_ACTION_MEMORIES];\n };\n \n-/* ACL - allocate (indirect 0x0C16) counters */\n+/* Allocate ACL counters (indirect 0x0C16) */\n struct ice_aqc_acl_alloc_counters {\n \t/* Amount of contiguous counters requested. Min value is 1 and\n \t * max value is 255\n@@ -2253,7 +2254,7 @@ struct ice_aqc_acl_alloc_counters {\n \t} ops;\n };\n \n-/* ACL - de-allocate (direct 0x0C17) counters */\n+/* De-allocate ACL counters (direct 0x0C17) */\n struct ice_aqc_acl_dealloc_counters {\n \t/* first counter being released */\n \t__le16 first_counter;\n@@ -2266,15 +2267,16 @@ struct ice_aqc_acl_dealloc_counters {\n \tu8 reserved[10];\n };\n \n-/* ACL - de-allocate (direct 0x0C1A) resources. Used by SW to release all the\n+/* De-allocate ACL resources (direct 0x0C1A). Used by SW to release all the\n * resources allocated for it using a single command\n */\n struct ice_aqc_acl_dealloc_res {\n \tu8 reserved[16];\n };\n \n-/* ACL - program actionpair (indirect 0x0C1C) */\n-/* ACL - query actionpair (indirect 0x0C25) */\n+/* Program ACL actionpair (indirect 0x0C1C)\n+ * Query ACL actionpair (indirect 0x0C25)\n+ */\n struct ice_aqc_acl_actpair {\n \t/* action mem index to program/update */\n \tu8 act_mem_index;\n@@ -2349,10 +2351,11 @@ struct ice_aqc_acl_prof_generic_frmt {\n \tu8 pf_scenario_num[ICE_AQC_ACL_PROF_PF_SCEN_NUM_ELEMS];\n };\n \n-/* ACL - program ACL profile extraction (indirect 0x0C1D) */\n-/* ACL - program ACL profile ranges (indirect 0x0C1E) */\n-/* ACL - query ACL profile (indirect 0x0C21) */\n-/* ACL - query ACL profile ranges (indirect 0x0C22) */\n+/* Program ACL profile extraction (indirect 0x0C1D)\n+ * Program ACL profile ranges (indirect 0x0C1E)\n+ * Query ACL profile (indirect 0x0C21)\n+ * Query ACL profile ranges (indirect 0x0C22)\n+ */\n struct ice_aqc_acl_profile {\n \tu8 profile_id; /* Programmed/Updated profile ID */\n \tu8 reserved[7];\n@@ -2389,8 +2392,9 @@ struct ice_aqc_acl_profile_ranges {\n \tstruct ice_acl_rng_data checker_cfg[ICE_AQC_ACL_PROF_RANGES_NUM_CFG];\n };\n \n-/* ACL - program ACL entry (indirect 0x0C20) */\n-/* ACL - query ACL entry (indirect 0x0C24) */\n+/* Program ACL entry (indirect 0x0C20)\n+ * Query ACL entry (indirect 0x0C24)\n+ */\n struct ice_aqc_acl_entry {\n \tu8 tcam_index; /* Updated TCAM block index */\n \tu8 reserved;\n@@ -2414,7 +2418,7 @@ struct ice_aqc_acl_data {\n \t} entry_key, entry_key_invert;\n };\n \n-/* ACL - query ACL counter (direct 0x0C27) */\n+/* Query ACL counter (direct 0x0C27) */\n struct ice_aqc_acl_query_counter {\n \t/* Queried counter index */\n \t__le16 counter_index;\n@@ -2556,7 +2560,7 @@ struct ice_aqc_move_txqs_data {\n };\n \n /* Download Package (indirect 0x0C40) */\n-/* Also used for Update Package (indirect 0x0C42) */\n+/* Also used for Update Package (indirect 0x0C42 and 0x0C41) */\n struct ice_aqc_download_pkg {\n \tu8 flags;\n #define ICE_AQC_DOWNLOAD_PKG_LAST_BUF\t0x01\ndiff --git a/drivers/net/ice/base/ice_bitops.h b/drivers/net/ice/base/ice_bitops.h\nindex 87f47b238..3022116a4 100644\n--- a/drivers/net/ice/base/ice_bitops.h\n+++ b/drivers/net/ice/base/ice_bitops.h\n@@ -214,7 +214,7 @@ ice_or_bitmap(ice_bitmap_t *dst, const ice_bitmap_t *bmp1,\n \tice_bitmap_t mask;\n \tu16 i;\n \n-\t/* Handle all but last chunk*/\n+\t/* Handle all but last chunk */\n \tfor (i = 0; i < BITS_TO_CHUNKS(size) - 1; i++)\n \t\tdst[i] = bmp1[i] | bmp2[i];\n \n@@ -245,7 +245,7 @@ ice_xor_bitmap(ice_bitmap_t *dst, const ice_bitmap_t *bmp1,\n \tice_bitmap_t mask;\n \tu16 i;\n \n-\t/* Handle all but last chunk*/\n+\t/* Handle all but last chunk */\n \tfor (i = 0; i < BITS_TO_CHUNKS(size) - 1; i++)\n \t\tdst[i] = bmp1[i] ^ bmp2[i];\n \n@@ -276,7 +276,7 @@ ice_andnot_bitmap(ice_bitmap_t *dst, const ice_bitmap_t *bmp1,\n \tice_bitmap_t mask;\n \tu16 i;\n \n-\t/* Handle all but last chunk*/\n+\t/* Handle all but last chunk */\n \tfor (i = 0; i < BITS_TO_CHUNKS(size) - 1; i++)\n \t\tdst[i] = bmp1[i] & ~bmp2[i];\n \n@@ -389,12 +389,12 @@ ice_cmp_bitmap(ice_bitmap_t *bmp1, ice_bitmap_t *bmp2, u16 size)\n \tice_bitmap_t mask;\n \tu16 i;\n \n-\t/* Handle all but last chunk*/\n+\t/* Handle all but last chunk */\n \tfor (i = 0; i < BITS_TO_CHUNKS(size) - 1; i++)\n \t\tif (bmp1[i] != bmp2[i])\n \t\t\treturn false;\n \n-\t/* We want to only compare bits within the size.*/\n+\t/* We want to only compare bits within the size */\n \tmask = LAST_CHUNK_MASK(size);\n \tif ((bmp1[i] & mask) != (bmp2[i] & mask))\n \t\treturn false;\ndiff --git a/drivers/net/ice/base/ice_common.c b/drivers/net/ice/base/ice_common.c\nindex e266ba56c..908ef9085 100644\n--- a/drivers/net/ice/base/ice_common.c\n+++ b/drivers/net/ice/base/ice_common.c\n@@ -747,7 +747,6 @@ enum ice_status ice_init_hw(struct ice_hw *hw)\n \t/* Initialize max burst size */\n \tif (!hw->max_burst_size)\n \t\tice_cfg_rl_burst_size(hw, ICE_SCHED_DFLT_BURST_SIZE);\n-\n \tstatus = ice_init_fltr_mgmt_struct(hw);\n \tif (status)\n \t\tgoto err_unroll_sched;\n@@ -1901,6 +1900,7 @@ ice_parse_caps(struct ice_hw *hw, void *buf, u32 cap_count,\n \t\t\t}\n \t\t\tif (func_p) {\n \t\t\t\tu32 reg_val, val;\n+\n \t\t\t\tif (hw->dcf_enabled)\n \t\t\t\t\tbreak;\n \t\t\t\treg_val = rd32(hw, GLQF_FD_SIZE);\n@@ -2611,7 +2611,7 @@ ice_set_fc(struct ice_port_info *pi, u8 *aq_failures, bool ena_auto_link_update)\n \n \tice_copy_phy_caps_to_cfg(pi, pcaps, &cfg);\n \n-\t/* Configure the set phy data */\n+\t/* Configure the set PHY data */\n \tstatus = ice_cfg_phy_fc(pi, &cfg, pi->fc.req_mode);\n \tif (status) {\n \t\tif (status != ICE_ERR_BAD_PTR)\ndiff --git a/drivers/net/ice/base/ice_fdir.c b/drivers/net/ice/base/ice_fdir.c\nindex 2257eba60..0155597bc 100644\n--- a/drivers/net/ice/base/ice_fdir.c\n+++ b/drivers/net/ice/base/ice_fdir.c\n@@ -495,7 +495,7 @@ ice_fdir_get_prgm_desc(struct ice_hw *hw, struct ice_fdir_fltr *input,\n \t\tfdir_fltr_ctx.toq_prio = 0;\n \telse\n \t\tfdir_fltr_ctx.toq_prio = 3;\n-\tfdir_fltr_ctx.pcmd = (add) ? ICE_FXD_FLTR_QW1_PCMD_ADD :\n+\tfdir_fltr_ctx.pcmd = add ? ICE_FXD_FLTR_QW1_PCMD_ADD :\n \t\tICE_FXD_FLTR_QW1_PCMD_REMOVE;\n \tfdir_fltr_ctx.swap = ICE_FXD_FLTR_QW1_SWAP_NOT_SET;\n \tfdir_fltr_ctx.comp_q = ICE_FXD_FLTR_QW0_COMP_Q_ZERO;\n@@ -684,7 +684,6 @@ static void ice_pkt_insert_u32(u8 *pkt, int offset, __be32 data)\n /**\n * ice_pkt_insert_mac_addr - insert a MAC addr into a memory buffer.\n * @pkt: packet buffer\n- * @offset: offset into buffer\n * @addr: MAC address to convert and insert into pkt at offset\n */\n static void ice_pkt_insert_mac_addr(u8 *pkt, u8 *addr)\ndiff --git a/drivers/net/ice/base/ice_flex_pipe.c b/drivers/net/ice/base/ice_flex_pipe.c\nindex 1f7a05969..9703b239b 100644\n--- a/drivers/net/ice/base/ice_flex_pipe.c\n+++ b/drivers/net/ice/base/ice_flex_pipe.c\n@@ -648,7 +648,7 @@ static bool ice_bits_max_set(const u8 *mask, u16 size, u16 max)\n * This function generates a key from a value, a don't care mask and a never\n * match mask.\n * upd, dc, and nm are optional parameters, and can be NULL:\n- *\tupd == NULL --> udp mask is all 1's (update all bits)\n+ *\tupd == NULL --> upd mask is all 1's (update all bits)\n *\tdc == NULL --> dc mask is all 0's (no don't care bits)\n *\tnm == NULL --> nm mask is all 0's (no never match bits)\n */\n@@ -2738,7 +2738,7 @@ ice_vsig_add_mv_vsi(struct ice_hw *hw, enum ice_block blk, u16 vsi, u16 vsig)\n * @blk: HW block\n * @prof: profile to check\n * @idx: profile index to check\n- * @masks: masks to match\n+ * @mask: mask to match\n */\n static bool\n ice_prof_has_mask_idx(struct ice_hw *hw, enum ice_block blk, u8 prof, u16 idx,\n@@ -3264,7 +3264,6 @@ static void ice_shutdown_prof_masks(struct ice_hw *hw, enum ice_block blk)\n /**\n * ice_shutdown_all_prof_masks - releases all locks for masking\n * @hw: pointer to the HW struct\n- * @blk: hardware block\n *\n * This should be called before unloading the driver\n */\n@@ -3279,12 +3278,11 @@ void ice_shutdown_all_prof_masks(struct ice_hw *hw)\n * @hw: pointer to the HW struct\n * @blk: hardware block\n * @prof_id: profile ID\n- * @es: field vector\n * @masks: masks\n */\n static enum ice_status\n ice_update_prof_masking(struct ice_hw *hw, enum ice_block blk, u16 prof_id,\n-\t\t\tstruct ice_fv_word *es, u16 *masks)\n+\t\t\tu16 *masks)\n {\n \tbool err = false;\n \tu32 ena_mask = 0;\n@@ -3986,7 +3984,7 @@ ice_prof_gen_key(struct ice_hw *hw, enum ice_block blk, u8 ptg, u16 vsig,\n * @prof_id: profile ID\n * @ptg: packet type group (PTG) portion of key\n * @vsig: VSIG portion of key\n- * @cdid: CDID: portion of key\n+ * @cdid: CDID portion of key\n * @flags: flag portion of key\n * @vl_msk: valid mask\n * @dc_msk: don't care mask\n@@ -4628,7 +4626,7 @@ ice_add_prof(struct ice_hw *hw, enum ice_block blk, u64 id, u8 ptypes[],\n \t\t\tif (status)\n \t\t\t\tgoto err_ice_add_prof;\n \t\t}\n-\t\tstatus = ice_update_prof_masking(hw, blk, prof_id, es, masks);\n+\t\tstatus = ice_update_prof_masking(hw, blk, prof_id, masks);\n \t\tif (status)\n \t\t\tgoto err_ice_add_prof;\n \ndiff --git a/drivers/net/ice/base/ice_flow.c b/drivers/net/ice/base/ice_flow.c\nindex 90302a6cb..00f58697f 100644\n--- a/drivers/net/ice/base/ice_flow.c\n+++ b/drivers/net/ice/base/ice_flow.c\n@@ -1489,13 +1489,13 @@ ice_dealloc_flow_entry(struct ice_hw *hw, struct ice_flow_entry *entry)\n #define ICE_ACL_INVALID_SCEN\t0x3f\n \n /**\n- * ice_flow_acl_is_prof_in_use - Verify if the profile is associated to any pf\n+ * ice_flow_acl_is_prof_in_use - Verify if the profile is associated to any PF\n * @hw: pointer to the hardware structure\n * @prof: pointer to flow profile\n- * @buf: destination buffer function writes partial xtrct sequence to\n+ * @buf: destination buffer function writes partial extraction sequence to\n *\n- * returns ICE_SUCCESS if no pf is associated to the given profile\n- * returns ICE_ERR_IN_USE if at least one pf is associated to the given profile\n+ * returns ICE_SUCCESS if no PF is associated to the given profile\n+ * returns ICE_ERR_IN_USE if at least one PF is associated to the given profile\n * returns other error code for real error\n */\n static enum ice_status\n@@ -1513,7 +1513,7 @@ ice_flow_acl_is_prof_in_use(struct ice_hw *hw, struct ice_flow_prof *prof,\n \tif (status)\n \t\treturn status;\n \n-\t/* If all pf's associated scenarios are all 0 or all\n+\t/* If all PF's associated scenarios are all 0 or all\n \t * ICE_ACL_INVALID_SCEN (63) for the given profile then the latter has\n \t * not been configured yet.\n \t */\n@@ -1537,7 +1537,7 @@ ice_flow_acl_is_prof_in_use(struct ice_hw *hw, struct ice_flow_prof *prof,\n }\n \n /**\n- * ice_flow_acl_free_act_cntr - Free the acl rule's actions\n+ * ice_flow_acl_free_act_cntr - Free the ACL rule's actions\n * @hw: pointer to the hardware structure\n * @acts: array of actions to be performed on a match\n * @acts_cnt: number of actions\n@@ -1575,11 +1575,11 @@ ice_flow_acl_free_act_cntr(struct ice_hw *hw, struct ice_flow_action *acts,\n }\n \n /**\n- * ice_flow_acl_disassoc_scen - Disassociate the scenario to the Profile\n+ * ice_flow_acl_disassoc_scen - Disassociate the scenario from the profile\n * @hw: pointer to the hardware structure\n * @prof: pointer to flow profile\n *\n- * Disassociate the scenario to the Profile for the PF of the VSI.\n+ * Disassociate the scenario from the profile for the PF of the VSI.\n */\n static enum ice_status\n ice_flow_acl_disassoc_scen(struct ice_hw *hw, struct ice_flow_prof *prof)\n@@ -1598,7 +1598,7 @@ ice_flow_acl_disassoc_scen(struct ice_hw *hw, struct ice_flow_prof *prof)\n \tif (status)\n \t\treturn status;\n \n-\t/* Clear scenario for this pf */\n+\t/* Clear scenario for this PF */\n \tbuf.pf_scenario_num[hw->pf_id] = ICE_ACL_INVALID_SCEN;\n \tstatus = ice_prgm_acl_prof_extrt(hw, prof_id, &buf, NULL);\n \n@@ -1773,7 +1773,7 @@ ice_flow_rem_prof_sync(struct ice_hw *hw, enum ice_block blk,\n \t\tstruct ice_aqc_acl_prof_generic_frmt buf;\n \t\tu8 prof_id = 0;\n \n-\t\t/* Deassociate the scenario to the Profile for the PF */\n+\t\t/* Disassociate the scenario from the profile for the PF */\n \t\tstatus = ice_flow_acl_disassoc_scen(hw, prof);\n \t\tif (status)\n \t\t\treturn status;\n@@ -2140,11 +2140,11 @@ u64 ice_flow_find_entry(struct ice_hw *hw, enum ice_block blk, u64 entry_id)\n }\n \n /**\n- * ice_flow_acl_check_actions - Checks the acl rule's actions\n+ * ice_flow_acl_check_actions - Checks the ACL rule's actions\n * @hw: pointer to the hardware structure\n * @acts: array of actions to be performed on a match\n * @acts_cnt: number of actions\n- * @cnt_alloc: indicates if a ACL counter has been allocated.\n+ * @cnt_alloc: indicates if an ACL counter has been allocated.\n */\n static enum ice_status\n ice_flow_acl_check_actions(struct ice_hw *hw, struct ice_flow_action *acts,\n@@ -2203,7 +2203,7 @@ ice_flow_acl_check_actions(struct ice_hw *hw, struct ice_flow_action *acts,\n }\n \n /**\n- * ice_flow_acl_frmt_entry_range - Format an acl range checker for a given field\n+ * ice_flow_acl_frmt_entry_range - Format an ACL range checker for a given field\n * @fld: number of the given field\n * @info: info about field\n * @range_buf: range checker configuration buffer\n@@ -2244,7 +2244,7 @@ ice_flow_acl_frmt_entry_range(u16 fld, struct ice_flow_fld_info *info,\n }\n \n /**\n- * ice_flow_acl_frmt_entry_fld - Partially format acl entry for a given field\n+ * ice_flow_acl_frmt_entry_fld - Partially format ACL entry for a given field\n * @fld: number of the given field\n * @info: info about the field\n * @buf: buffer containing the entry\n@@ -2316,7 +2316,7 @@ ice_flow_acl_frmt_entry_fld(u16 fld, struct ice_flow_fld_info *info, u8 *buf,\n }\n \n /**\n- * ice_flow_acl_frmt_entry - Format acl entry\n+ * ice_flow_acl_frmt_entry - Format ACL entry\n * @hw: pointer to the hardware structure\n * @prof: pointer to flow profile\n * @e: pointer to the flow entry\n@@ -2326,7 +2326,7 @@ ice_flow_acl_frmt_entry_fld(u16 fld, struct ice_flow_fld_info *info, u8 *buf,\n *\n * Formats the key (and key_inverse) to be matched from the data passed in,\n * along with data from the flow profile. This key/key_inverse pair makes up\n- * the 'entry' for an acl flow entry.\n+ * the 'entry' for an ACL flow entry.\n */\n static enum ice_status\n ice_flow_acl_frmt_entry(struct ice_hw *hw, struct ice_flow_prof *prof,\n@@ -3447,7 +3447,7 @@ ice_add_rss_cfg_sync(struct ice_hw *hw, u16 vsi_handle, u64 hashed_flds,\n \t}\n \n \t/* Check if a flow profile exists with the same protocol headers and\n-\t * associated with the input VSI. If so disasscociate the VSI from\n+\t * associated with the input VSI. If so disassociate the VSI from\n \t * this profile. The VSI will be added to a new profile created with\n \t * the protocol header and new hash field configuration.\n \t */\ndiff --git a/drivers/net/ice/base/ice_flow.h b/drivers/net/ice/base/ice_flow.h\nindex 9fb60a6d2..93043acc8 100644\n--- a/drivers/net/ice/base/ice_flow.h\n+++ b/drivers/net/ice/base/ice_flow.h\n@@ -471,8 +471,8 @@ ice_flow_add_entry(struct ice_hw *hw, enum ice_block blk, u64 prof_id,\n \t\t u64 entry_id, u16 vsi, enum ice_flow_priority prio,\n \t\t void *data, struct ice_flow_action *acts, u8 acts_cnt,\n \t\t u64 *entry_h);\n-enum ice_status ice_flow_rem_entry(struct ice_hw *hw, enum ice_block blk,\n-\t\t\t\t u64 entry_h);\n+enum ice_status\n+ice_flow_rem_entry(struct ice_hw *hw, enum ice_block blk, u64 entry_h);\n void\n ice_flow_set_fld(struct ice_flow_seg_info *seg, enum ice_flow_field fld,\n \t\t u16 val_loc, u16 mask_loc, u16 last_loc, bool range);\ndiff --git a/drivers/net/ice/base/ice_sched.c b/drivers/net/ice/base/ice_sched.c\nindex af42fadfe..0a46dd40b 100644\n--- a/drivers/net/ice/base/ice_sched.c\n+++ b/drivers/net/ice/base/ice_sched.c\n@@ -171,7 +171,7 @@ ice_sched_add_node(struct ice_port_info *pi, u8 layer,\n \t\treturn ICE_ERR_PARAM;\n \t}\n \n-\t/* query the current node information from FW before additing it\n+\t/* query the current node information from FW before adding it\n \t * to the SW DB\n \t */\n \tstatus = ice_sched_query_elem(hw, LE32_TO_CPU(info->node_teid), &elem);\n@@ -599,14 +599,14 @@ ice_alloc_lan_q_ctx(struct ice_hw *hw, u16 vsi_handle, u8 tc, u16 new_numqs)\n /**\n * ice_aq_rl_profile - performs a rate limiting task\n * @hw: pointer to the HW struct\n- * @opcode:opcode for add, query, or remove profile(s)\n+ * @opcode: opcode for add, query, or remove profile(s)\n * @num_profiles: the number of profiles\n * @buf: pointer to buffer\n * @buf_size: buffer size in bytes\n * @num_processed: number of processed add or remove profile(s) to return\n * @cd: pointer to command details structure\n *\n- * Rl profile function to add, query, or remove profile(s)\n+ * RL profile function to add, query, or remove profile(s)\n */\n static enum ice_status\n ice_aq_rl_profile(struct ice_hw *hw, enum ice_adminq_opc opcode,\n@@ -789,7 +789,7 @@ void ice_sched_clear_agg(struct ice_hw *hw)\n }\n \n /**\n- * ice_sched_clear_tx_topo - clears the schduler tree nodes\n+ * ice_sched_clear_tx_topo - clears the scheduler tree nodes\n * @pi: port information structure\n *\n * This function removes all the nodes from HW as well as from SW DB.\n@@ -2114,7 +2114,7 @@ ice_aq_query_node_to_root(struct ice_hw *hw, u32 node_teid,\n * This function validates aggregator ID. The function returns info if\n * aggregator ID is present in list otherwise it returns null.\n */\n-static struct ice_sched_agg_info*\n+static struct ice_sched_agg_info *\n ice_get_agg_info(struct ice_hw *hw, u32 agg_id)\n {\n \tstruct ice_sched_agg_info *agg_info;\n@@ -2697,7 +2697,7 @@ ice_cfg_agg(struct ice_port_info *pi, u32 agg_id, enum ice_agg_type agg_type,\n * The function returns aggregator VSI info based on VSI handle. This function\n * needs to be called with scheduler lock held.\n */\n-static struct ice_sched_agg_vsi_info*\n+static struct ice_sched_agg_vsi_info *\n ice_get_agg_vsi_info(struct ice_sched_agg_info *agg_info, u16 vsi_handle)\n {\n \tstruct ice_sched_agg_vsi_info *agg_vsi_info;\n@@ -2719,7 +2719,7 @@ ice_get_agg_vsi_info(struct ice_sched_agg_info *agg_info, u16 vsi_handle)\n * VSI has in this case a different aggregator than the default one. This\n * function needs to be called with scheduler lock held.\n */\n-static struct ice_sched_agg_info*\n+static struct ice_sched_agg_info *\n ice_get_vsi_agg_info(struct ice_hw *hw, u16 vsi_handle)\n {\n \tstruct ice_sched_agg_info *agg_info;\n@@ -3471,7 +3471,6 @@ ice_cfg_agg_bw_no_shared_lmt(struct ice_port_info *pi, u32 agg_id)\n * @pi: port information structure\n * @num_qs: number of VSI queues\n * @q_ids: queue IDs array\n- * @q_ids: queue IDs array\n * @q_prio: queue priority array\n *\n * This function configures the queue node priority (Sibling Priority) of the\n@@ -5128,7 +5127,7 @@ enum ice_status ice_cfg_rl_burst_size(struct ice_hw *hw, u32 bytes)\n \treturn ICE_SUCCESS;\n }\n \n-/*\n+/**\n * ice_sched_replay_node_prio - re-configure node priority\n * @hw: pointer to the HW struct\n * @node: sched node to configure\ndiff --git a/drivers/net/ice/base/ice_switch.c b/drivers/net/ice/base/ice_switch.c\nindex 600e1126c..b4aab6780 100644\n--- a/drivers/net/ice/base/ice_switch.c\n+++ b/drivers/net/ice/base/ice_switch.c\n@@ -2166,15 +2166,13 @@ enum ice_status ice_get_initial_sw_cfg(struct ice_hw *hw)\n */\n static void ice_fill_sw_info(struct ice_hw *hw, struct ice_fltr_info *fi)\n {\n-\tfi->lb_en = false;\n-\tfi->lan_en = false;\n-\n \tif ((fi->flag & ICE_FLTR_RX) &&\n \t (fi->fltr_act == ICE_FWD_TO_VSI ||\n \t fi->fltr_act == ICE_FWD_TO_VSI_LIST) &&\n \t fi->lkup_type == ICE_SW_LKUP_LAST)\n \t\tfi->lan_en = true;\n-\n+\tfi->lb_en = false;\n+\tfi->lan_en = false;\n \tif ((fi->flag & ICE_FLTR_TX) &&\n \t (fi->fltr_act == ICE_FWD_TO_VSI ||\n \t fi->fltr_act == ICE_FWD_TO_VSI_LIST ||\n@@ -5351,7 +5349,7 @@ static u16 ice_find_recp(struct ice_hw *hw, struct ice_prot_lkup_ext *lkup_exts,\n \t\t\tu8 pe, qr;\n \n \t\t\t/* ar, cr, and qr are related to the recipe words, while\n-\t\t\t * be, de and pe are related to the lookup words\n+\t\t\t * be, de, and pe are related to the lookup words\n \t\t\t */\n \t\t\tfor (pe = 0; pe < lkup_exts->n_val_words; pe++) {\n \t\t\t\tfor (qr = 0; qr < recp[i].lkup_exts.n_val_words;\ndiff --git a/drivers/net/ice/base/ice_switch.h b/drivers/net/ice/base/ice_switch.h\nindex ba7c56f44..7317d17ef 100644\n--- a/drivers/net/ice/base/ice_switch.h\n+++ b/drivers/net/ice/base/ice_switch.h\n@@ -261,8 +261,7 @@ struct ice_sw_recipe {\n \t/* Profiles this recipe is associated with */\n \tu8 num_profs, *prof_ids;\n \n-\t/* Possible result indexes are 44, 45, 46 and 47 */\n-#define ICE_POSSIBLE_RES_IDX 0x0000F00000000000ULL\n+\t/* Bit map for possible result indexes */\n \tice_declare_bitmap(res_idxs, ICE_MAX_FV_WORDS);\n \n \t/* This allows user to specify the recipe priority.\ndiff --git a/drivers/net/ice/base/ice_type.h b/drivers/net/ice/base/ice_type.h\nindex 3280d48d0..8f01a96b1 100644\n--- a/drivers/net/ice/base/ice_type.h\n+++ b/drivers/net/ice/base/ice_type.h\n@@ -497,7 +497,7 @@ struct ice_nvm_info {\n \tu32 flash_size;\t\t\t/* Size of available flash in bytes */\n \tu8 major_ver;\t\t\t/* major version of dev starter */\n \tu8 minor_ver;\t\t\t/* minor version of dev starter */\n-\tu8 blank_nvm_mode;\t\t/* is NVM empty (no FW present)*/\n+\tu8 blank_nvm_mode;\t\t/* is NVM empty (no FW present) */\n };\n \n struct ice_link_default_override_tlv {\n@@ -1053,7 +1053,7 @@ enum ice_sw_fwd_act_type {\n #define ICE_SR_1ST_SCRATCH_PAD_PTR\t\t0x41\n #define ICE_SR_1ST_NVM_BANK_PTR\t\t\t0x42\n #define ICE_SR_NVM_BANK_SIZE\t\t\t0x43\n-#define ICE_SR_1ND_OROM_BANK_PTR\t\t0x44\n+#define ICE_SR_1ST_OROM_BANK_PTR\t\t0x44\n #define ICE_SR_OROM_BANK_SIZE\t\t\t0x45\n #define ICE_SR_NETLIST_BANK_PTR\t\t\t0x46\n #define ICE_SR_NETLIST_BANK_SIZE\t\t0x47\n", "prefixes": [ "v2", "16/52" ] }