Patch Detail

HTTP 200 OK
Allow: GET, PUT, PATCH, HEAD, OPTIONS
Content-Type: application/json
Vary: Accept

{
    "id": 50562,
    "url": "https://patches.dpdk.org/api/patches/50562/?format=api",
    "web_url": "https://patches.dpdk.org/project/dpdk/patch/20190228055650.25237-3-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": "<20190228055650.25237-3-qi.z.zhang@intel.com>",
    "list_archive_url": "https://inbox.dpdk.org/dev/20190228055650.25237-3-qi.z.zhang@intel.com",
    "date": "2019-02-28T05:56:15",
    "name": "[02/37] net/ice/base: improve comments",
    "commit_ref": null,
    "pull_url": null,
    "state": "changes-requested",
    "archived": true,
    "hash": "822bfdd1a97a68fbff0cc13ba793c550254e7229",
    "submitter": {
        "id": 504,
        "url": "https://patches.dpdk.org/api/people/504/?format=api",
        "name": "Qi Zhang",
        "email": "qi.z.zhang@intel.com"
    },
    "delegate": {
        "id": 319,
        "url": "https://patches.dpdk.org/api/users/319/?format=api",
        "username": "fyigit",
        "first_name": "Ferruh",
        "last_name": "Yigit",
        "email": "ferruh.yigit@amd.com"
    },
    "mbox": "https://patches.dpdk.org/project/dpdk/patch/20190228055650.25237-3-qi.z.zhang@intel.com/mbox/",
    "series": [
        {
            "id": 3567,
            "url": "https://patches.dpdk.org/api/series/3567/?format=api",
            "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=3567",
            "date": "2019-02-28T05:56:13",
            "name": "share code update.",
            "version": 1,
            "mbox": "https://patches.dpdk.org/series/3567/mbox/"
        }
    ],
    "comments": "https://patches.dpdk.org/api/patches/50562/comments/",
    "check": "warning",
    "checks": "https://patches.dpdk.org/api/patches/50562/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 D94273576;\n\tThu, 28 Feb 2019 06:55:12 +0100 (CET)",
            "from mga12.intel.com (mga12.intel.com [192.55.52.136])\n\tby dpdk.org (Postfix) with ESMTP id 7D6D33421\n\tfor <dev@dpdk.org>; Thu, 28 Feb 2019 06:55:09 +0100 (CET)",
            "from fmsmga006.fm.intel.com ([10.253.24.20])\n\tby fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t27 Feb 2019 21:55:08 -0800",
            "from dpdk51.sh.intel.com ([10.67.110.190])\n\tby fmsmga006.fm.intel.com with ESMTP; 27 Feb 2019 21:55:05 -0800"
        ],
        "X-Amp-Result": "SKIPPED(no attachment in message)",
        "X-Amp-File-Uploaded": "False",
        "X-ExtLoop1": "1",
        "X-IronPort-AV": "E=Sophos;i=\"5.58,422,1544515200\"; d=\"scan'208\";a=\"322784210\"",
        "From": "Qi Zhang <qi.z.zhang@intel.com>",
        "To": "wenzhuo.lu@intel.com,\n\tqiming.yang@intel.com",
        "Cc": "paul.m.stillwell.jr@intel.com, dev@dpdk.org, ferruh.yigit@intel.com,\n\tQi Zhang <qi.z.zhang@intel.com>",
        "Date": "Thu, 28 Feb 2019 13:56:15 +0800",
        "Message-Id": "<20190228055650.25237-3-qi.z.zhang@intel.com>",
        "X-Mailer": "git-send-email 2.13.6",
        "In-Reply-To": "<20190228055650.25237-1-qi.z.zhang@intel.com>",
        "References": "<20190228055650.25237-1-qi.z.zhang@intel.com>",
        "Subject": "[dpdk-dev] [PATCH 02/37] net/ice/base: improve comments",
        "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": "Improve comments to follow naming rules.\nAlso the patch include some minor cleanup.\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    |  27 +-\n drivers/net/ice/base/ice_common.c        | 148 +++----\n drivers/net/ice/base/ice_common.h        |   4 +-\n drivers/net/ice/base/ice_controlq.c      |   8 +-\n drivers/net/ice/base/ice_flex_pipe.c     | 364 ++++++++--------\n drivers/net/ice/base/ice_flex_pipe.h     |   2 +-\n drivers/net/ice/base/ice_flex_type.h     |   4 +-\n drivers/net/ice/base/ice_flow.c          |  65 +--\n drivers/net/ice/base/ice_flow.h          |   1 -\n drivers/net/ice/base/ice_lan_tx_rx.h     |  70 +--\n drivers/net/ice/base/ice_nvm.c           |   8 +-\n drivers/net/ice/base/ice_protocol_type.h |   4 +-\n drivers/net/ice/base/ice_sched.c         | 719 ++++++++++++++++---------------\n drivers/net/ice/base/ice_sched.h         |   8 +-\n drivers/net/ice/base/ice_switch.c        | 120 +++---\n drivers/net/ice/base/ice_switch.h        |  20 +-\n drivers/net/ice/base/ice_type.h          |  34 +-\n 17 files changed, 804 insertions(+), 802 deletions(-)",
    "diff": "diff --git a/drivers/net/ice/base/ice_adminq_cmd.h b/drivers/net/ice/base/ice_adminq_cmd.h\nindex a1b9edd14..5a599280e 100644\n--- a/drivers/net/ice/base/ice_adminq_cmd.h\n+++ b/drivers/net/ice/base/ice_adminq_cmd.h\n@@ -71,7 +71,7 @@ struct ice_aqc_req_res {\n #define ICE_AQ_RES_NVM_WRITE_DFLT_TIMEOUT_MS\t180000\n #define ICE_AQ_RES_CHNG_LOCK_DFLT_TIMEOUT_MS\t1000\n #define ICE_AQ_RES_GLBL_LOCK_DFLT_TIMEOUT_MS\t3000\n-\t/* For SDP: pin id of the SDP */\n+\t/* For SDP: pin ID of the SDP */\n \t__le32 res_number;\n \t/* Status is only used for ICE_AQC_RES_ID_GLBL_LOCK */\n \t__le16 status;\n@@ -854,7 +854,6 @@ struct ice_aqc_delete_elem {\n \n \n \n-\n /* Rate limiting profile for\n  * Add RL profile (indirect 0x0410)\n  * Query RL profile (indirect 0x0411)\n@@ -1154,8 +1153,8 @@ struct ice_aqc_set_phy_cfg_data {\n \t__le64 phy_type_low; /* Use values from ICE_PHY_TYPE_LOW_* */\n \t__le64 phy_type_high; /* Use values from ICE_PHY_TYPE_HIGH_* */\n \tu8 caps;\n-#define ICE_AQ_PHY_ENA_TX_PAUSE_ABILITY\t\tBIT(0)\n-#define ICE_AQ_PHY_ENA_RX_PAUSE_ABILITY\t\tBIT(1)\n+#define ICE_AQ_PHY_ENA_TX_PAUSE_ABILITY\tBIT(0)\n+#define ICE_AQ_PHY_ENA_RX_PAUSE_ABILITY\tBIT(1)\n #define ICE_AQ_PHY_ENA_LOW_POWER\tBIT(2)\n #define ICE_AQ_PHY_ENA_LINK\t\tBIT(3)\n #define ICE_AQ_PHY_ENA_AUTO_LINK_UPDT\tBIT(5)\n@@ -1228,7 +1227,7 @@ struct ice_aqc_get_link_status_data {\n \tu8 ext_info;\n #define ICE_AQ_LINK_PHY_TEMP_ALARM\tBIT(0)\n #define ICE_AQ_LINK_EXCESSIVE_ERRORS\tBIT(1)\t/* Excessive Link Errors */\n-\t/* Port TX Suspended */\n+\t/* Port Tx Suspended */\n #define ICE_AQ_LINK_TX_S\t\t2\n #define ICE_AQ_LINK_TX_M\t\t(0x03 << ICE_AQ_LINK_TX_S)\n #define ICE_AQ_LINK_TX_ACTIVE\t\t0\n@@ -1441,7 +1440,7 @@ struct ice_aqc_get_set_rss_lut {\n \n \n \n-/* Add TX LAN Queues (indirect 0x0C30) */\n+/* Add Tx LAN Queues (indirect 0x0C30) */\n struct ice_aqc_add_txqs {\n \tu8 num_qgrps;\n \tu8 reserved[3];\n@@ -1451,7 +1450,7 @@ struct ice_aqc_add_txqs {\n };\n \n \n-/* This is the descriptor of each queue entry for the Add TX LAN Queues\n+/* This is the descriptor of each queue entry for the Add Tx LAN Queues\n  * command (0x0C30). Only used within struct ice_aqc_add_tx_qgrp.\n  */\n struct ice_aqc_add_txqs_perq {\n@@ -1464,7 +1463,7 @@ struct ice_aqc_add_txqs_perq {\n };\n \n \n-/* The format of the command buffer for Add TX LAN Queues (0x0C30)\n+/* The format of the command buffer for Add Tx LAN Queues (0x0C30)\n  * is an array of the following structs. Please note that the length of\n  * each struct ice_aqc_add_tx_qgrp is variable due\n  * to the variable number of queues in each group!\n@@ -1477,7 +1476,7 @@ struct ice_aqc_add_tx_qgrp {\n };\n \n \n-/* Disable TX LAN Queues (indirect 0x0C31) */\n+/* Disable Tx LAN Queues (indirect 0x0C31) */\n struct ice_aqc_dis_txqs {\n \tu8 cmd_type;\n #define ICE_AQC_Q_DIS_CMD_S\t\t0\n@@ -1500,7 +1499,7 @@ struct ice_aqc_dis_txqs {\n };\n \n \n-/* The buffer for Disable TX LAN Queues (indirect 0x0C31)\n+/* The buffer for Disable Tx LAN Queues (indirect 0x0C31)\n  * contains the following structures, arrayed one after the\n  * other.\n  * Note: Since the q_id is 16 bits wide, if the\n@@ -1528,7 +1527,7 @@ struct ice_aqc_dis_txq {\n };\n \n \n-/* TX LAN Queues Cleanup Event (0x0C31) */\n+/* Tx LAN Queues Cleanup Event (0x0C31) */\n struct ice_aqc_txqs_cleanup {\n \t__le16 caller_opc;\n \t__le16 cmd_tag;\n@@ -1536,7 +1535,7 @@ struct ice_aqc_txqs_cleanup {\n };\n \n \n-/* Move / Reconfigure TX Queues (indirect 0x0C32) */\n+/* Move / Reconfigure Tx Queues (indirect 0x0C32) */\n struct ice_aqc_move_txqs {\n \tu8 cmd_type;\n #define ICE_AQC_Q_CMD_TYPE_S\t\t0\n@@ -1557,7 +1556,7 @@ struct ice_aqc_move_txqs {\n };\n \n \n-/* This is the descriptor of each queue entry for the move TX LAN Queues\n+/* This is the descriptor of each queue entry for the move Tx LAN Queues\n  * command (0x0C32).\n  */\n struct ice_aqc_move_txqs_elem {\n@@ -1950,7 +1949,7 @@ enum ice_adminq_opc {\n \tice_aqc_opc_get_rss_key\t\t\t\t= 0x0B04,\n \tice_aqc_opc_get_rss_lut\t\t\t\t= 0x0B05,\n \n-\t/* TX queue handling commands/events */\n+\t/* Tx queue handling commands/events */\n \tice_aqc_opc_add_txqs\t\t\t\t= 0x0C30,\n \tice_aqc_opc_dis_txqs\t\t\t\t= 0x0C31,\n \tice_aqc_opc_txqs_cleanup\t\t\t= 0x0C31,\ndiff --git a/drivers/net/ice/base/ice_common.c b/drivers/net/ice/base/ice_common.c\nindex 145f66a90..bcfa3014b 100644\n--- a/drivers/net/ice/base/ice_common.c\n+++ b/drivers/net/ice/base/ice_common.c\n@@ -36,7 +36,7 @@\n  * @hw: pointer to the HW structure\n  *\n  * This function sets the MAC type of the adapter based on the\n- * vendor ID and device ID stored in the hw structure.\n+ * vendor ID and device ID stored in the HW structure.\n  */\n static enum ice_status ice_set_mac_type(struct ice_hw *hw)\n {\n@@ -79,7 +79,7 @@ enum ice_status ice_clear_pf_cfg(struct ice_hw *hw)\n \n /**\n  * ice_aq_manage_mac_read - manage MAC address read command\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  * @buf: a virtual buffer to hold the manage MAC read response\n  * @buf_size: Size of the virtual buffer\n  * @cd: pointer to command details structure or NULL\n@@ -338,7 +338,7 @@ ice_aq_get_link_info(struct ice_port_info *pi, bool ena_lse,\n \t/* flag cleared so calling functions don't call AQ again */\n \tpi->phy.get_link_info = false;\n \n-\treturn status;\n+\treturn ICE_SUCCESS;\n }\n \n /**\n@@ -426,7 +426,7 @@ static void ice_init_flex_flds(struct ice_hw *hw, enum ice_rxdid prof_id)\n \n /**\n  * ice_init_fltr_mgmt_struct - initializes filter management list and locks\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  */\n static enum ice_status ice_init_fltr_mgmt_struct(struct ice_hw *hw)\n {\n@@ -446,7 +446,7 @@ static enum ice_status ice_init_fltr_mgmt_struct(struct ice_hw *hw)\n \n /**\n  * ice_cleanup_fltr_mgmt_struct - cleanup filter management list and locks\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  */\n static void ice_cleanup_fltr_mgmt_struct(struct ice_hw *hw)\n {\n@@ -503,7 +503,7 @@ static void ice_cleanup_fltr_mgmt_struct(struct ice_hw *hw)\n \n /**\n  * ice_cfg_fw_log - configure FW logging\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  * @enable: enable certain FW logging events if true, disable all if false\n  *\n  * This function enables/disables the FW logging via Rx CQ events and a UART\n@@ -652,7 +652,7 @@ static enum ice_status ice_cfg_fw_log(struct ice_hw *hw, bool enable)\n \n /**\n  * ice_output_fw_log\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  * @desc: pointer to the AQ message descriptor\n  * @buf: pointer to the buffer accompanying the AQ message\n  *\n@@ -668,7 +668,7 @@ void ice_output_fw_log(struct ice_hw *hw, struct ice_aq_desc *desc, void *buf)\n \n /**\n  * ice_get_itr_intrl_gran - determine int/intrl granularity\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  *\n  * Determines the itr/intrl granularities based on the maximum aggregate\n  * bandwidth according to the device's configuration during power-on.\n@@ -763,7 +763,7 @@ enum ice_status ice_init_hw(struct ice_hw *hw)\n \t\tgoto err_unroll_cqinit;\n \t}\n \n-\t/* set the back pointer to hw */\n+\t/* set the back pointer to HW */\n \thw->port_info->hw = hw;\n \n \t/* Initialize port_info struct with switch configuration data */\n@@ -1034,7 +1034,7 @@ enum ice_status ice_reset(struct ice_hw *hw, enum ice_reset_req req)\n  * @ice_rxq_ctx: pointer to the rxq context\n  * @rxq_index: the index of the Rx queue\n  *\n- * Copies rxq context from dense structure to hw register space\n+ * Copies rxq context from dense structure to HW register space\n  */\n static enum ice_status\n ice_copy_rxq_ctx_to_hw(struct ice_hw *hw, u8 *ice_rxq_ctx, u32 rxq_index)\n@@ -1047,7 +1047,7 @@ ice_copy_rxq_ctx_to_hw(struct ice_hw *hw, u8 *ice_rxq_ctx, u32 rxq_index)\n \tif (rxq_index > QRX_CTRL_MAX_INDEX)\n \t\treturn ICE_ERR_PARAM;\n \n-\t/* Copy each dword separately to hw */\n+\t/* Copy each dword separately to HW */\n \tfor (i = 0; i < ICE_RXQ_CTX_SIZE_DWORDS; i++) {\n \t\twr32(hw, QRX_CONTEXT(i, rxq_index),\n \t\t     *((u32 *)(ice_rxq_ctx + (i * sizeof(u32)))));\n@@ -1091,7 +1091,7 @@ static const struct ice_ctx_ele ice_rlan_ctx_info[] = {\n  * @rxq_index: the index of the Rx queue\n  *\n  * Converts rxq context from sparse to dense structure and then writes\n- * it to hw register space\n+ * it to HW register space\n  */\n enum ice_status\n ice_write_rxq_ctx(struct ice_hw *hw, struct ice_rlan_ctx *rlan_ctx,\n@@ -1109,7 +1109,7 @@ ice_write_rxq_ctx(struct ice_hw *hw, struct ice_rlan_ctx *rlan_ctx,\n  * @hw: pointer to the hardware structure\n  * @rxq_index: the index of the Rx queue to clear\n  *\n- * Clears rxq context in hw register space\n+ * Clears rxq context in HW register space\n  */\n enum ice_status ice_clear_rxq_ctx(struct ice_hw *hw, u32 rxq_index)\n {\n@@ -1166,7 +1166,7 @@ const struct ice_ctx_ele ice_tlan_ctx_info[] = {\n  * @ice_tx_cmpltnq_ctx: pointer to the Tx completion queue context\n  * @tx_cmpltnq_index: the index of the completion queue\n  *\n- * Copies Tx completion q context from dense structure to hw register space\n+ * Copies Tx completion queue context from dense structure to HW register space\n  */\n static enum ice_status\n ice_copy_tx_cmpltnq_ctx_to_hw(struct ice_hw *hw, u8 *ice_tx_cmpltnq_ctx,\n@@ -1180,7 +1180,7 @@ ice_copy_tx_cmpltnq_ctx_to_hw(struct ice_hw *hw, u8 *ice_tx_cmpltnq_ctx,\n \tif (tx_cmpltnq_index > GLTCLAN_CQ_CNTX0_MAX_INDEX)\n \t\treturn ICE_ERR_PARAM;\n \n-\t/* Copy each dword separately to hw */\n+\t/* Copy each dword separately to HW */\n \tfor (i = 0; i < ICE_TX_CMPLTNQ_CTX_SIZE_DWORDS; i++) {\n \t\twr32(hw, GLTCLAN_CQ_CNTX(i, tx_cmpltnq_index),\n \t\t     *((u32 *)(ice_tx_cmpltnq_ctx + (i * sizeof(u32)))));\n@@ -1215,7 +1215,7 @@ static const struct ice_ctx_ele ice_tx_cmpltnq_ctx_info[] = {\n  * @tx_cmpltnq_index: the index of the completion queue\n  *\n  * Converts completion queue context from sparse to dense structure and then\n- * writes it to hw register space\n+ * writes it to HW register space\n  */\n enum ice_status\n ice_write_tx_cmpltnq_ctx(struct ice_hw *hw,\n@@ -1233,7 +1233,7 @@ ice_write_tx_cmpltnq_ctx(struct ice_hw *hw,\n  * @hw: pointer to the hardware structure\n  * @tx_cmpltnq_index: the index of the completion queue to clear\n  *\n- * Clears Tx completion queue context in hw register space\n+ * Clears Tx completion queue context in HW register space\n  */\n enum ice_status\n ice_clear_tx_cmpltnq_ctx(struct ice_hw *hw, u32 tx_cmpltnq_index)\n@@ -1256,7 +1256,7 @@ ice_clear_tx_cmpltnq_ctx(struct ice_hw *hw, u32 tx_cmpltnq_index)\n  * @ice_tx_drbell_q_ctx: pointer to the doorbell queue context\n  * @tx_drbell_q_index: the index of the doorbell queue\n  *\n- * Copies doorbell q context from dense structure to hw register space\n+ * Copies doorbell queue context from dense structure to HW register space\n  */\n static enum ice_status\n ice_copy_tx_drbell_q_ctx_to_hw(struct ice_hw *hw, u8 *ice_tx_drbell_q_ctx,\n@@ -1270,7 +1270,7 @@ ice_copy_tx_drbell_q_ctx_to_hw(struct ice_hw *hw, u8 *ice_tx_drbell_q_ctx,\n \tif (tx_drbell_q_index > QTX_COMM_DBLQ_DBELL_MAX_INDEX)\n \t\treturn ICE_ERR_PARAM;\n \n-\t/* Copy each dword separately to hw */\n+\t/* Copy each dword separately to HW */\n \tfor (i = 0; i < ICE_TX_DRBELL_Q_CTX_SIZE_DWORDS; i++) {\n \t\twr32(hw, QTX_COMM_DBLQ_CNTX(i, tx_drbell_q_index),\n \t\t     *((u32 *)(ice_tx_drbell_q_ctx + (i * sizeof(u32)))));\n@@ -1306,7 +1306,7 @@ static const struct ice_ctx_ele ice_tx_drbell_q_ctx_info[] = {\n  * @tx_drbell_q_index: the index of the doorbell queue\n  *\n  * Converts doorbell queue context from sparse to dense structure and then\n- * writes it to hw register space\n+ * writes it to HW register space\n  */\n enum ice_status\n ice_write_tx_drbell_q_ctx(struct ice_hw *hw,\n@@ -1324,7 +1324,7 @@ ice_write_tx_drbell_q_ctx(struct ice_hw *hw,\n  * @hw: pointer to the hardware structure\n  * @tx_drbell_q_index: the index of the doorbell queue to clear\n  *\n- * Clears doorbell queue context in hw register space\n+ * Clears doorbell queue context in HW register space\n  */\n enum ice_status\n ice_clear_tx_drbell_q_ctx(struct ice_hw *hw, u32 tx_drbell_q_index)\n@@ -1394,7 +1394,7 @@ ice_debug_cq(struct ice_hw *hw, u32 mask, void *desc, void *buf, u16 buf_len)\n \n /**\n  * ice_aq_send_cmd - send FW Admin Queue command to FW Admin Queue\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  * @desc: descriptor describing the command\n  * @buf: buffer to use for indirect commands (NULL for direct commands)\n  * @buf_size: size of buffer for indirect commands (0 for direct commands)\n@@ -1411,7 +1411,7 @@ ice_aq_send_cmd(struct ice_hw *hw, struct ice_aq_desc *desc, void *buf,\n \n /**\n  * ice_aq_get_fw_ver\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  * @cd: pointer to command details structure or NULL\n  *\n  * Get the firmware version (0x0001) from the admin queue commands\n@@ -1446,7 +1446,7 @@ enum ice_status ice_aq_get_fw_ver(struct ice_hw *hw, struct ice_sq_cd *cd)\n \n /**\n  * ice_aq_q_shutdown\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  * @unloading: is the driver unloading itself\n  *\n  * Tell the Firmware that we're shutting down the AdminQ and whether\n@@ -1469,8 +1469,8 @@ enum ice_status ice_aq_q_shutdown(struct ice_hw *hw, bool unloading)\n \n /**\n  * ice_aq_req_res\n- * @hw: pointer to the hw struct\n- * @res: resource id\n+ * @hw: pointer to the HW struct\n+ * @res: resource ID\n  * @access: access type\n  * @sdp_number: resource number\n  * @timeout: the maximum time in ms that the driver may hold the resource\n@@ -1557,8 +1557,8 @@ ice_aq_req_res(struct ice_hw *hw, enum ice_aq_res_ids res,\n \n /**\n  * ice_aq_release_res\n- * @hw: pointer to the hw struct\n- * @res: resource id\n+ * @hw: pointer to the HW struct\n+ * @res: resource ID\n  * @sdp_number: resource number\n  * @cd: pointer to command details structure or NULL\n  *\n@@ -1586,7 +1586,7 @@ ice_aq_release_res(struct ice_hw *hw, enum ice_aq_res_ids res, u8 sdp_number,\n /**\n  * ice_acquire_res\n  * @hw: pointer to the HW structure\n- * @res: resource id\n+ * @res: resource ID\n  * @access: access type (read or write)\n  * @timeout: timeout in milliseconds\n  *\n@@ -1650,7 +1650,7 @@ ice_acquire_res(struct ice_hw *hw, enum ice_aq_res_ids res,\n /**\n  * ice_release_res\n  * @hw: pointer to the HW structure\n- * @res: resource id\n+ * @res: resource ID\n  *\n  * This function will release a resource using the proper Admin Command.\n  */\n@@ -1664,7 +1664,7 @@ void ice_release_res(struct ice_hw *hw, enum ice_aq_res_ids res)\n \tstatus = ice_aq_release_res(hw, res, 0, NULL);\n \n \t/* there are some rare cases when trying to release the resource\n-\t * results in an admin Q timeout, so handle them correctly\n+\t * results in an admin queue timeout, so handle them correctly\n \t */\n \twhile ((status == ICE_ERR_AQ_TIMEOUT) &&\n \t       (total_delay < hw->adminq.sq_cmd_timeout)) {\n@@ -1676,7 +1676,7 @@ void ice_release_res(struct ice_hw *hw, enum ice_aq_res_ids res)\n \n /**\n  * ice_aq_alloc_free_res - command to allocate/free resources\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  * @num_entries: number of resource entries in buffer\n  * @buf: Indirect buffer to hold data parameters and response\n  * @buf_size: size of buffer for indirect commands\n@@ -1714,7 +1714,7 @@ ice_aq_alloc_free_res(struct ice_hw *hw, u16 num_entries,\n \n /**\n  * ice_alloc_hw_res - allocate resource\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  * @type: type of resource\n  * @num: number of resources to allocate\n  * @sh: shared if true, dedicated if false\n@@ -1751,8 +1751,8 @@ ice_alloc_hw_res(struct ice_hw *hw, u16 type, u16 num, bool sh, u16 *res)\n }\n \n /**\n- * ice_free_hw_res - free allocated hw resource\n- * @hw: pointer to the hw struct\n+ * ice_free_hw_res - free allocated HW resource\n+ * @hw: pointer to the HW struct\n  * @type: type of resource to free\n  * @num: number of resources\n  * @res: pointer to array that contains the resources to free\n@@ -1786,7 +1786,7 @@ ice_free_hw_res(struct ice_hw *hw, u16 type, u16 num, u16 *res)\n \n /**\n  * ice_get_num_per_func - determine number of resources per PF\n- * @hw: pointer to the hw structure\n+ * @hw: pointer to the HW structure\n  * @max: value to be evenly split between each PF\n  *\n  * Determine the number of valid functions by going through the bitmap returned\n@@ -1809,7 +1809,7 @@ static u32 ice_get_num_per_func(struct ice_hw *hw, u32 max)\n \n /**\n  * ice_parse_caps - parse function/device capabilities\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  * @buf: pointer to a buffer containing function/device capability records\n  * @cap_count: number of capability records in the list\n  * @opc: type of capabilities list to parse\n@@ -1929,7 +1929,7 @@ ice_parse_caps(struct ice_hw *hw, void *buf, u32 cap_count,\n \n /**\n  * ice_aq_discover_caps - query function/device capabilities\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  * @buf: a virtual buffer to hold the capabilities\n  * @buf_size: Size of the virtual buffer\n  * @cap_count: cap count needed if AQ err==ENOMEM\n@@ -2028,7 +2028,7 @@ enum ice_status ice_get_caps(struct ice_hw *hw)\n \n /**\n  * ice_aq_manage_mac_write - manage MAC address write command\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  * @mac_addr: MAC address to be written as LAA/LAA+WoL/Port address\n  * @flags: flags to control write behavior\n  * @cd: pointer to command details structure or NULL\n@@ -2057,7 +2057,7 @@ ice_aq_manage_mac_write(struct ice_hw *hw, const u8 *mac_addr, u8 flags,\n \n /**\n  * ice_aq_clear_pxe_mode\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  *\n  * Tell the firmware that the driver is taking over from PXE (0x0110).\n  */\n@@ -2073,7 +2073,7 @@ static enum ice_status ice_aq_clear_pxe_mode(struct ice_hw *hw)\n \n /**\n  * ice_clear_pxe_mode - clear pxe operations mode\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  *\n  * Make sure all PXE mode settings are cleared, including things\n  * like descriptor fetch/write-back mode.\n@@ -2090,10 +2090,10 @@ void ice_clear_pxe_mode(struct ice_hw *hw)\n  * @phy_type_low: lower part of phy_type\n  * @phy_type_high: higher part of phy_type\n  *\n- * This helper function will convert an entry in phy type structure\n+ * This helper function will convert an entry in PHY type structure\n  * [phy_type_low, phy_type_high] to its corresponding link speed.\n  * Note: In the structure of [phy_type_low, phy_type_high], there should\n- * be one bit set, as this function will convert one phy type to its\n+ * be one bit set, as this function will convert one PHY type to its\n  * speed.\n  * If no bit gets set, ICE_LINK_SPEED_UNKNOWN will be returned\n  * If more than one bit gets set, ICE_LINK_SPEED_UNKNOWN will be returned\n@@ -2263,7 +2263,7 @@ ice_update_phy_type(u64 *phy_type_low, u64 *phy_type_high,\n \n /**\n  * ice_aq_set_phy_cfg\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  * @lport: logical port number\n  * @cfg: structure with PHY configuration data to be set\n  * @cd: pointer to command details structure or NULL\n@@ -2372,7 +2372,7 @@ ice_set_fc(struct ice_port_info *pi, u8 *aq_failures, bool ena_auto_link_update)\n \tif (!pcaps)\n \t\treturn ICE_ERR_NO_MEMORY;\n \n-\t/* Get the current phy config */\n+\t/* Get the current PHY config */\n \tstatus = ice_aq_get_phy_caps(pi, false, ICE_AQC_REPORT_SW_CFG, pcaps,\n \t\t\t\t     NULL);\n \tif (status) {\n@@ -2561,7 +2561,7 @@ ice_aq_set_link_restart_an(struct ice_port_info *pi, bool ena_link,\n \n /**\n  * ice_aq_set_event_mask\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  * @port_num: port number of the physical function\n  * @mask: event mask to be set\n  * @cd: pointer to command details structure or NULL\n@@ -2587,7 +2587,7 @@ ice_aq_set_event_mask(struct ice_hw *hw, u8 port_num, u16 mask,\n \n /**\n  * ice_aq_set_mac_loopback\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  * @ena_lpbk: Enable or Disable loopback\n  * @cd: pointer to command details structure or NULL\n  *\n@@ -2775,7 +2775,7 @@ ice_aq_set_rss_lut(struct ice_hw *hw, u16 vsi_handle, u8 lut_type,\n \n /**\n  * __ice_aq_get_set_rss_key\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  * @vsi_id: VSI FW index\n  * @key: pointer to key info struct\n  * @set: set true to set the key, false to get the key\n@@ -2810,7 +2810,7 @@ ice_status __ice_aq_get_set_rss_key(struct ice_hw *hw, u16 vsi_id,\n \n /**\n  * ice_aq_get_rss_key\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  * @vsi_handle: software VSI handle\n  * @key: pointer to key info struct\n  *\n@@ -2829,7 +2829,7 @@ ice_aq_get_rss_key(struct ice_hw *hw, u16 vsi_handle,\n \n /**\n  * ice_aq_set_rss_key\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  * @vsi_handle: software VSI handle\n  * @keys: pointer to key info struct\n  *\n@@ -2916,8 +2916,8 @@ ice_aq_add_lan_txq(struct ice_hw *hw, u8 num_qgrps,\n  * @num_qgrps: number of groups in the list\n  * @qg_list: the list of groups to disable\n  * @buf_size: the total size of the qg_list buffer in bytes\n- * @rst_src: if called due to reset, specifies the rst source\n- * @vmvf_num: the relative vm or vf number that is undergoing the reset\n+ * @rst_src: if called due to reset, specifies the reset source\n+ * @vmvf_num: the relative VM or VF number that is undergoing the reset\n  * @cd: pointer to command details structure or NULL\n  *\n  * Disable LAN Tx queue (0x0C31)\n@@ -2993,7 +2993,7 @@ ice_aq_dis_lan_txq(struct ice_hw *hw, u8 num_qgrps,\n \t\t\tice_debug(hw, ICE_DBG_SCHED, \"VM%d disable failed %d\\n\",\n \t\t\t\t  vmvf_num, hw->adminq.sq_last_status);\n \t\telse\n-\t\t\tice_debug(hw, ICE_DBG_SCHED, \"disable Q %d failed %d\\n\",\n+\t\t\tice_debug(hw, ICE_DBG_SCHED, \"disable queue %d failed %d\\n\",\n \t\t\t\t  LE16_TO_CPU(qg_list[0].q_id[0]),\n \t\t\t\t  hw->adminq.sq_last_status);\n \t}\n@@ -3232,13 +3232,13 @@ ice_set_ctx(u8 *src_ctx, u8 *dest_ctx, const struct ice_ctx_ele *ce_info)\n  * ice_ena_vsi_txq\n  * @pi: port information structure\n  * @vsi_handle: software VSI handle\n- * @tc: tc number\n+ * @tc: TC number\n  * @num_qgrps: Number of added queue groups\n  * @buf: list of queue groups to be added\n  * @buf_size: size of buffer for indirect command\n  * @cd: pointer to command details structure or NULL\n  *\n- * This function adds one lan q\n+ * This function adds one LAN queue\n  */\n enum ice_status\n ice_ena_vsi_txq(struct ice_port_info *pi, u16 vsi_handle, u8 tc, u8 num_qgrps,\n@@ -3282,14 +3282,14 @@ ice_ena_vsi_txq(struct ice_port_info *pi, u16 vsi_handle, u8 tc, u8 num_qgrps,\n \t * Bit 5-6.\n \t * - Bit 7 is reserved.\n \t * Without setting the generic section as valid in valid_sections, the\n-\t * Admin Q command will fail with error code ICE_AQ_RC_EINVAL.\n+\t * Admin queue command will fail with error code ICE_AQ_RC_EINVAL.\n \t */\n \tbuf->txqs[0].info.valid_sections = ICE_AQC_ELEM_VALID_GENERIC;\n \n-\t/* add the lan q */\n+\t/* add the LAN queue */\n \tstatus = ice_aq_add_lan_txq(hw, num_qgrps, buf, buf_size, cd);\n \tif (status != ICE_SUCCESS) {\n-\t\tice_debug(hw, ICE_DBG_SCHED, \"enable Q %d failed %d\\n\",\n+\t\tice_debug(hw, ICE_DBG_SCHED, \"enable queue %d failed %d\\n\",\n \t\t\t  LE16_TO_CPU(buf->txqs[0].txq_id),\n \t\t\t  hw->adminq.sq_last_status);\n \t\tgoto ena_txq_exit;\n@@ -3298,7 +3298,7 @@ ice_ena_vsi_txq(struct ice_port_info *pi, u16 vsi_handle, u8 tc, u8 num_qgrps,\n \tnode.node_teid = buf->txqs[0].q_teid;\n \tnode.data.elem_type = ICE_AQC_ELEM_TYPE_LEAF;\n \n-\t/* add a leaf node into schduler tree q layer */\n+\t/* add a leaf node into schduler tree queue layer */\n \tstatus = ice_sched_add_node(pi, hw->num_tx_sched_layers - 1, &node);\n \n ena_txq_exit:\n@@ -3312,8 +3312,8 @@ ice_ena_vsi_txq(struct ice_port_info *pi, u16 vsi_handle, u8 tc, u8 num_qgrps,\n  * @num_queues: number of queues\n  * @q_ids: pointer to the q_id array\n  * @q_teids: pointer to queue node teids\n- * @rst_src: if called due to reset, specifies the rst source\n- * @vmvf_num: the relative vm or vf number that is undergoing the reset\n+ * @rst_src: if called due to reset, specifies the reset source\n+ * @vmvf_num: the relative VM or VF number that is undergoing the reset\n  * @cd: pointer to command details structure or NULL\n  *\n  * This function removes queues and their corresponding nodes in SW DB\n@@ -3363,12 +3363,12 @@ ice_dis_vsi_txq(struct ice_port_info *pi, u8 num_queues, u16 *q_ids,\n }\n \n /**\n- * ice_cfg_vsi_qs - configure the new/exisiting VSI queues\n+ * ice_cfg_vsi_qs - configure the new/existing VSI queues\n  * @pi: port information structure\n  * @vsi_handle: software VSI handle\n  * @tc_bitmap: TC bitmap\n  * @maxqs: max queues array per TC\n- * @owner: lan or rdma\n+ * @owner: LAN or RDMA\n  *\n  * This function adds/updates the VSI queues per TC.\n  */\n@@ -3403,13 +3403,13 @@ ice_cfg_vsi_qs(struct ice_port_info *pi, u16 vsi_handle, u8 tc_bitmap,\n }\n \n /**\n- * ice_cfg_vsi_lan - configure VSI lan queues\n+ * ice_cfg_vsi_lan - configure VSI LAN queues\n  * @pi: port information structure\n  * @vsi_handle: software VSI handle\n  * @tc_bitmap: TC bitmap\n- * @max_lanqs: max lan queues array per TC\n+ * @max_lanqs: max LAN queues array per TC\n  *\n- * This function adds/updates the VSI lan queues per TC.\n+ * This function adds/updates the VSI LAN queues per TC.\n  */\n enum ice_status\n ice_cfg_vsi_lan(struct ice_port_info *pi, u16 vsi_handle, u8 tc_bitmap,\n@@ -3423,7 +3423,7 @@ ice_cfg_vsi_lan(struct ice_port_info *pi, u16 vsi_handle, u8 tc_bitmap,\n \n /**\n  * ice_replay_pre_init - replay pre initialization\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  *\n  * Initializes required config data for VSI, FD, ACL, and RSS before replay.\n  */\n@@ -3447,9 +3447,9 @@ static enum ice_status ice_replay_pre_init(struct ice_hw *hw)\n }\n \n /**\n- * ice_replay_vsi - replay vsi configuration\n- * @hw: pointer to the hw struct\n- * @vsi_handle: driver vsi handle\n+ * ice_replay_vsi - replay VSI configuration\n+ * @hw: pointer to the HW struct\n+ * @vsi_handle: driver VSI handle\n  *\n  * Restore all VSI configuration after reset. It is required to call this\n  * function with main VSI first.\n@@ -3477,7 +3477,7 @@ enum ice_status ice_replay_vsi(struct ice_hw *hw, u16 vsi_handle)\n \n /**\n  * ice_replay_post - post replay configuration cleanup\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  *\n  * Post replay cleanup.\n  */\n@@ -3553,9 +3553,9 @@ ice_stat_update32(struct ice_hw *hw, u32 reg, bool prev_stat_loaded,\n \n \n /**\n- * ice_sched_query_elem - query element information from hw\n- * @hw: pointer to the hw struct\n- * @node_teid: node teid to be queried\n+ * ice_sched_query_elem - query element information from HW\n+ * @hw: pointer to the HW struct\n+ * @node_teid: node TEID to be queried\n  * @buf: buffer to element information\n  *\n  * This function queries HW element information\ndiff --git a/drivers/net/ice/base/ice_common.h b/drivers/net/ice/base/ice_common.h\nindex 5ac991ef2..f2ad86182 100644\n--- a/drivers/net/ice/base/ice_common.h\n+++ b/drivers/net/ice/base/ice_common.h\n@@ -61,8 +61,7 @@ enum ice_status ice_get_caps(struct ice_hw *hw);\n  * ... the value of pointer would equal 0x1008, since 0x1008 is the next\n  * address after 0x1006 which is divisible by 4.\n  */\n-#define ICE_ALIGN(ptr, align)   (((ptr) + ((align) - 1)) & ~((align) - 1))\n-\n+#define ICE_ALIGN(ptr, align)\t(((ptr) + ((align) - 1)) & ~((align) - 1))\n \n enum ice_status\n ice_write_rxq_ctx(struct ice_hw *hw, struct ice_rlan_ctx *rlan_ctx,\n@@ -149,7 +148,6 @@ ice_aq_set_port_id_led(struct ice_port_info *pi, bool is_orig_mode,\n \n \n \n-\n enum ice_status\n ice_dis_vsi_txq(struct ice_port_info *pi, u8 num_queues, u16 *q_ids,\n \t\tu32 *q_teids, enum ice_disq_rst_src rst_src, u16 vmvf_num,\ndiff --git a/drivers/net/ice/base/ice_controlq.c b/drivers/net/ice/base/ice_controlq.c\nindex cbc4cb4c2..1c0830cec 100644\n--- a/drivers/net/ice/base/ice_controlq.c\n+++ b/drivers/net/ice/base/ice_controlq.c\n@@ -54,7 +54,7 @@ static void ice_mailbox_init_regs(struct ice_hw *hw)\n \n /**\n  * ice_check_sq_alive\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  * @cq: pointer to the specific Control queue\n  *\n  * Returns true if Queue is enabled else false.\n@@ -729,7 +729,7 @@ static u16 ice_clean_sq(struct ice_hw *hw, struct ice_ctl_q_info *cq)\n \n /**\n  * ice_sq_done - check if FW has processed the Admin Send Queue (ATQ)\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  * @cq: pointer to the specific Control queue\n  *\n  * Returns true if the firmware has processed all descriptors on the\n@@ -745,7 +745,7 @@ static bool ice_sq_done(struct ice_hw *hw, struct ice_ctl_q_info *cq)\n \n /**\n  * ice_sq_send_cmd - send command to Control Queue (ATQ)\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  * @cq: pointer to the specific Control queue\n  * @desc: prefilled descriptor describing the command (non DMA mem)\n  * @buf: buffer to use for indirect commands (or NULL for direct commands)\n@@ -990,7 +990,7 @@ void ice_fill_dflt_direct_cmd_desc(struct ice_aq_desc *desc, u16 opcode)\n \n /**\n  * ice_clean_rq_elem\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  * @cq: pointer to the specific Control queue\n  * @e: event info from the receive descriptor, includes any buffers\n  * @pending: number of events that could be left to process\ndiff --git a/drivers/net/ice/base/ice_flex_pipe.c b/drivers/net/ice/base/ice_flex_pipe.c\nindex 493bc4e9b..c87424601 100644\n--- a/drivers/net/ice/base/ice_flex_pipe.c\n+++ b/drivers/net/ice/base/ice_flex_pipe.c\n@@ -325,11 +325,11 @@ ice_pkg_enum_entry(struct ice_seg *ice_seg, struct ice_pkg_enum *state,\n  * ice_boost_tcam_handler\n  * @sect_type: section type\n  * @section: pointer to section\n- * @index: index of the boost tcam entry to be returned\n- * @offset: pointer to receive absolute offset, always 0 for boost tcam sections\n+ * @index: index of the boost TCAM entry to be returned\n+ * @offset: pointer to receive absolute offset, always 0 for boost TCAM sections\n  *\n  * This is a callback function that can be passed to ice_pkg_enum_entry.\n- * Handles enumeration of individual boost tcam entries.\n+ * Handles enumeration of individual boost TCAM entries.\n  */\n static void *\n ice_boost_tcam_handler(u32 sect_type, void *section, u32 index, u32 *offset)\n@@ -501,7 +501,7 @@ void ice_init_pkg_hints(struct ice_hw *hw, struct ice_seg *ice_seg)\n \t\tlabel_name = ice_enum_labels(NULL, 0, &state, &val);\n \t}\n \n-\t/* Cache the appropriate boost tcam entry pointers */\n+\t/* Cache the appropriate boost TCAM entry pointers */\n \tfor (i = 0; i < hw->tnl.count; i++) {\n \t\tice_find_boost_entry(ice_seg, hw->tnl.tbl[i].boost_addr,\n \t\t\t\t     &hw->tnl.tbl[i].boost_entry);\n@@ -1078,7 +1078,7 @@ enum ice_status ice_download_pkg(struct ice_hw *hw, struct ice_seg *ice_seg)\n  * @hw: pointer to the hardware structure\n  * @pkg_hdr: pointer to the driver's package hdr\n  *\n- * Saves off the package details into the hw structure.\n+ * Saves off the package details into the HW structure.\n  */\n enum ice_status\n ice_init_pkg_info(struct ice_hw *hw, struct ice_pkg_hdr *pkg_hdr)\n@@ -1468,14 +1468,14 @@ ice_sw_fv_handler(u32 sect_type, void *section, u32 index, u32 *offset)\n /**\n  * ice_get_sw_fv_list\n  * @hw: pointer to the HW structure\n- * @prot_ids: field vector to search for with a given protocol id\n+ * @prot_ids: field vector to search for with a given protocol ID\n  * @ids_cnt: lookup/protocol count\n  * @fv_list: Head of a list\n  *\n  * Finds all the field vector entries from switch block that contain\n- * a given protocol id and returns a list of structures of type\n+ * a given protocol ID and returns a list of structures of type\n  * \"ice_sw_fv_list_entry\". Every structure in the list has a field vector\n- * definition and profile id information\n+ * definition and profile ID information\n  * NOTE: The caller of the function is responsible for freeing the memory\n  * allocated for every list entry.\n  */\n@@ -1782,11 +1782,11 @@ void ice_pkg_buf_free(struct ice_hw *hw, struct ice_buf_build *bld)\n /* PTG Management */\n \n /**\n- * ice_ptg_update_xlt1 - Updates packet type groups in hw via xlt1 table\n+ * ice_ptg_update_xlt1 - Updates packet type groups in HW via XLT1 table\n  * @hw: pointer to the hardware structure\n- * @blk: hw block\n+ * @blk: HW block\n  *\n- * This function will update the xlt1 hardware table to reflect the new\n+ * This function will update the XLT1 hardware table to reflect the new\n  * packet type group configuration.\n  */\n enum ice_status ice_ptg_update_xlt1(struct ice_hw *hw, enum ice_block blk)\n@@ -1817,7 +1817,7 @@ enum ice_status ice_ptg_update_xlt1(struct ice_hw *hw, enum ice_block blk)\n /**\n  * ice_ptg_find_ptype - Search for packet type group using packet type (ptype)\n  * @hw: pointer to the hardware structure\n- * @blk: hw block\n+ * @blk: HW block\n  * @ptype: the ptype to search for\n  * @ptg: pointer to variable that receives the PTG\n  *\n@@ -1838,7 +1838,7 @@ ice_ptg_find_ptype(struct ice_hw *hw, enum ice_block blk, u16 ptype, u8 *ptg)\n /**\n  * ice_ptg_alloc_val - Allocates a new packet type group ID by value\n  * @hw: pointer to the hardware structure\n- * @blk: hw block\n+ * @blk: HW block\n  * @ptg: the ptg to allocate\n  *\n  * This function allocates a given packet type group ID specified by the ptg\n@@ -1853,7 +1853,7 @@ void ice_ptg_alloc_val(struct ice_hw *hw, enum ice_block blk, u8 ptg)\n /**\n  * ice_ptg_alloc - Find a free entry and allocates a new packet type group ID\n  * @hw: pointer to the hardware structure\n- * @blk: hw block\n+ * @blk: HW block\n  *\n  * This function allocates and returns a new packet type group ID. Note\n  * that 0 is the default packet type group, so successfully created PTGs will\n@@ -1877,7 +1877,7 @@ u8 ice_ptg_alloc(struct ice_hw *hw, enum ice_block blk)\n /**\n  * ice_ptg_free - Frees a packet type group\n  * @hw: pointer to the hardware structure\n- * @blk: hw block\n+ * @blk: HW block\n  * @ptg: the ptg ID to free\n  *\n  * This function frees a packet type group, and returns all the current ptypes\n@@ -1902,7 +1902,7 @@ void ice_ptg_free(struct ice_hw *hw, enum ice_block blk, u8 ptg)\n /**\n  * ice_ptg_remove_ptype - Removes ptype from a particular packet type group\n  * @hw: pointer to the hardware structure\n- * @blk: hw block\n+ * @blk: HW block\n  * @ptype: the ptype to remove\n  * @ptg: the ptg to remove the ptype from\n  *\n@@ -1947,7 +1947,7 @@ ice_ptg_remove_ptype(struct ice_hw *hw, enum ice_block blk, u16 ptype, u8 ptg)\n /**\n  * ice_ptg_add_mv_ptype - Adds/moves ptype to a particular packet type group\n  * @hw: pointer to the hardware structure\n- * @blk: hw block\n+ * @blk: HW block\n  * @ptype: the ptype to add or move\n  * @ptg: the ptg to add or move the ptype to\n  *\n@@ -1998,10 +1998,10 @@ ice_ptg_add_mv_ptype(struct ice_hw *hw, enum ice_block blk, u16 ptype, u8 ptg)\n \n /* Block / table size info */\n struct ice_blk_size_details {\n-\tu16 xlt1;\t\t\t/* # xlt1 entries */\n-\tu16 xlt2;\t\t\t/* # xlt2 entries */\n-\tu16 prof_tcam;\t\t\t/* # profile id tcam entries */\n-\tu16 prof_id;\t\t\t/* # profile ids */\n+\tu16 xlt1;\t\t\t/* # XLT1 entries */\n+\tu16 xlt2;\t\t\t/* # XLT2 entries */\n+\tu16 prof_tcam;\t\t\t/* # profile ID TCAM entries */\n+\tu16 prof_id;\t\t\t/* # profile IDs */\n \tu8 prof_cdid_bits;\t\t/* # cdid one-hot bits used in key */\n \tu16 prof_redir;\t\t\t/* # profile redirection entries */\n \tu16 es;\t\t\t\t/* # extraction sequence entries */\n@@ -2079,7 +2079,7 @@ ice_match_prop_lst(struct LIST_HEAD_TYPE *list1, struct LIST_HEAD_TYPE *list2)\n \t/* profile cookies must compare, and in the exact same order to take\n \t * into account priority\n \t */\n-\twhile (--count) {\n+\twhile (count--) {\n \t\tif (tmp2->profile_cookie != tmp1->profile_cookie)\n \t\t\treturn false;\n \n@@ -2093,13 +2093,13 @@ ice_match_prop_lst(struct LIST_HEAD_TYPE *list1, struct LIST_HEAD_TYPE *list2)\n /* VSIG Management */\n \n /**\n- * ice_vsig_update_xlt2_sect - update one section of xlt2 table\n+ * ice_vsig_update_xlt2_sect - update one section of XLT2 table\n  * @hw: pointer to the hardware structure\n- * @blk: hw block\n- * @vsi: hw vsi number to program\n- * @vsig: vsig for the vsi\n+ * @blk: HW block\n+ * @vsi: HW VSI number to program\n+ * @vsig: vsig for the VSI\n  *\n- * This function will update the xlt2 hardware table with the input vsi\n+ * This function will update the XLT2 hardware table with the input VSI\n  * group configuration.\n  */\n static enum ice_status\n@@ -2128,11 +2128,11 @@ ice_vsig_update_xlt2_sect(struct ice_hw *hw, enum ice_block blk, u16 vsi,\n }\n \n /**\n- * ice_vsig_update_xlt2 - update xlt2 table with VSIG configuration\n+ * ice_vsig_update_xlt2 - update XLT2 table with VSIG configuration\n  * @hw: pointer to the hardware structure\n- * @blk: hw block\n+ * @blk: HW block\n  *\n- * This function will update the xlt2 hardware table with the input vsi\n+ * This function will update the XLT2 hardware table with the input VSI\n  * group configuration of used vsis.\n  */\n enum ice_status ice_vsig_update_xlt2(struct ice_hw *hw, enum ice_block blk)\n@@ -2158,14 +2158,14 @@ enum ice_status ice_vsig_update_xlt2(struct ice_hw *hw, enum ice_block blk)\n }\n \n /**\n- * ice_vsig_find_vsi - find a VSIG that contains a specified vsi\n+ * ice_vsig_find_vsi - find a VSIG that contains a specified VSI\n  * @hw: pointer to the hardware structure\n- * @blk: hw block\n- * @vsi: vsi of interest\n- * @vsig: pointer to receive the vsi group\n+ * @blk: HW block\n+ * @vsi: VSI of interest\n+ * @vsig: pointer to receive the VSI group\n  *\n- * This function will lookup the vsi entry in the XLT2 list and return\n- * the vsi group its associated with.\n+ * This function will lookup the VSI entry in the XLT2 list and return\n+ * the VSI group its associated with.\n  */\n enum ice_status\n ice_vsig_find_vsi(struct ice_hw *hw, enum ice_block blk, u16 vsi, u16 *vsig)\n@@ -2174,7 +2174,7 @@ ice_vsig_find_vsi(struct ice_hw *hw, enum ice_block blk, u16 vsi, u16 *vsig)\n \t\treturn ICE_ERR_PARAM;\n \n \t/* As long as there's a default or valid VSIG associated with the input\n-\t * vsi, the functions returns a success. Any handling of VSIG will be\n+\t * VSI, the functions returns a success. Any handling of VSIG will be\n \t * done by the following add, update or remove functions.\n \t */\n \t*vsig = hw->blk[blk].xlt2.vsis[vsi].vsig;\n@@ -2185,7 +2185,7 @@ ice_vsig_find_vsi(struct ice_hw *hw, enum ice_block blk, u16 vsi, u16 *vsig)\n /**\n  * ice_vsig_alloc_val - allocate a new VSIG by value\n  * @hw: pointer to the hardware structure\n- * @blk: hw block\n+ * @blk: HW block\n  * @vsig: the vsig to allocate\n  *\n  * This function will allocate a given VSIG specified by the vsig parameter.\n@@ -2205,7 +2205,7 @@ static u16 ice_vsig_alloc_val(struct ice_hw *hw, enum ice_block blk, u16 vsig)\n /**\n  * ice_vsig_alloc - Finds a free entry and allocates a new VSIG\n  * @hw: pointer to the hardware structure\n- * @blk: hw block\n+ * @blk: HW block\n  *\n  * This function will iterate through the VSIG list and mark the first\n  * unused entry for the new VSIG entry as used and return that value.\n@@ -2222,16 +2222,16 @@ static u16 ice_vsig_alloc(struct ice_hw *hw, enum ice_block blk)\n }\n \n /**\n- * ice_find_dup_props_vsig - find vsi group with a specified set of properties\n+ * ice_find_dup_props_vsig - find VSI group with a specified set of properties\n  * @hw: pointer to the hardware structure\n- * @blk: hw block\n+ * @blk: HW block\n  * @chs: characteristic list\n  * @vsig: returns the VSIG with the matching profiles, if found\n  *\n- * Each VSIG is associated with a characteristic set; i.e. all vsis under\n+ * Each VSIG is associated with a characteristic set; i.e. all VSIs under\n  * a group have the same characteristic set. To check if there exists a VSIG\n  * which has the same characteristics as the input characteristics; this\n- * function will iterate through the xlt2 list and return the VSIG that has a\n+ * function will iterate through the XLT2 list and return the VSIG that has a\n  * matching configuration. In order to make sure that priorities are accounted\n  * for, the list must match exactly, including the order in which the\n  * characteristics are listed.\n@@ -2257,12 +2257,12 @@ ice_find_dup_props_vsig(struct ice_hw *hw, enum ice_block blk,\n }\n \n /**\n- * ice_vsig_free - free vsi group\n+ * ice_vsig_free - free VSI group\n  * @hw: pointer to the hardware structure\n- * @blk: hw block\n+ * @blk: HW block\n  * @vsig: VSIG to remove\n  *\n- * The function will remove all vsis associated with the input VSIG and move\n+ * The function will remove all VSIs associated with the input VSIG and move\n  * them to the DEFAULT_VSIG and mark the VSIG available.\n  */\n enum ice_status\n@@ -2310,14 +2310,14 @@ ice_vsig_free(struct ice_hw *hw, enum ice_block blk, u16 vsig)\n }\n \n /**\n- * ice_vsig_add_mv_vsi - add or move a vsi to a vsi group\n+ * ice_vsig_add_mv_vsi - add or move a VSI to a VSI group\n  * @hw: pointer to the hardware structure\n- * @blk: hw block\n- * @vsi: vsi to move\n- * @vsig: destination vsi group\n+ * @blk: HW block\n+ * @vsi: VSI to move\n+ * @vsig: destination VSI group\n  *\n- * This function will move or add the input vsi to the target VSIG.\n- * The function will find the original VSIG the vsi belongs to and\n+ * This function will move or add the input VSI to the target VSIG.\n+ * The function will find the original VSIG the VSI belongs to and\n  * move the entry to the DEFAULT_VSIG, update the original VSIG and\n  * then move entry to the new VSIG.\n  */\n@@ -2358,7 +2358,7 @@ ice_vsig_add_mv_vsi(struct ice_hw *hw, enum ice_block blk, u16 vsi, u16 vsig)\n \tif (idx == ICE_DEFAULT_VSIG)\n \t\treturn ICE_SUCCESS;\n \n-\t/* Create vsi entry and add VSIG and prop_mask values */\n+\t/* Create VSI entry and add VSIG and prop_mask values */\n \thw->blk[blk].xlt2.vsis[vsi].vsig = vsig;\n \thw->blk[blk].xlt2.vsis[vsi].changed = 1;\n \n@@ -2373,13 +2373,13 @@ ice_vsig_add_mv_vsi(struct ice_hw *hw, enum ice_block blk, u16 vsi, u16 vsig)\n }\n \n /**\n- * ice_vsig_remove_vsi - remove vsi from VSIG\n+ * ice_vsig_remove_vsi - remove VSI from VSIG\n  * @hw: pointer to the hardware structure\n- * @blk: hw block\n- * @vsi: vsi to remove\n- * @vsig: vsi group to remove from\n+ * @blk: HW block\n+ * @vsi: VSI to remove\n+ * @vsig: VSI group to remove from\n  *\n- * The function will remove the input vsi from its vsi group and move it\n+ * The function will remove the input VSI from its VSI group and move it\n  * to the DEFAULT_VSIG.\n  */\n enum ice_status\n@@ -2396,7 +2396,7 @@ ice_vsig_remove_vsi(struct ice_hw *hw, enum ice_block blk, u16 vsi, u16 vsig)\n \tif (!hw->blk[blk].xlt2.vsig_tbl[idx].in_use)\n \t\treturn ICE_ERR_DOES_NOT_EXIST;\n \n-\t/* entry already in default VSIG, dont have to remove */\n+\t/* entry already in default VSIG, don't have to remove */\n \tif (idx == ICE_DEFAULT_VSIG)\n \t\treturn ICE_SUCCESS;\n \n@@ -2407,7 +2407,7 @@ ice_vsig_remove_vsi(struct ice_hw *hw, enum ice_block blk, u16 vsi, u16 vsig)\n \tvsi_tgt = &hw->blk[blk].xlt2.vsis[vsi];\n \tvsi_cur = (*vsi_head);\n \n-\t/* iterate the vsi list, skip over the entry to be removed */\n+\t/* iterate the VSI list, skip over the entry to be removed */\n \twhile (vsi_cur) {\n \t\tif (vsi_tgt == vsi_cur) {\n \t\t\t(*vsi_head) = vsi_cur->next_vsi;\n@@ -2417,7 +2417,7 @@ ice_vsig_remove_vsi(struct ice_hw *hw, enum ice_block blk, u16 vsi, u16 vsig)\n \t\tvsi_cur = vsi_cur->next_vsi;\n \t}\n \n-\t/* verify if vsi was removed from group list */\n+\t/* verify if VSI was removed from group list */\n \tif (!vsi_cur)\n \t\treturn ICE_ERR_DOES_NOT_EXIST;\n \n@@ -2429,11 +2429,11 @@ ice_vsig_remove_vsi(struct ice_hw *hw, enum ice_block blk, u16 vsi, u16 vsig)\n }\n \n /**\n- * ice_find_prof_id - find profile id for a given field vector\n+ * ice_find_prof_id - find profile ID for a given field vector\n  * @hw: pointer to the hardware structure\n- * @blk: hw block\n+ * @blk: HW block\n  * @fv: field vector to search for\n- * @prof_id: receives the profile id\n+ * @prof_id: receives the profile ID\n  */\n static enum ice_status\n ice_find_prof_id(struct ice_hw *hw, enum ice_block blk,\n@@ -2456,7 +2456,7 @@ ice_find_prof_id(struct ice_hw *hw, enum ice_block blk,\n }\n \n /**\n- * ice_prof_id_rsrc_type - get profile id resource type for a block type\n+ * ice_prof_id_rsrc_type - get profile ID resource type for a block type\n  * @blk: the block type\n  * @rsrc_type: pointer to variable to receive the resource type\n  */\n@@ -2485,7 +2485,7 @@ static bool ice_prof_id_rsrc_type(enum ice_block blk, u16 *rsrc_type)\n }\n \n /**\n- * ice_tcam_ent_rsrc_type - get tcam entry resource type for a block type\n+ * ice_tcam_ent_rsrc_type - get TCAM entry resource type for a block type\n  * @blk: the block type\n  * @rsrc_type: pointer to variable to receive the resource type\n  */\n@@ -2707,10 +2707,10 @@ ice_free_res_workaround(struct ice_hw *hw, u16 type, u16 num, u16 *res)\n }\n \n /**\n- * ice_alloc_tcam_ent - allocate hardware tcam entry\n- * @hw: pointer to the hw struct\n- * @blk: the block to allocate the tcam for\n- * @tcam_idx: pointer to variable to receive the tcam entry\n+ * ice_alloc_tcam_ent - allocate hardware TCAM entry\n+ * @hw: pointer to the HW struct\n+ * @blk: the block to allocate the TCAM for\n+ * @tcam_idx: pointer to variable to receive the TCAM entry\n  *\n  * This function allocates a new entry in a Profile ID TCAM for a specific\n  * block.\n@@ -2727,10 +2727,10 @@ ice_alloc_tcam_ent(struct ice_hw *hw, enum ice_block blk, u16 *tcam_idx)\n }\n \n /**\n- * ice_free_tcam_ent - free hardware tcam entry\n- * @hw: pointer to the hw struct\n- * @blk: the block from which to free the tcam entry\n- * @tcam_idx: the tcam entry to free\n+ * ice_free_tcam_ent - free hardware TCAM entry\n+ * @hw: pointer to the HW struct\n+ * @blk: the block from which to free the TCAM entry\n+ * @tcam_idx: the TCAM entry to free\n  *\n  * This function frees an entry in a Profile ID TCAM for a specific block.\n  */\n@@ -2746,12 +2746,12 @@ ice_free_tcam_ent(struct ice_hw *hw, enum ice_block blk, u16 tcam_idx)\n }\n \n /**\n- * ice_alloc_prof_id - allocate profile id\n- * @hw: pointer to the hw struct\n- * @blk: the block to allocate the profile id for\n- * @prof_id: pointer to variable to receive the profile id\n+ * ice_alloc_prof_id - allocate profile ID\n+ * @hw: pointer to the HW struct\n+ * @blk: the block to allocate the profile ID for\n+ * @prof_id: pointer to variable to receive the profile ID\n  *\n- * This function allocates a new profile id, which also corresponds to a Field\n+ * This function allocates a new profile ID, which also corresponds to a Field\n  * Vector (Extraction Sequence) entry.\n  */\n static enum ice_status\n@@ -2772,12 +2772,12 @@ ice_alloc_prof_id(struct ice_hw *hw, enum ice_block blk, u8 *prof_id)\n }\n \n /**\n- * ice_free_prof_id - free profile id\n- * @hw: pointer to the hw struct\n- * @blk: the block from which to free the profile id\n- * @prof_id: the profile id to free\n+ * ice_free_prof_id - free profile ID\n+ * @hw: pointer to the HW struct\n+ * @blk: the block from which to free the profile ID\n+ * @prof_id: the profile ID to free\n  *\n- * This function frees a profile id, which also corresponds to a Field Vector.\n+ * This function frees a profile ID, which also corresponds to a Field Vector.\n  */\n static enum ice_status\n ice_free_prof_id(struct ice_hw *hw, enum ice_block blk, u8 prof_id)\n@@ -2801,9 +2801,9 @@ ice_free_prof_id(struct ice_hw *hw, enum ice_block blk, u8 prof_id)\n \n /**\n  * ice_prof_inc_ref - increment reference count for profile\n- * @hw: pointer to the hw struct\n- * @blk: the block from which to free the profile id\n- * @prof_id: the profile id for which to increment the reference count\n+ * @hw: pointer to the HW struct\n+ * @blk: the block from which to free the profile ID\n+ * @prof_id: the profile ID for which to increment the reference count\n  */\n static enum ice_status\n ice_prof_inc_ref(struct ice_hw *hw, enum ice_block blk, u8 prof_id)\n@@ -2818,9 +2818,9 @@ ice_prof_inc_ref(struct ice_hw *hw, enum ice_block blk, u8 prof_id)\n \n /**\n  * ice_prof_dec_ref - decrement reference count for profile\n- * @hw: pointer to the hw struct\n- * @blk: the block from which to free the profile id\n- * @prof_id: the profile id for which to decrement the reference count\n+ * @hw: pointer to the HW struct\n+ * @blk: the block from which to free the profile ID\n+ * @prof_id: the profile ID for which to decrement the reference count\n  */\n static enum ice_status\n ice_prof_dec_ref(struct ice_hw *hw, enum ice_block blk, u8 prof_id)\n@@ -2838,9 +2838,9 @@ ice_prof_dec_ref(struct ice_hw *hw, enum ice_block blk, u8 prof_id)\n \n /**\n  * ice_write_es - write an extraction sequence to hardware\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  * @blk: the block in which to write the extraction sequence\n- * @prof_id: the profile id to write\n+ * @prof_id: the profile ID to write\n  * @fv: pointer to the extraction sequence to write\n  */\n static void\n@@ -2921,7 +2921,7 @@ static void ice_fill_tbl(struct ice_hw *hw, enum ice_block block_id, u32 sid)\n \tu8 *src, *dst;\n \tvoid *sect;\n \n-\t/* if the hw segment pointer is null then the first iteration of\n+\t/* if the HW segment pointer is null then the first iteration of\n \t * ice_pkg_enum_section() will fail. In this case the Hw tables will\n \t * not be filled and return success.\n \t */\n@@ -3072,7 +3072,7 @@ static void ice_free_flow_profs(struct ice_hw *hw)\n /**\n  * ice_free_prof_map - frees the profile map\n  * @hw: pointer to the hardware structure\n- * @blk: the hw block which contains the profile map to be freed\n+ * @blk: the HW block which contains the profile map to be freed\n  */\n static void ice_free_prof_map(struct ice_hw *hw, enum ice_block blk)\n {\n@@ -3091,7 +3091,7 @@ static void ice_free_prof_map(struct ice_hw *hw, enum ice_block blk)\n /**\n  * ice_free_vsig_tbl - free complete VSIG table entries\n  * @hw: pointer to the hardware structure\n- * @blk: the hw block on which to free the VSIG table entries\n+ * @blk: the HW block on which to free the VSIG table entries\n  */\n static void ice_free_vsig_tbl(struct ice_hw *hw, enum ice_block blk)\n {\n@@ -3151,9 +3151,9 @@ static void ice_init_flow_profs(struct ice_hw *hw)\n }\n \n /**\n- * ice_init_sw_xlt1_db - init software xlt1 database from hw tables\n+ * ice_init_sw_xlt1_db - init software XLT1 database from HW tables\n  * @hw: pointer to the hardware structure\n- * @blk: the hw block to initialize\n+ * @blk: the HW block to initialize\n  */\n static\n void ice_init_sw_xlt1_db(struct ice_hw *hw, enum ice_block blk)\n@@ -3172,9 +3172,9 @@ void ice_init_sw_xlt1_db(struct ice_hw *hw, enum ice_block blk)\n }\n \n /**\n- * ice_init_sw_xlt2_db - init software xlt2 database from hw tables\n+ * ice_init_sw_xlt2_db - init software XLT2 database from HW tables\n  * @hw: pointer to the hardware structure\n- * @blk: the hw block to initialize\n+ * @blk: the HW block to initialize\n  */\n static\n void ice_init_sw_xlt2_db(struct ice_hw *hw, enum ice_block blk)\n@@ -3197,7 +3197,7 @@ void ice_init_sw_xlt2_db(struct ice_hw *hw, enum ice_block blk)\n }\n \n /**\n- * ice_init_sw_db - init software database from hw tables\n+ * ice_init_sw_db - init software database from HW tables\n  * @hw: pointer to the hardware structure\n  */\n static\n@@ -3329,9 +3329,9 @@ enum ice_status ice_init_hw_tbls(struct ice_hw *hw)\n }\n \n /**\n- * ice_prof_gen_key - generate profile id key\n- * @hw: pointer to the hw struct\n- * @blk: the block in which to write profile id to\n+ * ice_prof_gen_key - generate profile ID key\n+ * @hw: pointer to the HW struct\n+ * @blk: the block in which to write profile ID to\n  * @ptg: packet type group (PTG) portion of key\n  * @vsig: VSIG portion of key\n  * @cdid: cdid portion of key\n@@ -3339,7 +3339,7 @@ enum ice_status ice_init_hw_tbls(struct ice_hw *hw)\n  * @vl_msk: valid mask\n  * @dc_msk: don't care mask\n  * @nm_msk: never match mask\n- * @key: output of profile id key\n+ * @key: output of profile ID key\n  */\n static enum ice_status\n ice_prof_gen_key(struct ice_hw *hw, enum ice_block blk, u8 ptg, u16 vsig,\n@@ -3384,11 +3384,11 @@ ice_prof_gen_key(struct ice_hw *hw, enum ice_block blk, u8 ptg, u16 vsig,\n }\n \n /**\n- * ice_tcam_write_entry - write tcam entry\n- * @hw: pointer to the hw struct\n- * @blk: the block in which to write profile id to\n+ * ice_tcam_write_entry - write TCAM entry\n+ * @hw: pointer to the HW struct\n+ * @blk: the block in which to write profile ID to\n  * @idx: the entry index to write to\n- * @prof_id: profile id\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@@ -3418,9 +3418,9 @@ ice_tcam_write_entry(struct ice_hw *hw, enum ice_block blk, u16 idx,\n }\n \n /**\n- * ice_vsig_get_ref - returns number of vsis belong to a VSIG\n+ * ice_vsig_get_ref - returns number of VSIs belong to a VSIG\n  * @hw: pointer to the hardware structure\n- * @blk: hw block\n+ * @blk: HW block\n  * @vsig: VSIG to query\n  * @refs: pointer to variable to receive the reference count\n  */\n@@ -3446,7 +3446,7 @@ ice_vsig_get_ref(struct ice_hw *hw, enum ice_block blk, u16 vsig, u16 *refs)\n /**\n  * ice_get_ptg - get or allocate a ptg for a ptype\n  * @hw: pointer to the hardware structure\n- * @blk: hw block\n+ * @blk: HW block\n  * @ptype: the ptype to retrieve the PTG for\n  * @ptg: receives the PTG of the ptype\n  * @add: receive boolean indicating whether PTG was added or not\n@@ -3483,7 +3483,7 @@ ice_get_ptg(struct ice_hw *hw, enum ice_block blk, u16 ptype, u8 *ptg,\n /**\n  * ice_has_prof_vsig - check to see if VSIG has a specific profile\n  * @hw: pointer to the hardware structure\n- * @blk: hw block\n+ * @blk: HW block\n  * @vsig: VSIG to check against\n  * @hdl: profile handle\n  */\n@@ -3500,14 +3500,14 @@ ice_has_prof_vsig(struct ice_hw *hw, enum ice_block blk, u16 vsig, u64 hdl)\n \t}\n \n \tice_debug(hw, ICE_DBG_INIT,\n-\t\t  \"Characteristic list for vsi group %d not found.\\n\",\n+\t\t  \"Characteristic list for VSI group %d not found.\\n\",\n \t\t  vsig);\n \treturn false;\n }\n \n /**\n- * ice_prof_bld_es - build profile id extraction sequence changes\n- * @hw: pointer to the hw struct\n+ * ice_prof_bld_es - build profile ID extraction sequence changes\n+ * @hw: pointer to the HW struct\n  * @blk: hardware block\n  * @bld: the update package buffer build to add to\n  * @chgs: the list of changes to make in hardware\n@@ -3546,8 +3546,8 @@ ice_prof_bld_es(struct ice_hw *hw, enum ice_block blk,\n }\n \n /**\n- * ice_prof_bld_tcam - build profile id tcam changes\n- * @hw: pointer to the hw struct\n+ * ice_prof_bld_tcam - build profile ID TCAM changes\n+ * @hw: pointer to the HW struct\n  * @blk: hardware block\n  * @bld: the update package buffer build to add to\n  * @chgs: the list of changes to make in hardware\n@@ -3586,7 +3586,7 @@ ice_prof_bld_tcam(struct ice_hw *hw, enum ice_block blk,\n }\n \n /**\n- * ice_prof_bld_xlt1 - build xlt1 changes\n+ * ice_prof_bld_xlt1 - build XLT1 changes\n  * @blk: hardware block\n  * @bld: the update package buffer build to add to\n  * @chgs: the list of changes to make in hardware\n@@ -3619,7 +3619,7 @@ ice_prof_bld_xlt1(enum ice_block blk, struct ice_buf_build *bld,\n }\n \n /**\n- * ice_prof_bld_xlt2 - build xlt2 changes\n+ * ice_prof_bld_xlt2 - build XLT2 changes\n  * @blk: hardware block\n  * @bld: the update package buffer build to add to\n  * @chgs: the list of changes to make in hardware\n@@ -3662,7 +3662,7 @@ ice_prof_bld_xlt2(enum ice_block blk, struct ice_buf_build *bld,\n \n /**\n  * ice_upd_prof_hw - update hardware using the change list\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  * @blk: hardware block\n  * @chgs: the list of changes to make in hardware\n  */\n@@ -3763,16 +3763,16 @@ ice_upd_prof_hw(struct ice_hw *hw, enum ice_block blk,\n \n /**\n  * ice_add_prof - add profile\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  * @blk: hardware block\n- * @id: profile tracking id\n+ * @id: profile tracking ID\n  * @ptypes: array of bitmaps indicating ptypes (ICE_FLOW_PTYPE_MAX bits)\n  * @es: extraction sequence (length of array is determined by the block)\n  *\n  * This function registers a profile, which matches a set of PTYPES with a\n  * particular extraction sequence. While the hardware profile is allocated\n  * it will not be written until the first call to ice_add_flow that specifies\n- * the id value used here.\n+ * the ID value used here.\n  */\n enum ice_status\n ice_add_prof(struct ice_hw *hw, enum ice_block blk, u64 id, u8 ptypes[],\n@@ -3787,7 +3787,7 @@ ice_add_prof(struct ice_hw *hw, enum ice_block blk, u64 id, u8 ptypes[],\n \t/* search for existing profile */\n \tstatus = ice_find_prof_id(hw, blk, es, &prof_id);\n \tif (status) {\n-\t\t/* allocate profile id */\n+\t\t/* allocate profile ID */\n \t\tstatus = ice_alloc_prof_id(hw, blk, &prof_id);\n \t\tif (status)\n \t\t\tgoto err_ice_add_prof;\n@@ -3851,7 +3851,7 @@ ice_add_prof(struct ice_hw *hw, enum ice_block blk, u64 id, u8 ptypes[],\n \n /**\n  * ice_search_prof_id - Search for a profile tracking ID\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  * @blk: hardware block\n  * @id: profile tracking ID\n  *\n@@ -3876,7 +3876,7 @@ ice_search_prof_id(struct ice_hw *hw, enum ice_block blk, u64 id)\n \n /**\n  * ice_set_prof_context - Set context for a given profile\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  * @blk: hardware block\n  * @id: profile tracking ID\n  * @cntxt: context\n@@ -3895,7 +3895,7 @@ ice_set_prof_context(struct ice_hw *hw, enum ice_block blk, u64 id, u64 cntxt)\n \n /**\n  * ice_get_prof_context - Get context for a given profile\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  * @blk: hardware block\n  * @id: profile tracking ID\n  * @cntxt: pointer to variable to receive the context\n@@ -3914,7 +3914,7 @@ ice_get_prof_context(struct ice_hw *hw, enum ice_block blk, u64 id, u64 *cntxt)\n \n /**\n  * ice_vsig_prof_id_count - count profiles in a VSIG\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  * @blk: hardware block\n  * @vsig: VSIG to remove the profile from\n  */\n@@ -3933,8 +3933,8 @@ ice_vsig_prof_id_count(struct ice_hw *hw, enum ice_block blk, u16 vsig)\n }\n \n /**\n- * ice_rel_tcam_idx - release a tcam index\n- * @hw: pointer to the hw struct\n+ * ice_rel_tcam_idx - release a TCAM index\n+ * @hw: pointer to the HW struct\n  * @blk: hardware block\n  * @idx: the index to release\n  */\n@@ -3947,13 +3947,13 @@ ice_rel_tcam_idx(struct ice_hw *hw, enum ice_block blk, u16 idx)\n \tu8 nm_msk[ICE_TCAM_KEY_VAL_SZ] = { 0x01, 0x00, 0x00, 0x00, 0x00 };\n \tenum ice_status status;\n \n-\t/* write the tcam entry */\n+\t/* write the TCAM entry */\n \tstatus = ice_tcam_write_entry(hw, blk, idx, 0, 0, 0, 0, 0, vl_msk,\n \t\t\t\t      dc_msk, nm_msk);\n \tif (status)\n \t\treturn status;\n \n-\t/* release the tcam entry */\n+\t/* release the TCAM entry */\n \tstatus = ice_free_tcam_ent(hw, blk, idx);\n \n \treturn status;\n@@ -3961,7 +3961,7 @@ ice_rel_tcam_idx(struct ice_hw *hw, enum ice_block blk, u16 idx)\n \n /**\n  * ice_rem_prof_id - remove one profile from a VSIG\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  * @blk: hardware block\n  * @vsig: VSIG to remove the profile from\n  * @prof: pointer to profile structure to remove\n@@ -4007,7 +4007,7 @@ ice_rem_prof_id(struct ice_hw *hw, enum ice_block blk, u16 vsig,\n \n /**\n  * ice_rem_vsig - remove VSIG\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  * @blk: hardware block\n  * @vsig: the VSIG to remove\n  * @chg: the change list\n@@ -4069,7 +4069,7 @@ ice_rem_vsig(struct ice_hw *hw, enum ice_block blk, u16 vsig,\n \n /**\n  * ice_rem_prof_id_vsig - remove a specific profile from a VSIG\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  * @blk: hardware block\n  * @vsig: VSIG to remove the profile from\n  * @hdl: profile handle indicating which profile to remove\n@@ -4105,7 +4105,7 @@ ice_rem_prof_id_vsig(struct ice_hw *hw, enum ice_block blk, u16 vsig, u64 hdl,\n \n /**\n  * ice_rem_flow_all - remove all flows with a particular profile\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  * @blk: hardware block\n  * @id: profile tracking ID\n  */\n@@ -4143,11 +4143,11 @@ ice_rem_flow_all(struct ice_hw *hw, enum ice_block blk, u64 id)\n \n /**\n  * ice_rem_prof - remove profile\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  * @blk: hardware block\n  * @id: profile tracking ID\n  *\n- * This will remove the profile specified by the id parameter, which was\n+ * This will remove the profile specified by the ID parameter, which was\n  * previously created through ice_add_prof. If any existing entries\n  * are associated with this profile, they will be removed as well.\n  */\n@@ -4177,7 +4177,7 @@ enum ice_status ice_rem_prof(struct ice_hw *hw, enum ice_block blk, u64 id)\n \n /**\n  * ice_get_prof_ptgs - get ptgs for profile\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  * @blk: hardware block\n  * @hdl: profile handle\n  * @chg: change list\n@@ -4190,7 +4190,7 @@ ice_get_prof_ptgs(struct ice_hw *hw, enum ice_block blk, u64 hdl,\n \tstruct ice_chs_chg *p;\n \tu16 i;\n \n-\t/* Get the details on the profile specified by the handle id */\n+\t/* Get the details on the profile specified by the handle ID */\n \tmap = ice_search_prof_id(hw, blk, hdl);\n \tif (!map)\n \t\treturn ICE_ERR_DOES_NOT_EXIST;\n@@ -4231,7 +4231,7 @@ ice_get_prof_ptgs(struct ice_hw *hw, enum ice_block blk, u64 hdl,\n \n /**\n  * ice_get_profs_vsig - get a copy of the list of profiles from a VSIG\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  * @blk: hardware block\n  * @vsig: VSIG from which to copy the list\n  * @lst: output list\n@@ -4272,7 +4272,7 @@ ice_get_profs_vsig(struct ice_hw *hw, enum ice_block blk, u16 vsig,\n \n /**\n  * ice_add_prof_to_lst - add profile entry to a list\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  * @blk: hardware block\n  * @lst: the list to be added to\n  * @hdl: profile handle of entry to add\n@@ -4320,7 +4320,7 @@ ice_add_prof_to_lst(struct ice_hw *hw, enum ice_block blk,\n \n /**\n  * ice_move_vsi - move VSI to another VSIG\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  * @blk: hardware block\n  * @vsi: the VSI to move\n  * @vsig: the VSIG to move the VSI to\n@@ -4357,15 +4357,15 @@ ice_move_vsi(struct ice_hw *hw, enum ice_block blk, u16 vsi, u16 vsig,\n }\n \n /**\n- * ice_prof_tcam_ena_dis - add enable or disable tcam change\n- * @hw: pointer to the hw struct\n+ * ice_prof_tcam_ena_dis - add enable or disable TCAM change\n+ * @hw: pointer to the HW struct\n  * @blk: hardware block\n  * @enable: true to enable, false to disable\n- * @vsig: the vsig of the tcam entry\n- * @tcam: pointer the tcam info structure of the tcam to disable\n+ * @vsig: the vsig of the TCAM entry\n+ * @tcam: pointer the TCAM info structure of the TCAM to disable\n  * @chg: the change list\n  *\n- * This function appends an enable or disable tcam entry in the change log\n+ * This function appends an enable or disable TCAM entry in the change log\n  */\n static enum ice_status\n ice_prof_tcam_ena_dis(struct ice_hw *hw, enum ice_block blk, bool enable,\n@@ -4418,7 +4418,7 @@ ice_prof_tcam_ena_dis(struct ice_hw *hw, enum ice_block blk, bool enable,\n \n /**\n  * ice_adj_prof_priorities - adjust profile based on priorities\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  * @blk: hardware block\n  * @vsig: the VSIG for which to adjust profile priorities\n  * @chg: the change list\n@@ -4487,7 +4487,7 @@ ice_adj_prof_priorities(struct ice_hw *hw, enum ice_block blk, u16 vsig,\n \n /**\n  * ice_add_prof_id_vsig - add profile to VSIG\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  * @blk: hardware block\n  * @vsig: the VSIG to which this profile is to be added\n  * @hdl: the profile handle indicating the profile to add\n@@ -4506,7 +4506,7 @@ ice_add_prof_id_vsig(struct ice_hw *hw, enum ice_block blk, u16 vsig, u64 hdl,\n \tstruct ice_chs_chg *p;\n \tu16 i;\n \n-\t/* Get the details on the profile specified by the handle id */\n+\t/* Get the details on the profile specified by the handle ID */\n \tmap = ice_search_prof_id(hw, blk, hdl);\n \tif (!map)\n \t\treturn ICE_ERR_DOES_NOT_EXIST;\n@@ -4524,7 +4524,7 @@ ice_add_prof_id_vsig(struct ice_hw *hw, enum ice_block blk, u16 vsig, u64 hdl,\n \tt->prof_id = map->prof_id;\n \tt->tcam_count = map->ptype_count;\n \n-\t/* create tcam entries */\n+\t/* create TCAM entries */\n \tfor (i = 0; i < map->ptype_count; i++) {\n \t\tenum ice_status status;\n \t\tu16 tcam_idx;\n@@ -4543,7 +4543,7 @@ ice_add_prof_id_vsig(struct ice_hw *hw, enum ice_block blk, u16 vsig, u64 hdl,\n \t\tif (!p)\n \t\t\tgoto err_ice_add_prof_id_vsig;\n \n-\t\t/* allocate the tcam entry index */\n+\t\t/* allocate the TCAM entry index */\n \t\tstatus = ice_alloc_tcam_ent(hw, blk, &tcam_idx);\n \t\tif (status)\n \t\t\tgoto err_ice_add_prof_id_vsig;\n@@ -4560,7 +4560,7 @@ ice_add_prof_id_vsig(struct ice_hw *hw, enum ice_block blk, u16 vsig, u64 hdl,\n \t\tp->vsig = vsig;\n \t\tp->tcam_idx = t->tcam[i].tcam_idx;\n \n-\t\t/* write the tcam entry */\n+\t\t/* write the TCAM entry */\n \t\tstatus = ice_tcam_write_entry(hw, blk, t->tcam[i].tcam_idx,\n \t\t\t\t\t      t->tcam[i].prof_id,\n \t\t\t\t\t      t->tcam[i].ptg, vsig, 0, 0,\n@@ -4568,8 +4568,8 @@ ice_add_prof_id_vsig(struct ice_hw *hw, enum ice_block blk, u16 vsig, u64 hdl,\n \t\tif (status)\n \t\t\tgoto err_ice_add_prof_id_vsig;\n \n-\t\t/* this increments the reference count of how many tcam entries\n-\t\t * are using this hw profile id\n+\t\t/* this increments the reference count of how many TCAM entries\n+\t\t * are using this HW profile ID\n \t\t */\n \t\tstatus = ice_prof_inc_ref(hw, blk, t->tcam[i].prof_id);\n \n@@ -4590,7 +4590,7 @@ ice_add_prof_id_vsig(struct ice_hw *hw, enum ice_block blk, u16 vsig, u64 hdl,\n \n /**\n  * ice_create_prof_id_vsig - add a new VSIG with a single profile\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  * @blk: hardware block\n  * @vsi: the initial VSI that will be in VSIG\n  * @hdl: the profile handle of the profile that will be added to the VSIG\n@@ -4632,7 +4632,7 @@ ice_create_prof_id_vsig(struct ice_hw *hw, enum ice_block blk, u16 vsi, u64 hdl,\n \n /**\n  * ice_create_vsig_from_list - create a new VSIG with a list of profiles\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  * @blk: hardware block\n  * @vsi: the initial VSI that will be in VSIG\n  * @lst: the list of profile that will be added to the VSIG\n@@ -4666,7 +4666,7 @@ ice_create_vsig_from_lst(struct ice_hw *hw, enum ice_block blk, u16 vsi,\n \n /**\n  * ice_find_prof_vsig - find a VSIG with a specific profile handle\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  * @blk: hardware block\n  * @hdl: the profile handle of the profile to search for\n  * @vsig: returns the VSIG with the matching profile\n@@ -4697,13 +4697,13 @@ ice_find_prof_vsig(struct ice_hw *hw, enum ice_block blk, u64 hdl, u16 *vsig)\n \n /**\n  * ice_add_prof_id_flow - add profile flow\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  * @blk: hardware block\n- * @vsi: the vsi to enable with the profile specified by id\n+ * @vsi: the VSI to enable with the profile specified by ID\n  * @hdl: profile handle\n  *\n  * Calling this function will update the hardware tables to enable the\n- * profile indicated by the id parameter for the VSIs specified in the vsi\n+ * profile indicated by the ID parameter for the VSIs specified in the VSI\n  * array. Once successfully called, the flow will be enabled.\n  */\n enum ice_status\n@@ -4725,7 +4725,7 @@ ice_add_prof_id_flow(struct ice_hw *hw, enum ice_block blk, u16 vsi, u64 hdl)\n \tif (status)\n \t\treturn status;\n \n-\t/* determine if vsi is already part of a VSIG */\n+\t/* determine if VSI is already part of a VSIG */\n \tstatus = ice_vsig_find_vsi(hw, blk, vsi, &vsig);\n \tif (!status && vsig) {\n \t\tbool only_vsi;\n@@ -4805,10 +4805,10 @@ ice_add_prof_id_flow(struct ice_hw *hw, enum ice_block blk, u16 vsi, u64 hdl)\n \t\t}\n \t} else {\n \t\t/* need to find or add a VSIG */\n-\t\t/* search for an exising VSIG with an exact charc match */\n+\t\t/* search for an existing VSIG with an exact charc match */\n \t\tif (ice_find_prof_vsig(hw, blk, hdl, &vsig)) {\n \t\t\t/* found an exact match */\n-\t\t\t/* add or move vsi to the VSIG that matches */\n+\t\t\t/* add or move VSI to the VSIG that matches */\n \t\t\tstatus = ice_move_vsi(hw, blk, vsi, vsig, &chg);\n \t\t\tif (status)\n \t\t\t\tgoto err_ice_add_prof_id_flow;\n@@ -4847,14 +4847,14 @@ ice_add_prof_id_flow(struct ice_hw *hw, enum ice_block blk, u16 vsi, u64 hdl)\n \n /**\n  * ice_add_flow - add flow\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  * @blk: hardware block\n- * @vsi: array of VSIs to enable with the profile specified by id\n- * @count: number of elements in the vsi array\n- * @id: profile tracking id\n+ * @vsi: array of VSIs to enable with the profile specified by ID\n+ * @count: number of elements in the VSI array\n+ * @id: profile tracking ID\n  *\n  * Calling this function will update the hardware tables to enable the\n- * profile indicated by the id parameter for the VSIs specified in the vsi\n+ * profile indicated by the ID parameter for the VSIs specified in the VSI\n  * array. Once successfully called, the flow will be enabled.\n  */\n enum ice_status\n@@ -4875,7 +4875,7 @@ ice_add_flow(struct ice_hw *hw, enum ice_block blk, u16 vsi[], u8 count,\n \n /**\n  * ice_rem_prof_from_list - remove a profile from list\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  * @lst: list to remove the profile from\n  * @hdl: the profile handle indicating the profile to remove\n  */\n@@ -4897,13 +4897,13 @@ ice_rem_prof_from_list(struct ice_hw *hw, struct LIST_HEAD_TYPE *lst, u64 hdl)\n \n /**\n  * ice_rem_prof_id_flow - remove flow\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  * @blk: hardware block\n- * @vsi: the vsi from which to remove the profile specified by id\n+ * @vsi: the VSI from which to remove the profile specified by ID\n  * @hdl: profile tracking handle\n  *\n  * Calling this function will update the hardware tables to remove the\n- * profile indicated by the id parameter for the VSIs specified in the vsi\n+ * profile indicated by the ID parameter for the VSIs specified in the VSI\n  * array. Once successfully called, the flow will be disabled.\n  */\n enum ice_status\n@@ -4918,7 +4918,7 @@ ice_rem_prof_id_flow(struct ice_hw *hw, enum ice_block blk, u16 vsi, u64 hdl)\n \tINIT_LIST_HEAD(&copy);\n \tINIT_LIST_HEAD(&chg);\n \n-\t/* determine if vsi is already part of a VSIG */\n+\t/* determine if VSI is already part of a VSIG */\n \tstatus = ice_vsig_find_vsi(hw, blk, vsi, &vsig);\n \tif (!status && vsig) {\n \t\tbool last_profile;\n@@ -4979,7 +4979,7 @@ ice_rem_prof_id_flow(struct ice_hw *hw, enum ice_block blk, u16 vsi, u64 hdl)\n \t\t\t} else if (ice_find_dup_props_vsig(hw, blk, &copy,\n \t\t\t\t\t\t\t   &vsig)) {\n \t\t\t\t/* found an exact match */\n-\t\t\t\t/* add or move vsi to the VSIG that matches */\n+\t\t\t\t/* add or move VSI to the VSIG that matches */\n \t\t\t\t/* Search for a VSIG with a matching profile\n \t\t\t\t * list\n \t\t\t\t */\n@@ -4991,7 +4991,7 @@ ice_rem_prof_id_flow(struct ice_hw *hw, enum ice_block blk, u16 vsi, u64 hdl)\n \t\t\t} else {\n \t\t\t\t/* since no existing VSIG supports this\n \t\t\t\t * characteristic pattern, we need to create a\n-\t\t\t\t * new VSIG and tcam entries\n+\t\t\t\t * new VSIG and TCAM entries\n \t\t\t\t */\n \t\t\t\tstatus = ice_create_vsig_from_lst(hw, blk, vsi,\n \t\t\t\t\t\t\t\t  &copy, &chg);\n@@ -5029,14 +5029,14 @@ ice_rem_prof_id_flow(struct ice_hw *hw, enum ice_block blk, u16 vsi, u64 hdl)\n \n /**\n  * ice_rem_flow - remove flow\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  * @blk: hardware block\n- * @vsi: array of VSIs from which to remove the profile specified by id\n- * @count: number of elements in the vsi array\n- * @id: profile tracking id\n+ * @vsi: array of VSIs from which to remove the profile specified by ID\n+ * @count: number of elements in the VSI array\n+ * @id: profile tracking ID\n  *\n  * The function will remove flows from the specified VSIs that were enabled\n- * using ice_add_flow. The id value will indicated which profile will be\n+ * using ice_add_flow. The ID value will indicated which profile will be\n  * removed. Once successfully called, the flow will be disabled.\n  */\n enum ice_status\ndiff --git a/drivers/net/ice/base/ice_flex_pipe.h b/drivers/net/ice/base/ice_flex_pipe.h\nindex 81e89aeeb..23fffed75 100644\n--- a/drivers/net/ice/base/ice_flex_pipe.h\n+++ b/drivers/net/ice/base/ice_flex_pipe.h\n@@ -59,7 +59,7 @@ void ice_ptg_free(struct ice_hw *hw, enum ice_block blk, u8 ptg);\n enum ice_status\n ice_ptg_add_mv_ptype(struct ice_hw *hw, enum ice_block blk, u16 ptype, u8 ptg);\n \n-/* XLT2/Vsi group functions */\n+/* XLT2/VSI group functions */\n enum ice_status ice_vsig_update_xlt2(struct ice_hw *hw, enum ice_block blk);\n enum ice_status\n ice_vsig_find_vsi(struct ice_hw *hw, enum ice_block blk, u16 vsi, u16 *vsig);\ndiff --git a/drivers/net/ice/base/ice_flex_type.h b/drivers/net/ice/base/ice_flex_type.h\nindex 9f98f4f2a..aed23a067 100644\n--- a/drivers/net/ice/base/ice_flex_type.h\n+++ b/drivers/net/ice/base/ice_flex_type.h\n@@ -350,7 +350,7 @@ struct ice_sw_fv_list_entry {\n };\n \n #pragma pack(1)\n-/* The BOOST tcam stores the match packet header in reverse order, meaning\n+/* The BOOST TCAM stores the match packet header in reverse order, meaning\n  * the fields are reversed; in addition, this means that the normally big endian\n  * fields of the packet are now little endian.\n  */\n@@ -602,7 +602,7 @@ struct ice_xlt2 {\n };\n \n /* Extraction sequence - list of match fields:\n- * protocol id, offset, profile length\n+ * protocol ID, offset, profile length\n  */\n union ice_match_fld {\n \tstruct {\ndiff --git a/drivers/net/ice/base/ice_flow.c b/drivers/net/ice/base/ice_flow.c\nindex cc3f69b51..574c927c4 100644\n--- a/drivers/net/ice/base/ice_flow.c\n+++ b/drivers/net/ice/base/ice_flow.c\n@@ -292,6 +292,9 @@ struct ice_flow_prof_params {\n \n \tu16 entry_length; /* # of bytes formatted entry will require */\n \tu8 es_cnt;\n+\t/* For ACL, the es[0] will have the data of ICE_RX_MDID_PKT_FLAGS_15_0\n+\t * This will give us the direction flags.\n+\t */\n \tstruct ice_fv_word es[ICE_MAX_FV_WORDS];\n \n \tice_declare_bitmap(ptypes, ICE_FLOW_PTYPE_MAX);\n@@ -494,7 +497,7 @@ ice_flow_proc_seg_hdrs(struct ice_flow_prof_params *params)\n \n /**\n  * ice_flow_xtract_fld - Create an extraction sequence entry for the given field\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  * @params: information about the flow to be processed\n  * @seg: packet segment index of the field to be extracted\n  * @fld: ID of field to be extracted\n@@ -656,7 +659,7 @@ ice_flow_xtract_fld(struct ice_hw *hw, struct ice_flow_prof_params *params,\n \n /**\n  * ice_flow_xtract_raws - Create extract sequence entries for raw bytes\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  * @params: information about the flow to be processed\n  * @seg: index of packet segment whose raw fields are to be be extracted\n  */\n@@ -728,7 +731,7 @@ ice_flow_xtract_raws(struct ice_hw *hw, struct ice_flow_prof_params *params,\n \n /**\n  * ice_flow_create_xtrct_seq - Create an extraction sequence for given segments\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  * @params: information about the flow to be processed\n  *\n  * This function iterates through all matched fields in the given segments, and\n@@ -768,7 +771,7 @@ ice_flow_create_xtrct_seq(struct ice_hw *hw,\n \n /**\n  * ice_flow_proc_segs - process all packet segments associated with a profile\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  * @params: information about the flow to be processed\n  */\n static enum ice_status\n@@ -807,7 +810,7 @@ ice_flow_proc_segs(struct ice_hw *hw, struct ice_flow_prof_params *params)\n \n /**\n  * ice_flow_find_prof_conds - Find a profile matching headers and conditions\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  * @blk: classification stage\n  * @dir: flow direction\n  * @segs: array of one or more packet segments that describe the flow\n@@ -852,7 +855,7 @@ ice_flow_find_prof_conds(struct ice_hw *hw, enum ice_block blk,\n \n /**\n  * ice_flow_find_prof - Look up a profile matching headers and matched fields\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  * @blk: classification stage\n  * @dir: flow direction\n  * @segs: array of one or more packet segments that describe the flow\n@@ -874,7 +877,7 @@ ice_flow_find_prof(struct ice_hw *hw, enum ice_block blk, enum ice_flow_dir dir,\n \n /**\n  * ice_flow_find_prof_id - Look up a profile with given profile ID\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  * @blk: classification stage\n  * @prof_id: unique ID to identify this flow profile\n  */\n@@ -893,7 +896,7 @@ ice_flow_find_prof_id(struct ice_hw *hw, enum ice_block blk, u64 prof_id)\n \n /**\n  * ice_flow_rem_entry_sync - Remove a flow entry\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  * @entry: flow entry to be removed\n  */\n static enum ice_status\n@@ -917,7 +920,7 @@ ice_flow_rem_entry_sync(struct ice_hw *hw, struct ice_flow_entry *entry)\n \n /**\n  * ice_flow_add_prof_sync - Add a flow profile for packet segments and fields\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  * @blk: classification stage\n  * @dir: flow direction\n  * @prof_id: unique ID to identify this flow profile\n@@ -1057,7 +1060,7 @@ ice_flow_rem_prof_sync(struct ice_hw *hw, enum ice_block blk,\n  * @vsi_handle: software VSI handle\n  *\n  * Assumption: the caller has acquired the lock to the profile list\n- * and the software vsi handle has been validated\n+ * and the software VSI handle has been validated\n  */\n static enum ice_status\n ice_flow_assoc_prof(struct ice_hw *hw, enum ice_block blk,\n@@ -1089,7 +1092,7 @@ ice_flow_assoc_prof(struct ice_hw *hw, enum ice_block blk,\n  * @vsi_handle: software VSI handle\n  *\n  * Assumption: the caller has acquired the lock to the profile list\n- * and the software vsi handle has been validated\n+ * and the software VSI handle has been validated\n  */\n static enum ice_status\n ice_flow_disassoc_prof(struct ice_hw *hw, enum ice_block blk,\n@@ -1115,7 +1118,7 @@ ice_flow_disassoc_prof(struct ice_hw *hw, enum ice_block blk,\n \n /**\n  * ice_flow_add_prof - Add a flow profile for packet segments and matched fields\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  * @blk: classification stage\n  * @dir: flow direction\n  * @prof_id: unique ID to identify this flow profile\n@@ -1160,7 +1163,7 @@ ice_flow_add_prof(struct ice_hw *hw, enum ice_block blk, enum ice_flow_dir dir,\n \n /**\n  * ice_flow_rem_prof - Remove a flow profile and all entries associated with it\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  * @blk: the block for which the flow profile is to be removed\n  * @prof_id: unique ID of the flow profile to be removed\n  */\n@@ -1188,11 +1191,11 @@ ice_flow_rem_prof(struct ice_hw *hw, enum ice_block blk, u64 prof_id)\n }\n \n /**\n- * ice_flow_get_hw_prof - return the hw profile for a specific profile id handle\n- * @hw: pointer to the hw struct\n+ * ice_flow_get_hw_prof - return the HW profile for a specific profile ID handle\n+ * @hw: pointer to the HW struct\n  * @blk: classification stage\n- * @prof_id: the profile id handle\n- * @hw_prof_id: pointer to variable to receive the hw profile id\n+ * @prof_id: the profile ID handle\n+ * @hw_prof_id: pointer to variable to receive the HW profile ID\n  */\n enum ice_status\n ice_flow_get_hw_prof(struct ice_hw *hw, enum ice_block blk, u64 prof_id,\n@@ -1211,7 +1214,7 @@ ice_flow_get_hw_prof(struct ice_hw *hw, enum ice_block blk, u64 prof_id,\n \n /**\n  * ice_flow_find_entry - look for a flow entry using its unique ID\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  * @blk: classification stage\n  * @entry_id: unique ID to identify this flow entry\n  *\n@@ -1249,7 +1252,7 @@ u64 ice_flow_find_entry(struct ice_hw *hw, enum ice_block blk, u64 entry_id)\n \n /**\n  * ice_flow_add_entry - Add a flow entry\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  * @blk: classification stage\n  * @prof_id: ID of the profile to add a new flow entry to\n  * @entry_id: unique ID to identify this flow entry\n@@ -1335,7 +1338,7 @@ ice_flow_add_entry(struct ice_hw *hw, enum ice_block blk, u64 prof_id,\n \n /**\n  * ice_flow_rem_entry - Remove a flow entry\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  * @entry_h: handle to the flow entry to be removed\n  */\n enum ice_status ice_flow_rem_entry(struct ice_hw *hw, u64 entry_h)\n@@ -1712,12 +1715,12 @@ void ice_rem_all_rss_vsi_ctx(struct ice_hw *hw, u16 vsi_handle)\n }\n \n /**\n- * ice_rem_vsi_rss_cfg - remove RSS configurations associated with vsi\n+ * ice_rem_vsi_rss_cfg - remove RSS configurations associated with VSI\n  * @hw: pointer to the hardware structure\n  * @vsi_handle: software VSI handle\n  *\n  * This function will iterate through all flow profiles and disassociate\n- * the vsi from that profile. If the flow profile has no vsis it will\n+ * the VSI from that profile. If the flow profile has no VSIs it will\n  * be removed.\n  */\n enum ice_status ice_rem_vsi_rss_cfg(struct ice_hw *hw, u16 vsi_handle)\n@@ -1847,7 +1850,7 @@ ice_add_rss_cfg_sync(struct ice_hw *hw, u16 vsi_handle, u64 hashed_flds,\n \t\tgoto exit;\n \n \t/* Search for a flow profile that has matching headers, hash fields\n-\t * and has the input vsi associated to it. If found, no further\n+\t * and has the input VSI associated to it. If found, no further\n \t * operations required and exit.\n \t */\n \tprof = ice_flow_find_prof_conds(hw, blk, ICE_FLOW_RX, segs, 1,\n@@ -1858,8 +1861,8 @@ ice_add_rss_cfg_sync(struct ice_hw *hw, u16 vsi_handle, u64 hashed_flds,\n \t\tgoto exit;\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 * this profile. The vsi will be added to a new profile created with\n+\t * associated with the input VSI. If so disasscociate 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 */\n \tprof = ice_flow_find_prof_conds(hw, blk, ICE_FLOW_RX, segs, 1,\n@@ -1871,7 +1874,7 @@ ice_add_rss_cfg_sync(struct ice_hw *hw, u16 vsi_handle, u64 hashed_flds,\n \t\telse\n \t\t\tgoto exit;\n \n-\t\t/* Remove profile if it has no vsis associated */\n+\t\t/* Remove profile if it has no VSIs associated */\n \t\tif (!ice_is_any_bit_set(prof->vsis, ICE_MAX_VSI)) {\n \t\t\tstatus = ice_flow_rem_prof_sync(hw, blk, prof);\n \t\t\tif (status)\n@@ -1880,7 +1883,7 @@ ice_add_rss_cfg_sync(struct ice_hw *hw, u16 vsi_handle, u64 hashed_flds,\n \t}\n \n \t/* Search for a profile that has same match fields only. If this\n-\t * exists then associate the vsi to this profile.\n+\t * exists then associate the VSI to this profile.\n \t */\n \tprof = ice_flow_find_prof_conds(hw, blk, ICE_FLOW_RX, segs, 1,\n \t\t\t\t\tvsi_handle,\n@@ -2003,7 +2006,7 @@ ice_rem_rss_cfg_sync(struct ice_hw *hw, u16 vsi_handle, u64 hashed_flds,\n  *\n  * This function will lookup the flow profile based on the input\n  * hash field bitmap, iterate through the profile entry list of\n- * that profile and find entry associated with input vsi to be\n+ * that profile and find entry associated with input VSI to be\n  * removed. Calls are made to underlying flow apis which will in\n  * turn build or update buffers for RSS XLT1 section.\n  */\n@@ -2025,7 +2028,7 @@ ice_rem_rss_cfg(struct ice_hw *hw, u16 vsi_handle, u64 hashed_flds,\n }\n \n /**\n- * ice_replay_rss_cfg - remove RSS configurations associated with vsi\n+ * ice_replay_rss_cfg - remove RSS configurations associated with VSI\n  * @hw: pointer to the hardware structure\n  * @vsi_handle: software VSI handle\n  */\n@@ -2057,13 +2060,13 @@ enum ice_status ice_replay_rss_cfg(struct ice_hw *hw, u16 vsi_handle)\n  * @hdrs: protocol header type\n  *\n  * This function will return the match fields of the first instance of flow\n- * profile having the given header types and containing input vsi\n+ * profile having the given header types and containing input VSI\n  */\n u64 ice_get_rss_cfg(struct ice_hw *hw, u16 vsi_handle, u32 hdrs)\n {\n \tstruct ice_rss_cfg *r, *rss_cfg = NULL;\n \n-\t/* verify if the protocol header is non zero and vsi is valid */\n+\t/* verify if the protocol header is non zero and VSI is valid */\n \tif (hdrs == ICE_FLOW_SEG_HDR_NONE || !ice_is_vsi_valid(hw, vsi_handle))\n \t\treturn ICE_HASH_INVALID;\n \ndiff --git a/drivers/net/ice/base/ice_flow.h b/drivers/net/ice/base/ice_flow.h\nindex 51d7c3ac9..265e1ee3e 100644\n--- a/drivers/net/ice/base/ice_flow.h\n+++ b/drivers/net/ice/base/ice_flow.h\n@@ -227,7 +227,6 @@ struct ice_flow_entry {\n \tu64 id;\n \tu16 vsi_handle;\n \tenum ice_flow_priority priority;\n-\n \tstruct ice_flow_prof *prof;\n \n \t/* Flow entry's content */\ndiff --git a/drivers/net/ice/base/ice_lan_tx_rx.h b/drivers/net/ice/base/ice_lan_tx_rx.h\nindex d27045f7e..4a1ea0c7d 100644\n--- a/drivers/net/ice/base/ice_lan_tx_rx.h\n+++ b/drivers/net/ice/base/ice_lan_tx_rx.h\n@@ -6,7 +6,7 @@\n #define _ICE_LAN_TX_RX_H_\n #include \"ice_osdep.h\"\n \n-/* RX Descriptors */\n+/* Rx Descriptors */\n union ice_16byte_rx_desc {\n \tstruct {\n \t\t__le64 pkt_addr; /* Packet buffer address */\n@@ -20,7 +20,7 @@ union ice_16byte_rx_desc {\n \t\t\t} lo_dword;\n \t\t\tunion {\n \t\t\t\t__le32 rss; /* RSS Hash */\n-\t\t\t\t__le32 fd_id; /* Flow Director filter id */\n+\t\t\t\t__le32 fd_id; /* Flow Director filter ID */\n \t\t\t} hi_dword;\n \t\t} qword0;\n \t\tstruct {\n@@ -46,7 +46,7 @@ union ice_32byte_rx_desc {\n \t\t\t} lo_dword;\n \t\t\tunion {\n \t\t\t\t__le32 rss; /* RSS Hash */\n-\t\t\t\t__le32 fd_id; /* Flow Director filter id */\n+\t\t\t\t__le32 fd_id; /* Flow Director filter ID */\n \t\t\t} hi_dword;\n \t\t} qword0;\n \t\tstruct {\n@@ -181,15 +181,15 @@ enum ice_rx_desc_status_bits {\n \tICE_RX_DESC_STATUS_L2TAG1P_S\t\t= 2,\n \tICE_RX_DESC_STATUS_L3L4P_S\t\t= 3,\n \tICE_RX_DESC_STATUS_CRCP_S\t\t= 4,\n-\tICE_RX_DESC_STATUS_TSYNINDX_S\t\t= 5, /* 2 BITS */\n+\tICE_RX_DESC_STATUS_TSYNINDX_S\t\t= 5,\n \tICE_RX_DESC_STATUS_TSYNVALID_S\t\t= 7,\n \tICE_RX_DESC_STATUS_EXT_UDP_0_S\t\t= 8,\n-\tICE_RX_DESC_STATUS_UMBCAST_S\t\t= 9, /* 2 BITS */\n+\tICE_RX_DESC_STATUS_UMBCAST_S\t\t= 9,\n \tICE_RX_DESC_STATUS_FLM_S\t\t= 11,\n-\tICE_RX_DESC_STATUS_FLTSTAT_S\t\t= 12, /* 2 BITS */\n+\tICE_RX_DESC_STATUS_FLTSTAT_S\t\t= 12,\n \tICE_RX_DESC_STATUS_LPBK_S\t\t= 14,\n \tICE_RX_DESC_STATUS_IPV6EXADD_S\t\t= 15,\n-\tICE_RX_DESC_STATUS_RESERVED2_S\t\t= 16, /* 2 BITS */\n+\tICE_RX_DESC_STATUS_RESERVED2_S\t\t= 16,\n \tICE_RX_DESC_STATUS_INT_UDP_0_S\t\t= 18,\n \tICE_RX_DESC_STATUS_LAST /* this entry must be last!!! */\n };\n@@ -325,8 +325,8 @@ enum ice_rx_desc_ext_status_bits {\n \t/* Note: These are predefined bit offsets */\n \tICE_RX_DESC_EXT_STATUS_L2TAG2P_S\t= 0,\n \tICE_RX_DESC_EXT_STATUS_L2TAG3P_S\t= 1,\n-\tICE_RX_DESC_EXT_STATUS_FLEXBL_S\t\t= 2, /* 2 BITS */\n-\tICE_RX_DESC_EXT_STATUS_FLEXBH_S\t\t= 4, /* 2 BITS */\n+\tICE_RX_DESC_EXT_STATUS_FLEXBL_S\t\t= 2,\n+\tICE_RX_DESC_EXT_STATUS_FLEXBH_S\t\t= 4,\n \tICE_RX_DESC_EXT_STATUS_FDLONGB_S\t= 9,\n \tICE_RX_DESC_EXT_STATUS_PELONGB_S\t= 11,\n };\n@@ -373,7 +373,7 @@ enum ice_rx_prog_status_desc_error_bits {\n \tICE_RX_PROG_STATUS_DESC_NO_FD_ENTRY_S\t= 1,\n };\n \n-/* RX Flex Descriptor\n+/* Rx Flex Descriptor\n  * This descriptor is used instead of the legacy version descriptor when\n  * ice_rlan_ctx.adv_desc is set\n  */\n@@ -387,7 +387,7 @@ union ice_32b_rx_flex_desc {\n \t} read;\n \tstruct {\n \t\t/* Qword 0 */\n-\t\tu8 rxdid; /* descriptor builder profile id */\n+\t\tu8 rxdid; /* descriptor builder profile ID */\n \t\tu8 mir_id_umb_cast; /* mirror=[5:0], umb=[7:6] */\n \t\t__le16 ptype_flex_flags0; /* ptype=[9:0], ff0=[15:10] */\n \t\t__le16 pkt_len; /* [15:14] are reserved */\n@@ -422,12 +422,12 @@ union ice_32b_rx_flex_desc {\n };\n \n /* Rx Flex Descriptor NIC Profile\n- * RxDID Profile Id 2\n+ * RxDID Profile ID 2\n  * Flex-field 0: RSS hash lower 16-bits\n  * Flex-field 1: RSS hash upper 16-bits\n- * Flex-field 2: Flow Id lower 16-bits\n- * Flex-field 3: Flow Id higher 16-bits\n- * Flex-field 4: reserved, Vlan id taken from L2Tag\n+ * Flex-field 2: Flow ID lower 16-bits\n+ * Flex-field 3: Flow ID higher 16-bits\n+ * Flex-field 4: reserved, VLAN ID taken from L2Tag\n  */\n struct ice_32b_rx_flex_desc_nic {\n \t/* Qword 0 */\n@@ -461,8 +461,8 @@ struct ice_32b_rx_flex_desc_nic {\n };\n \n /* Rx Flex Descriptor Switch Profile\n- * RxDID Profile Id 3\n- * Flex-field 0: Source Vsi\n+ * RxDID Profile ID 3\n+ * Flex-field 0: Source VSI\n  */\n struct ice_32b_rx_flex_desc_sw {\n \t/* Qword 0 */\n@@ -491,8 +491,8 @@ struct ice_32b_rx_flex_desc_sw {\n };\n \n /* Rx Flex Descriptor NIC VEB Profile\n- * RxDID Profile Id 4\n- * Flex-field 0: Destination Vsi\n+ * RxDID Profile ID 4\n+ * Flex-field 0: Destination VSI\n  */\n struct ice_32b_rx_flex_desc_nic_veb_dbg {\n \t/* Qword 0 */\n@@ -505,8 +505,8 @@ struct ice_32b_rx_flex_desc_nic_veb_dbg {\n \t/* Qword 1 */\n \t__le16 status_error0;\n \t__le16 l2tag1;\n-\t__le16 dst_vsi; /* [0:12]: destination vsi */\n-\t\t\t/* 13: vsi valid bit */\n+\t__le16 dst_vsi; /* [0:12]: destination VSI */\n+\t\t\t/* 13: VSI valid bit */\n \t\t\t/* [14:15] are reserved */\n \t__le16 flex_field_1;\n \n@@ -523,7 +523,7 @@ struct ice_32b_rx_flex_desc_nic_veb_dbg {\n };\n \n /* Rx Flex Descriptor NIC ACL Profile\n- * RxDID Profile Id 5\n+ * RxDID Profile ID 5\n  * Flex-field 0: ACL Counter 0\n  * Flex-field 1: ACL Counter 1\n  * Flex-field 2: ACL Counter 2\n@@ -556,12 +556,12 @@ struct ice_32b_rx_flex_desc_nic_acl_dbg {\n };\n \n /* Rx Flex Descriptor NIC Profile\n- * RxDID Profile Id 6\n+ * RxDID Profile ID 6\n  * Flex-field 0: RSS hash lower 16-bits\n  * Flex-field 1: RSS hash upper 16-bits\n- * Flex-field 2: Flow Id lower 16-bits\n- * Flex-field 3: Source Vsi\n- * Flex-field 4: reserved, Vlan id taken from L2Tag\n+ * Flex-field 2: Flow ID lower 16-bits\n+ * Flex-field 3: Source VSI\n+ * Flex-field 4: reserved, VLAN ID taken from L2Tag\n  */\n struct ice_32b_rx_flex_desc_nic_2 {\n \t/* Qword 0 */\n@@ -818,7 +818,7 @@ enum ice_rlan_ctx_rx_hsplit_1 {\n \tICE_RLAN_RX_HSPLIT_1_SPLIT_ALWAYS\t= 2,\n };\n \n-/* TX Descriptor */\n+/* Tx Descriptor */\n struct ice_tx_desc {\n \t__le64 buf_addr; /* Address of descriptor's data buf */\n \t__le64 cmd_type_offset_bsz;\n@@ -846,15 +846,15 @@ enum ice_tx_desc_cmd_bits {\n \tICE_TX_DESC_CMD_RSVD\t\t\t= 0x0004,\n \tICE_TX_DESC_CMD_IL2TAG1\t\t\t= 0x0008,\n \tICE_TX_DESC_CMD_DUMMY\t\t\t= 0x0010,\n-\tICE_TX_DESC_CMD_IIPT_NONIP\t\t= 0x0000, /* 2 BITS */\n-\tICE_TX_DESC_CMD_IIPT_IPV6\t\t= 0x0020, /* 2 BITS */\n-\tICE_TX_DESC_CMD_IIPT_IPV4\t\t= 0x0040, /* 2 BITS */\n-\tICE_TX_DESC_CMD_IIPT_IPV4_CSUM\t\t= 0x0060, /* 2 BITS */\n+\tICE_TX_DESC_CMD_IIPT_NONIP\t\t= 0x0000,\n+\tICE_TX_DESC_CMD_IIPT_IPV6\t\t= 0x0020,\n+\tICE_TX_DESC_CMD_IIPT_IPV4\t\t= 0x0040,\n+\tICE_TX_DESC_CMD_IIPT_IPV4_CSUM\t\t= 0x0060,\n \tICE_TX_DESC_CMD_RSVD2\t\t\t= 0x0080,\n-\tICE_TX_DESC_CMD_L4T_EOFT_UNK\t\t= 0x0000, /* 2 BITS */\n-\tICE_TX_DESC_CMD_L4T_EOFT_TCP\t\t= 0x0100, /* 2 BITS */\n-\tICE_TX_DESC_CMD_L4T_EOFT_SCTP\t\t= 0x0200, /* 2 BITS */\n-\tICE_TX_DESC_CMD_L4T_EOFT_UDP\t\t= 0x0300, /* 2 BITS */\n+\tICE_TX_DESC_CMD_L4T_EOFT_UNK\t\t= 0x0000,\n+\tICE_TX_DESC_CMD_L4T_EOFT_TCP\t\t= 0x0100,\n+\tICE_TX_DESC_CMD_L4T_EOFT_SCTP\t\t= 0x0200,\n+\tICE_TX_DESC_CMD_L4T_EOFT_UDP\t\t= 0x0300,\n \tICE_TX_DESC_CMD_RE\t\t\t= 0x0400,\n \tICE_TX_DESC_CMD_RSVD3\t\t\t= 0x0800,\n };\ndiff --git a/drivers/net/ice/base/ice_nvm.c b/drivers/net/ice/base/ice_nvm.c\nindex 25a2ca4cb..92de2ec3b 100644\n--- a/drivers/net/ice/base/ice_nvm.c\n+++ b/drivers/net/ice/base/ice_nvm.c\n@@ -7,7 +7,7 @@\n \n /**\n  * ice_aq_read_nvm\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  * @module_typeid: module pointer location in words from the NVM beginning\n  * @offset: byte offset from the module beginning\n  * @length: length of the section to be read (in bytes from the offset)\n@@ -248,7 +248,7 @@ enum ice_status ice_read_sr_word(struct ice_hw *hw, u16 offset, u16 *data)\n \n /**\n  * ice_init_nvm - initializes NVM setting\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  *\n  * This function reads and populates NVM settings such as Shadow RAM size,\n  * max_timeout, and blank_nvm_mode\n@@ -264,7 +264,7 @@ enum ice_status ice_init_nvm(struct ice_hw *hw)\n \n \tice_debug(hw, ICE_DBG_TRACE, \"ice_init_nvm\");\n \n-\t/* The SR size is stored regardless of the nvm programming mode\n+\t/* The SR size is stored regardless of the NVM programming mode\n \t * as the blank mode may be used in the factory line.\n \t */\n \tgens_stat = rd32(hw, GLNVM_GENS);\n@@ -357,7 +357,7 @@ ice_read_sr_buf(struct ice_hw *hw, u16 offset, u16 *words, u16 *data)\n \n /**\n  * ice_nvm_validate_checksum\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  *\n  * Verify NVM PFA checksum validity (0x0706)\n  */\ndiff --git a/drivers/net/ice/base/ice_protocol_type.h b/drivers/net/ice/base/ice_protocol_type.h\nindex 7b92c7105..f96964d86 100644\n--- a/drivers/net/ice/base/ice_protocol_type.h\n+++ b/drivers/net/ice/base/ice_protocol_type.h\n@@ -18,7 +18,7 @@\n /* Max recipes that can be chained */\n #define ICE_MAX_CHAIN_RECIPE 5\n \n-/* 1 word reserved for switch id from allowed 5 words.\n+/* 1 word reserved for switch ID from allowed 5 words.\n  * So a recipe can have max 4 words. And you can chain 5 such recipes\n  * together. So maximum words that can be programmed for look up is 5 * 4.\n  */\n@@ -128,7 +128,7 @@ enum ice_prot_id {\n \n #define ICE_PROTOCOL_MAX_ENTRIES 16\n \n-/* Mapping of software defined protocol id to hardware defined protocol id */\n+/* Mapping of software defined protocol ID to hardware defined protocol ID */\n struct ice_protocol_entry {\n \tenum ice_protocol_type type;\n \tu8 protocol_id;\ndiff --git a/drivers/net/ice/base/ice_sched.c b/drivers/net/ice/base/ice_sched.c\nindex 7acbae62c..2edc305b5 100644\n--- a/drivers/net/ice/base/ice_sched.c\n+++ b/drivers/net/ice/base/ice_sched.c\n@@ -45,9 +45,9 @@ ice_sched_add_root_node(struct ice_port_info *pi,\n /**\n  * ice_sched_find_node_by_teid - Find the Tx scheduler node in SW DB\n  * @start_node: pointer to the starting ice_sched_node struct in a sub-tree\n- * @teid: node teid to search\n+ * @teid: node TEID to search\n  *\n- * This function searches for a node matching the teid in the scheduling tree\n+ * This function searches for a node matching the TEID in the scheduling tree\n  * from the SW DB. The search is recursive and is restricted by the number of\n  * layers it has searched through; stopping at the max supported layer.\n  *\n@@ -68,7 +68,7 @@ ice_sched_find_node_by_teid(struct ice_sched_node *start_node, u32 teid)\n \t    start_node->info.data.elem_type == ICE_AQC_ELEM_TYPE_LEAF)\n \t\treturn NULL;\n \n-\t/* Check if teid matches to any of the children nodes */\n+\t/* Check if TEID matches to any of the children nodes */\n \tfor (i = 0; i < start_node->num_children; i++)\n \t\tif (ICE_TXSCHED_GET_NODE_TEID(start_node->children[i]) == teid)\n \t\t\treturn start_node->children[i];\n@@ -88,7 +88,7 @@ ice_sched_find_node_by_teid(struct ice_sched_node *start_node, u32 teid)\n \n /**\n  * ice_aqc_send_sched_elem_cmd - send scheduling elements cmd\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  * @cmd_opc: cmd opcode\n  * @elems_req: number of elements to request\n  * @buf: pointer to buffer\n@@ -120,7 +120,7 @@ ice_aqc_send_sched_elem_cmd(struct ice_hw *hw, enum ice_adminq_opc cmd_opc,\n \n /**\n  * ice_aq_query_sched_elems - query scheduler elements\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  * @elems_req: number of elements to query\n  * @buf: pointer to buffer\n  * @buf_size: buffer size in bytes\n@@ -201,7 +201,7 @@ ice_sched_add_node(struct ice_port_info *pi, u8 layer,\n \n /**\n  * ice_aq_delete_sched_elems - delete scheduler elements\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  * @grps_req: number of groups to delete\n  * @buf: pointer to buffer\n  * @buf_size: buffer size in bytes\n@@ -221,13 +221,13 @@ ice_aq_delete_sched_elems(struct ice_hw *hw, u16 grps_req,\n }\n \n /**\n- * ice_sched_remove_elems - remove nodes from hw\n- * @hw: pointer to the hw struct\n+ * ice_sched_remove_elems - remove nodes from HW\n+ * @hw: pointer to the HW struct\n  * @parent: pointer to the parent node\n  * @num_nodes: number of nodes\n  * @node_teids: array of node teids to be deleted\n  *\n- * This function remove nodes from hw\n+ * This function remove nodes from HW\n  */\n static enum ice_status\n ice_sched_remove_elems(struct ice_hw *hw, struct ice_sched_node *parent,\n@@ -260,7 +260,7 @@ ice_sched_remove_elems(struct ice_hw *hw, struct ice_sched_node *parent,\n \n /**\n  * ice_sched_get_first_node - get the first node of the given layer\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  * @parent: pointer the base node of the subtree\n  * @layer: layer number\n  *\n@@ -381,7 +381,7 @@ void ice_free_sched_node(struct ice_port_info *pi, struct ice_sched_node *node)\n \n /**\n  * ice_aq_get_dflt_topo - gets default scheduler topology\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  * @lport: logical port number\n  * @buf: pointer to buffer\n  * @buf_size: buffer size in bytes\n@@ -411,7 +411,7 @@ ice_aq_get_dflt_topo(struct ice_hw *hw, u8 lport,\n \n /**\n  * ice_aq_add_sched_elems - adds scheduling element\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  * @grps_req: the number of groups that are requested to be added\n  * @buf: pointer to buffer\n  * @buf_size: buffer size in bytes\n@@ -432,7 +432,7 @@ ice_aq_add_sched_elems(struct ice_hw *hw, u16 grps_req,\n \n /**\n  * ice_aq_cfg_sched_elems - configures scheduler elements\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  * @elems_req: number of elements to configure\n  * @buf: pointer to buffer\n  * @buf_size: buffer size in bytes\n@@ -453,7 +453,7 @@ ice_aq_cfg_sched_elems(struct ice_hw *hw, u16 elems_req,\n \n /**\n  * ice_aq_move_sched_elems - move scheduler elements\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  * @grps_req: number of groups to move\n  * @buf: pointer to buffer\n  * @buf_size: buffer size in bytes\n@@ -474,7 +474,7 @@ ice_aq_move_sched_elems(struct ice_hw *hw, u16 grps_req,\n \n /**\n  * ice_aq_suspend_sched_elems - suspend scheduler elements\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  * @elems_req: number of elements to suspend\n  * @buf: pointer to buffer\n  * @buf_size: buffer size in bytes\n@@ -495,7 +495,7 @@ ice_aq_suspend_sched_elems(struct ice_hw *hw, u16 elems_req,\n \n /**\n  * ice_aq_resume_sched_elems - resume scheduler elements\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  * @elems_req: number of elements to resume\n  * @buf: pointer to buffer\n  * @buf_size: buffer size in bytes\n@@ -516,7 +516,7 @@ ice_aq_resume_sched_elems(struct ice_hw *hw, u16 elems_req,\n \n /**\n  * ice_aq_query_sched_res - query scheduler resource\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  * @buf_size: buffer size in bytes\n  * @buf: pointer to buffer\n  * @cd: pointer to command details structure or NULL\n@@ -535,13 +535,13 @@ ice_aq_query_sched_res(struct ice_hw *hw, u16 buf_size,\n }\n \n /**\n- * ice_sched_suspend_resume_elems - suspend or resume hw nodes\n- * @hw: pointer to the hw struct\n+ * ice_sched_suspend_resume_elems - suspend or resume HW nodes\n+ * @hw: pointer to the HW struct\n  * @num_nodes: number of nodes\n  * @node_teids: array of node teids to be suspended or resumed\n  * @suspend: true means suspend / false means resume\n  *\n- * This function suspends or resumes hw nodes\n+ * This function suspends or resumes HW nodes\n  */\n static enum ice_status\n ice_sched_suspend_resume_elems(struct ice_hw *hw, u8 num_nodes, u32 *node_teids,\n@@ -577,7 +577,7 @@ ice_sched_suspend_resume_elems(struct ice_hw *hw, u8 num_nodes, u32 *node_teids,\n \n /**\n  * ice_aq_rl_profile - performs a rate limiting task\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  * @opcode:opcode for add, query, or remove profile(s)\n  * @num_profiles: the number of profiles\n  * @buf: pointer to buffer\n@@ -609,14 +609,14 @@ ice_aq_rl_profile(struct ice_hw *hw, enum ice_adminq_opc opcode,\n \n /**\n  * ice_aq_add_rl_profile - adds rate limiting profile(s)\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  * @num_profiles: the number of profile(s) to be add\n  * @buf: pointer to buffer\n  * @buf_size: buffer size in bytes\n  * @num_profiles_added: total number of profiles added to return\n  * @cd: pointer to command details structure\n  *\n- * Add rl profile (0x0410)\n+ * Add RL profile (0x0410)\n  */\n static enum ice_status\n ice_aq_add_rl_profile(struct ice_hw *hw, u16 num_profiles,\n@@ -631,13 +631,13 @@ ice_aq_add_rl_profile(struct ice_hw *hw, u16 num_profiles,\n \n /**\n  * ice_aq_query_rl_profile - query rate limiting profile(s)\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  * @num_profiles: the number of profile(s) to query\n  * @buf: pointer to buffer\n  * @buf_size: buffer size in bytes\n  * @cd: pointer to command details structure\n  *\n- * Query rl profile (0x0411)\n+ * Query RL profile (0x0411)\n  */\n enum ice_status\n ice_aq_query_rl_profile(struct ice_hw *hw, u16 num_profiles,\n@@ -649,15 +649,15 @@ ice_aq_query_rl_profile(struct ice_hw *hw, u16 num_profiles,\n }\n \n /**\n- * ice_aq_remove_rl_profile - removes rl profile(s)\n- * @hw: pointer to the hw struct\n+ * ice_aq_remove_rl_profile - removes RL profile(s)\n+ * @hw: pointer to the HW struct\n  * @num_profiles: the number of profile(s) to remove\n  * @buf: pointer to buffer\n  * @buf_size: buffer size in bytes\n  * @num_profiles_removed: total number of profiles removed to return\n  * @cd: pointer to command details structure or NULL\n  *\n- * Remove rl profile (0x0415)\n+ * Remove RL profile (0x0415)\n  */\n static enum ice_status\n ice_aq_remove_rl_profile(struct ice_hw *hw, u16 num_profiles,\n@@ -671,10 +671,10 @@ ice_aq_remove_rl_profile(struct ice_hw *hw, u16 num_profiles,\n }\n \n /**\n- * ice_sched_clear_rl_prof - clears rl prof entries\n+ * ice_sched_clear_rl_prof - clears RL prof entries\n  * @pi: port information structure\n  *\n- * This function removes all rl profile from hw as well as from SW DB.\n+ * This function removes all RL profile from HW as well as from SW DB.\n  */\n static void ice_sched_clear_rl_prof(struct ice_port_info *pi)\n {\n@@ -704,10 +704,10 @@ static void ice_sched_clear_rl_prof(struct ice_port_info *pi)\n }\n \n /**\n- * ice_sched_clear_agg - clears the agg related information\n+ * ice_sched_clear_agg - clears the aggregator related information\n  * @hw: pointer to the hardware structure\n  *\n- * This function removes agg list and free up agg related memory\n+ * This function removes aggregator list and free up aggregator related memory\n  * previously allocated.\n  */\n void ice_sched_clear_agg(struct ice_hw *hw)\n@@ -742,7 +742,7 @@ static void ice_sched_clear_tx_topo(struct ice_port_info *pi)\n {\n \tif (!pi)\n \t\treturn;\n-\t/* remove rl profiles related lists */\n+\t/* remove RL profiles related lists */\n \tice_sched_clear_rl_prof(pi);\n \tif (pi->root) {\n \t\tice_free_sched_node(pi, pi->root);\n@@ -770,7 +770,7 @@ void ice_sched_clear_port(struct ice_port_info *pi)\n \n /**\n  * ice_sched_cleanup_all - cleanup scheduler elements from SW DB for all ports\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  *\n  * Cleanup scheduling elements from SW DB for all the ports\n  */\n@@ -795,7 +795,7 @@ void ice_sched_cleanup_all(struct ice_hw *hw)\n \n /**\n  * ice_aq_cfg_l2_node_cgd - configures L2 node to CGD mapping\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  * @num_l2_nodes: the number of L2 nodes whose CGDs to configure\n  * @buf: pointer to buffer\n  * @buf_size: buffer size in bytes\n@@ -821,16 +821,16 @@ ice_aq_cfg_l2_node_cgd(struct ice_hw *hw, u16 num_l2_nodes,\n \n \n /**\n- * ice_sched_add_elems - add nodes to hw and SW DB\n+ * ice_sched_add_elems - add nodes to HW and SW DB\n  * @pi: port information structure\n  * @tc_node: pointer to the branch node\n  * @parent: pointer to the parent node\n  * @layer: layer number to add nodes\n  * @num_nodes: number of nodes\n  * @num_nodes_added: pointer to num nodes added\n- * @first_node_teid: if new nodes are added then return the teid of first node\n+ * @first_node_teid: if new nodes are added then return the TEID of first node\n  *\n- * This function add nodes to hw as well as to SW DB for a given layer\n+ * This function add nodes to HW as well as to SW DB for a given layer\n  */\n static enum ice_status\n ice_sched_add_elems(struct ice_port_info *pi, struct ice_sched_node *tc_node,\n@@ -924,7 +924,7 @@ ice_sched_add_elems(struct ice_port_info *pi, struct ice_sched_node *tc_node,\n  * @parent: pointer to parent node\n  * @layer: layer number to add nodes\n  * @num_nodes: number of nodes to be added\n- * @first_node_teid: pointer to the first node teid\n+ * @first_node_teid: pointer to the first node TEID\n  * @num_nodes_added: pointer to number of nodes added\n  *\n  * This function add nodes to a given layer.\n@@ -976,7 +976,7 @@ ice_sched_add_nodes_to_layer(struct ice_port_info *pi,\n \n \t\t\t*num_nodes_added += num_added;\n \t\t}\n-\t\t/* Don't modify the first node teid memory if the first node was\n+\t\t/* Don't modify the first node TEID memory if the first node was\n \t\t * added already in the above call. Instead send some temp\n \t\t * memory for all other recursive calls.\n \t\t */\n@@ -1008,7 +1008,7 @@ ice_sched_add_nodes_to_layer(struct ice_port_info *pi,\n \n /**\n  * ice_sched_get_qgrp_layer - get the current queue group layer number\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  *\n  * This function returns the current queue group layer number\n  */\n@@ -1020,7 +1020,7 @@ static u8 ice_sched_get_qgrp_layer(struct ice_hw *hw)\n \n /**\n  * ice_sched_get_vsi_layer - get the current VSI layer number\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  *\n  * This function returns the current VSI layer number\n  */\n@@ -1031,7 +1031,7 @@ static u8 ice_sched_get_vsi_layer(struct ice_hw *hw)\n \t *     7               4\n \t *     5 or less       sw_entry_point_layer\n \t */\n-\t/* calculate the vsi layer based on number of layers. */\n+\t/* calculate the VSI layer based on number of layers. */\n \tif (hw->num_tx_sched_layers > ICE_VSI_LAYER_OFFSET + 1) {\n \t\tu8 layer = hw->num_tx_sched_layers - ICE_VSI_LAYER_OFFSET;\n \n@@ -1043,17 +1043,17 @@ static u8 ice_sched_get_vsi_layer(struct ice_hw *hw)\n \n /**\n  * ice_sched_get_agg_layer - get the current aggregator layer number\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  *\n  * This function returns the current aggregator layer number\n  */\n static u8 ice_sched_get_agg_layer(struct ice_hw *hw)\n {\n-\t/* Num Layers       agg layer\n+\t/* Num Layers       aggregator layer\n \t *     9               4\n \t *     7 or less       sw_entry_point_layer\n \t */\n-\t/* calculate the agg layer based on number of layers. */\n+\t/* calculate the aggregator layer based on number of layers. */\n \tif (hw->num_tx_sched_layers > ICE_AGG_LAYER_OFFSET + 1) {\n \t\tu8 layer = hw->num_tx_sched_layers - ICE_AGG_LAYER_OFFSET;\n \n@@ -1226,11 +1226,11 @@ enum ice_status ice_sched_init_port(struct ice_port_info *pi)\n }\n \n /**\n- * ice_sched_get_node - Get the struct ice_sched_node for given teid\n+ * ice_sched_get_node - Get the struct ice_sched_node for given TEID\n  * @pi: port information structure\n  * @teid: Scheduler node TEID\n  *\n- * This function retrieves the ice_sched_node struct for given teid from\n+ * This function retrieves the ice_sched_node struct for given TEID from\n  * the SW DB and returns it to the caller.\n  */\n struct ice_sched_node *ice_sched_get_node(struct ice_port_info *pi, u32 teid)\n@@ -1313,7 +1313,7 @@ enum ice_status ice_sched_query_res_alloc(struct ice_hw *hw)\n \n /**\n  * ice_sched_find_node_in_subtree - Find node in part of base node subtree\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  * @base: pointer to the base node\n  * @node: pointer to the node to search\n  *\n@@ -1345,13 +1345,13 @@ ice_sched_find_node_in_subtree(struct ice_hw *hw, struct ice_sched_node *base,\n }\n \n /**\n- * ice_sched_get_free_qparent - Get a free lan or rdma q group node\n+ * ice_sched_get_free_qparent - Get a free LAN or RDMA queue group node\n  * @pi: port information structure\n  * @vsi_handle: software VSI handle\n  * @tc: branch number\n- * @owner: lan or rdma\n+ * @owner: LAN or RDMA\n  *\n- * This function retrieves a free lan or rdma q group node\n+ * This function retrieves a free LAN or RDMA queue group node\n  */\n struct ice_sched_node *\n ice_sched_get_free_qparent(struct ice_port_info *pi, u16 vsi_handle, u8 tc,\n@@ -1369,11 +1369,11 @@ ice_sched_get_free_qparent(struct ice_port_info *pi, u16 vsi_handle, u8 tc,\n \tif (!vsi_ctx)\n \t\treturn NULL;\n \tvsi_node = vsi_ctx->sched.vsi_node[tc];\n-\t/* validate invalid VSI id */\n+\t/* validate invalid VSI ID */\n \tif (!vsi_node)\n \t\tgoto lan_q_exit;\n \n-\t/* get the first q group node from VSI sub-tree */\n+\t/* get the first queue group node from VSI sub-tree */\n \tqgrp_node = ice_sched_get_first_node(pi->hw, vsi_node, qgrp_layer);\n \twhile (qgrp_node) {\n \t\t/* make sure the qgroup node is part of the VSI subtree */\n@@ -1389,12 +1389,12 @@ ice_sched_get_free_qparent(struct ice_port_info *pi, u16 vsi_handle, u8 tc,\n }\n \n /**\n- * ice_sched_get_vsi_node - Get a VSI node based on VSI id\n- * @hw: pointer to the hw struct\n+ * ice_sched_get_vsi_node - Get a VSI node based on VSI ID\n+ * @hw: pointer to the HW struct\n  * @tc_node: pointer to the TC node\n  * @vsi_handle: software VSI handle\n  *\n- * This function retrieves a VSI node for a given VSI id from a given\n+ * This function retrieves a VSI node for a given VSI ID from a given\n  * TC branch\n  */\n struct ice_sched_node *\n@@ -1418,13 +1418,13 @@ ice_sched_get_vsi_node(struct ice_hw *hw, struct ice_sched_node *tc_node,\n }\n \n /**\n- * ice_sched_get_agg_node - Get an aggregator node based on agg id\n- * @hw: pointer to the hw struct\n+ * ice_sched_get_agg_node - Get an aggregator node based on aggregator ID\n+ * @hw: pointer to the HW struct\n  * @tc_node: pointer to the TC node\n- * @agg_id: aggregator id\n+ * @agg_id: aggregator ID\n  *\n- * This function retrieves an aggregator node for a given agg id from a given\n- * TC branch\n+ * This function retrieves an aggregator node for a given aggregator ID from\n+ * a given TC branch\n  */\n struct ice_sched_node *\n ice_sched_get_agg_node(struct ice_hw *hw, struct ice_sched_node *tc_node,\n@@ -1448,7 +1448,7 @@ ice_sched_get_agg_node(struct ice_hw *hw, struct ice_sched_node *tc_node,\n \n /**\n  * ice_sched_check_node - Compare node parameters between SW DB and HW DB\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  * @node: pointer to the ice_sched_node struct\n  *\n  * This function queries and compares the HW element with SW DB node parameters\n@@ -1475,7 +1475,7 @@ static bool ice_sched_check_node(struct ice_hw *hw, struct ice_sched_node *node)\n \n /**\n  * ice_sched_calc_vsi_child_nodes - calculate number of VSI child nodes\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  * @num_qs: number of queues\n  * @num_nodes: num nodes array\n  *\n@@ -1491,7 +1491,7 @@ ice_sched_calc_vsi_child_nodes(struct ice_hw *hw, u16 num_qs, u16 *num_nodes)\n \tqgl = ice_sched_get_qgrp_layer(hw);\n \tvsil = ice_sched_get_vsi_layer(hw);\n \n-\t/* calculate num nodes from q group to VSI layer */\n+\t/* calculate num nodes from queue group to VSI layer */\n \tfor (i = qgl; i > vsil; i--) {\n \t\t/* round to the next integer if there is a remainder */\n \t\tnum = DIVIDE_AND_ROUND_UP(num, hw->max_children[i]);\n@@ -1507,10 +1507,10 @@ ice_sched_calc_vsi_child_nodes(struct ice_hw *hw, u16 num_qs, u16 *num_nodes)\n  * @vsi_handle: software VSI handle\n  * @tc_node: pointer to the TC node\n  * @num_nodes: pointer to the num nodes that needs to be added per layer\n- * @owner: node owner (lan or rdma)\n+ * @owner: node owner (LAN or RDMA)\n  *\n  * This function adds the VSI child nodes to tree. It gets called for\n- * lan and rdma separately.\n+ * LAN and RDMA separately.\n  */\n static enum ice_status\n ice_sched_add_vsi_child_nodes(struct ice_port_info *pi, u16 vsi_handle,\n@@ -1559,7 +1559,7 @@ ice_sched_add_vsi_child_nodes(struct ice_port_info *pi, u16 vsi_handle,\n \n /**\n  * ice_sched_calc_vsi_support_nodes - calculate number of VSI support nodes\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  * @tc_node: pointer to TC node\n  * @num_nodes: pointer to num nodes array\n  *\n@@ -1678,7 +1678,7 @@ ice_sched_add_vsi_to_topo(struct ice_port_info *pi, u16 vsi_handle, u8 tc)\n \t/* calculate number of supported nodes needed for this VSI */\n \tice_sched_calc_vsi_support_nodes(hw, tc_node, num_nodes);\n \n-\t/* add vsi supported nodes to tc subtree */\n+\t/* add VSI supported nodes to TC subtree */\n \treturn ice_sched_add_vsi_support_nodes(pi, vsi_handle, tc_node,\n \t\t\t\t\t       num_nodes);\n }\n@@ -1740,7 +1740,7 @@ ice_sched_update_vsi_child_nodes(struct ice_port_info *pi, u16 vsi_handle,\n \t\treturn status;\n \tvsi_ctx->sched.max_lanq[tc] = new_numqs;\n \n-\treturn status;\n+\treturn ICE_SUCCESS;\n }\n \n /**\n@@ -1749,7 +1749,7 @@ ice_sched_update_vsi_child_nodes(struct ice_port_info *pi, u16 vsi_handle,\n  * @vsi_handle: software VSI handle\n  * @tc: TC number\n  * @maxqs: max number of queues\n- * @owner: lan or rdma\n+ * @owner: LAN or RDMA\n  * @enable: TC enabled or disabled\n  *\n  * This function adds/updates VSI nodes based on the number of queues. If TC is\n@@ -1774,7 +1774,7 @@ ice_sched_cfg_vsi(struct ice_port_info *pi, u16 vsi_handle, u8 tc, u16 maxqs,\n \t\treturn ICE_ERR_PARAM;\n \tvsi_node = ice_sched_get_vsi_node(hw, tc_node, vsi_handle);\n \n-\t/* suspend the VSI if tc is not enabled */\n+\t/* suspend the VSI if TC is not enabled */\n \tif (!enable) {\n \t\tif (vsi_node && vsi_node->in_use) {\n \t\t\tu32 teid = LE32_TO_CPU(vsi_node->info.node_teid);\n@@ -1825,11 +1825,11 @@ ice_sched_cfg_vsi(struct ice_port_info *pi, u16 vsi_handle, u8 tc, u16 maxqs,\n }\n \n /**\n- * ice_sched_rm_agg_vsi_entry - remove agg related vsi info entry\n+ * ice_sched_rm_agg_vsi_entry - remove aggregator related VSI info entry\n  * @pi: port information structure\n  * @vsi_handle: software VSI handle\n  *\n- * This function removes single aggregator vsi info entry from\n+ * This function removes single aggregator VSI info entry from\n  * aggregator list.\n  */\n static void\n@@ -1876,9 +1876,9 @@ static bool ice_sched_is_leaf_node_present(struct ice_sched_node *node)\n  * ice_sched_rm_vsi_cfg - remove the VSI and its children nodes\n  * @pi: port information structure\n  * @vsi_handle: software VSI handle\n- * @owner: lan or rdma\n+ * @owner: LAN or RDMA\n  *\n- * This function removes the VSI and its lan or rdma children nodes from the\n+ * This function removes the VSI and its LAN or RDMA children nodes from the\n  * scheduler tree.\n  */\n static enum ice_status\n@@ -1931,7 +1931,7 @@ ice_sched_rm_vsi_cfg(struct ice_port_info *pi, u16 vsi_handle, u8 owner)\n \t\t\tice_free_sched_node(pi, vsi_node);\n \t\t\tvsi_ctx->sched.vsi_node[i] = NULL;\n \n-\t\t\t/* clean up agg related vsi info if any */\n+\t\t\t/* clean up aggregator related VSI info if any */\n \t\t\tice_sched_rm_agg_vsi_info(pi, vsi_handle);\n \t\t}\n \t\tif (owner == ICE_SCHED_NODE_OWNER_LAN)\n@@ -1945,11 +1945,11 @@ ice_sched_rm_vsi_cfg(struct ice_port_info *pi, u16 vsi_handle, u8 owner)\n }\n \n /**\n- * ice_rm_vsi_lan_cfg - remove VSI and its lan children nodes\n+ * ice_rm_vsi_lan_cfg - remove VSI and its LAN children nodes\n  * @pi: port information structure\n  * @vsi_handle: software VSI handle\n  *\n- * This function clears the VSI and its lan children nodes from scheduler tree\n+ * This function clears the VSI and its LAN children nodes from scheduler tree\n  * for all TCs.\n  */\n enum ice_status ice_rm_vsi_lan_cfg(struct ice_port_info *pi, u16 vsi_handle)\n@@ -1960,7 +1960,7 @@ enum ice_status ice_rm_vsi_lan_cfg(struct ice_port_info *pi, u16 vsi_handle)\n \n /**\n  * ice_sched_is_tree_balanced - Check tree nodes are identical or not\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  * @node: pointer to the ice_sched_node struct\n  *\n  * This function compares all the nodes for a given tree against HW DB nodes\n@@ -1983,15 +1983,15 @@ bool ice_sched_is_tree_balanced(struct ice_hw *hw, struct ice_sched_node *node)\n }\n \n /**\n- * ice_aq_query_node_to_root - retrieve the tree topology for a given node teid\n- * @hw: pointer to the hw struct\n- * @node_teid: node teid\n+ * ice_aq_query_node_to_root - retrieve the tree topology for a given node TEID\n+ * @hw: pointer to the HW struct\n+ * @node_teid: node TEID\n  * @buf: pointer to buffer\n  * @buf_size: buffer size in bytes\n  * @cd: pointer to command details structure or NULL\n  *\n  * This function retrieves the tree topology from the firmware for a given\n- * node teid to the root node.\n+ * node TEID to the root node.\n  */\n enum ice_status\n ice_aq_query_node_to_root(struct ice_hw *hw, u32 node_teid,\n@@ -2008,12 +2008,12 @@ ice_aq_query_node_to_root(struct ice_hw *hw, u32 node_teid,\n }\n \n /**\n- * ice_get_agg_info - get the agg id\n+ * ice_get_agg_info - get the aggregator ID\n  * @hw: pointer to the hardware structure\n- * @agg_id: aggregator id\n+ * @agg_id: aggregator ID\n  *\n- * This function validates agg id. The function returns info if agg id is\n- * prsent in list otherwise it returns null.\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 ice_get_agg_info(struct ice_hw *hw, u32 agg_id)\n@@ -2029,14 +2029,14 @@ ice_get_agg_info(struct ice_hw *hw, u32 agg_id)\n }\n \n /**\n- * ice_move_all_vsi_to_dflt_agg - move all VSI(s) to default agg\n+ * ice_move_all_vsi_to_dflt_agg - move all VSI(s) to default aggregator\n  * @pi: port information structure\n  * @agg_info: aggregator info\n  * @tc: traffic class number\n  * @rm_vsi_info: true or false\n  *\n  * This function move all the VSI(s) to the default aggregator and delete\n- * agg vsi info based on passed in boolean parameter rm_vsi_info. The\n+ * aggregator VSI info based on passed in boolean parameter rm_vsi_info. The\n  * caller holds the scheduler lock.\n  */\n static enum ice_status\n@@ -2052,7 +2052,7 @@ ice_move_all_vsi_to_dflt_agg(struct ice_port_info *pi,\n \t\t\t\t ice_sched_agg_vsi_info, list_entry) {\n \t\tu16 vsi_handle = agg_vsi_info->vsi_handle;\n \n-\t\t/* Move VSI to default agg */\n+\t\t/* Move VSI to default aggregator */\n \t\tif (!ice_is_tc_ena(agg_vsi_info->tc_bitmap[0], tc))\n \t\t\tcontinue;\n \n@@ -2072,15 +2072,15 @@ ice_move_all_vsi_to_dflt_agg(struct ice_port_info *pi,\n }\n \n /**\n- * ice_rm_agg_cfg_tc - remove agg configuration for tc\n+ * ice_rm_agg_cfg_tc - remove aggregator configuration for TC\n  * @pi: port information structure\n- * @agg_info: aggregator id\n- * @tc: tc number\n+ * @agg_info: aggregator ID\n+ * @tc: TC number\n  * @rm_vsi_info: bool value true or false\n  *\n- * This function removes agg reference to vsi of given tc. It removes the agg\n- * configuration completely for requested tc. The caller needs to hold the\n- * scheduler lock.\n+ * This function removes aggregator reference to VSI of given TC. It removes\n+ * the aggregator configuration completely for requested TC. The caller needs\n+ * to hold the scheduler lock.\n  */\n static enum ice_status\n ice_rm_agg_cfg_tc(struct ice_port_info *pi, struct ice_sched_agg_info *agg_info,\n@@ -2107,12 +2107,12 @@ ice_rm_agg_cfg_tc(struct ice_port_info *pi, struct ice_sched_agg_info *agg_info,\n }\n \n /**\n- * ice_save_agg_tc_bitmap - save agg TC bitmap\n+ * ice_save_agg_tc_bitmap - save aggregator TC bitmap\n  * @pi: port information structure\n- * @agg_id: aggregator id\n+ * @agg_id: aggregator ID\n  * @tc_bitmap: 8 bits TC bitmap\n  *\n- * Save agg TC bitmap. This function needs to be called with scheduler\n+ * Save aggregator TC bitmap. This function needs to be called with scheduler\n  * lock held.\n  */\n static enum ice_status\n@@ -2130,19 +2130,19 @@ ice_save_agg_tc_bitmap(struct ice_port_info *pi, u32 agg_id,\n }\n \n /**\n- * ice_sched_cfg_agg - configure agg node\n+ * ice_sched_cfg_agg - configure aggregator node\n  * @pi: port information structure\n- * @agg_id: aggregator id\n- * @agg_type: aggregator type queue, VSI, or agg group\n+ * @agg_id: aggregator ID\n+ * @agg_type: aggregator type queue, VSI, or aggregator group\n  * @tc_bitmap: bits TC bitmap\n  *\n  * It registers a unique aggregator node into scheduler services. It\n  * allows a user to register with a unique ID to track it's resources.\n  * The aggregator type determines if this is a queue group, VSI group\n- * or aggregator group. It then creates the agg node(s) for requested\n- * tc(s) or removes an existing agg node including its configuration\n- * if indicated via tc_bitmap. Call ice_rm_agg_cfg to release agg\n- * resources and remove agg id.\n+ * or aggregator group. It then creates the aggregator node(s) for requested\n+ * TC(s) or removes an existing aggregator node including its configuration\n+ * if indicated via tc_bitmap. Call ice_rm_agg_cfg to release aggregator\n+ * resources and remove aggregator ID.\n  * This function needs to be called with scheduler lock held.\n  */\n static enum ice_status\n@@ -2156,7 +2156,7 @@ ice_sched_cfg_agg(struct ice_port_info *pi, u32 agg_id,\n \n \tagg_info = ice_get_agg_info(hw, agg_id);\n \tif (!agg_info) {\n-\t\t/* Creat new entry for new agg id */\n+\t\t/* Create new entry for new aggregator ID */\n \t\tagg_info = (struct ice_sched_agg_info *)\n \t\t\tice_malloc(hw, sizeof(*agg_info));\n \t\tif (!agg_info) {\n@@ -2167,32 +2167,32 @@ ice_sched_cfg_agg(struct ice_port_info *pi, u32 agg_id,\n \t\tagg_info->agg_type = agg_type;\n \t\tagg_info->tc_bitmap[0] = 0;\n \n-\t\t/* Initialize the aggregator vsi list head */\n+\t\t/* Initialize the aggregator VSI list head */\n \t\tINIT_LIST_HEAD(&agg_info->agg_vsi_list);\n \n-\t\t/* Add new entry in agg list */\n+\t\t/* Add new entry in aggregator list */\n \t\tLIST_ADD(&agg_info->list_entry, &hw->agg_list);\n \t}\n-\t/* Create agg node(s) for requested tc(s) */\n+\t/* Create aggregator node(s) for requested TC(s) */\n \tfor (tc = 0; tc < ICE_MAX_TRAFFIC_CLASS; tc++) {\n \t\tif (!ice_is_tc_ena(*tc_bitmap, tc)) {\n-\t\t\t/* Delete agg cfg tc if it exists previously */\n+\t\t\t/* Delete aggregator cfg TC if it exists previously */\n \t\t\tstatus = ice_rm_agg_cfg_tc(pi, agg_info, tc, false);\n \t\t\tif (status)\n \t\t\t\tbreak;\n \t\t\tcontinue;\n \t\t}\n \n-\t\t/* Check if agg node for tc already exists */\n+\t\t/* Check if aggregator node for TC already exists */\n \t\tif (ice_is_tc_ena(agg_info->tc_bitmap[0], tc))\n \t\t\tcontinue;\n \n-\t\t/* Create new agg node for tc */\n+\t\t/* Create new aggregator node for TC */\n \t\tstatus = ice_sched_add_agg_cfg(pi, agg_id, tc);\n \t\tif (status)\n \t\t\tbreak;\n \n-\t\t/* Save agg node's tc information */\n+\t\t/* Save aggregator node's TC information */\n \t\tice_set_bit(tc, agg_info->tc_bitmap);\n \t}\n exit_reg_agg:\n@@ -2200,10 +2200,10 @@ ice_sched_cfg_agg(struct ice_port_info *pi, u32 agg_id,\n }\n \n /**\n- * ice_cfg_agg - config agg node\n+ * ice_cfg_agg - config aggregator node\n  * @pi: port information structure\n- * @agg_id: aggregator id\n- * @agg_type: aggregator type queue, VSI, or agg group\n+ * @agg_id: aggregator ID\n+ * @agg_type: aggregator type queue, VSI, or aggregator group\n  * @tc_bitmap: bits TC bitmap\n  *\n  * This function configures aggregator node(s).\n@@ -2226,12 +2226,12 @@ ice_cfg_agg(struct ice_port_info *pi, u32 agg_id, enum ice_agg_type agg_type,\n }\n \n /**\n- * ice_get_agg_vsi_info - get the agg id\n+ * ice_get_agg_vsi_info - get the aggregator ID\n  * @agg_info: aggregator info\n  * @vsi_handle: software VSI handle\n  *\n- * The function returns agg VSI info based on VSI handle. This function needs\n- * to be called with scheduler lock held.\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 ice_get_agg_vsi_info(struct ice_sched_agg_info *agg_info, u16 vsi_handle)\n@@ -2247,13 +2247,13 @@ ice_get_agg_vsi_info(struct ice_sched_agg_info *agg_info, u16 vsi_handle)\n }\n \n /**\n- * ice_get_vsi_agg_info - get the agg info of VSI\n+ * ice_get_vsi_agg_info - get the aggregator info of VSI\n  * @hw: pointer to the hardware structure\n  * @vsi_handle: Sw VSI handle\n  *\n- * The function returns agg info of VSI represented via vsi_handle. The VSI has\n- * in this case a different aggregator than the default one. This function\n- * needs to be called with scheduler lock held.\n+ * The function returns aggregator info of VSI represented via vsi_handle. The\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 ice_get_vsi_agg_info(struct ice_hw *hw, u16 vsi_handle)\n@@ -2274,9 +2274,9 @@ ice_get_vsi_agg_info(struct ice_hw *hw, u16 vsi_handle)\n /**\n  * ice_save_agg_vsi_tc_bitmap - save aggregator VSI TC bitmap\n  * @pi: port information structure\n- * @agg_id: aggregator id\n+ * @agg_id: aggregator ID\n  * @vsi_handle: software VSI handle\n- * @tc_bitmap: TC bitmap of enabled tc(s)\n+ * @tc_bitmap: TC bitmap of enabled TC(s)\n  *\n  * Save VSI to aggregator TC bitmap. This function needs to call with scheduler\n  * lock held.\n@@ -2301,15 +2301,15 @@ ice_save_agg_vsi_tc_bitmap(struct ice_port_info *pi, u32 agg_id, u16 vsi_handle,\n }\n \n /**\n- * ice_sched_assoc_vsi_to_agg - associate or move VSI to new or default agg\n+ * ice_sched_assoc_vsi_to_agg - associate/move VSI to new/default aggregator\n  * @pi: port information structure\n- * @agg_id: aggregator id\n+ * @agg_id: aggregator ID\n  * @vsi_handle: software VSI handle\n- * @tc_bitmap: TC bitmap of enabled tc(s)\n+ * @tc_bitmap: TC bitmap of enabled TC(s)\n  *\n  * This function moves VSI to a new or default aggregator node. If VSI is\n- * already associated to the agg node then no operation is performed on the\n- * tree. This function needs to be called with scheduler lock held.\n+ * already associated to the aggregator node then no operation is performed on\n+ * the tree. This function needs to be called with scheduler lock held.\n  */\n static enum ice_status\n ice_sched_assoc_vsi_to_agg(struct ice_port_info *pi, u32 agg_id,\n@@ -2329,22 +2329,22 @@ ice_sched_assoc_vsi_to_agg(struct ice_port_info *pi, u32 agg_id,\n \t/* check if entry already exist */\n \tagg_vsi_info = ice_get_agg_vsi_info(agg_info, vsi_handle);\n \tif (!agg_vsi_info) {\n-\t\t/* Create new entry for vsi under agg list */\n+\t\t/* Create new entry for VSI under aggregator list */\n \t\tagg_vsi_info = (struct ice_sched_agg_vsi_info *)\n \t\t\tice_malloc(hw, sizeof(*agg_vsi_info));\n \t\tif (!agg_vsi_info)\n \t\t\treturn ICE_ERR_PARAM;\n \n-\t\t/* add vsi id into the agg list */\n+\t\t/* add VSI ID into the aggregator list */\n \t\tagg_vsi_info->vsi_handle = vsi_handle;\n \t\tLIST_ADD(&agg_vsi_info->list_entry, &agg_info->agg_vsi_list);\n \t}\n-\t/* Move vsi node to new agg node for requested tc(s) */\n+\t/* Move VSI node to new aggregator node for requested TC(s) */\n \tfor (tc = 0; tc < ICE_MAX_TRAFFIC_CLASS; tc++) {\n \t\tif (!ice_is_tc_ena(*tc_bitmap, tc))\n \t\t\tcontinue;\n \n-\t\t/* Move VSI to new agg */\n+\t\t/* Move VSI to new aggregator */\n \t\tstatus = ice_sched_move_vsi_to_agg(pi, vsi_handle, agg_id, tc);\n \t\tif (status)\n \t\t\tbreak;\n@@ -2354,7 +2354,7 @@ ice_sched_assoc_vsi_to_agg(struct ice_port_info *pi, u32 agg_id,\n \t\telse\n \t\t\tice_clear_bit(tc, agg_vsi_info->tc_bitmap);\n \t}\n-\t/* If vsi moved back to default agg then delete entry agg_vsi_info. */\n+\t/* If VSI moved back to default aggregator, delete agg_vsi_info. */\n \tif (!ice_is_any_bit_set(agg_vsi_info->tc_bitmap,\n \t\t\t\tICE_MAX_TRAFFIC_CLASS)) {\n \t\tLIST_DEL(&agg_vsi_info->list_entry);\n@@ -2364,11 +2364,11 @@ ice_sched_assoc_vsi_to_agg(struct ice_port_info *pi, u32 agg_id,\n }\n \n /**\n- * ice_move_vsi_to_agg - moves VSI to new or default agg\n+ * ice_move_vsi_to_agg - moves VSI to new or default aggregator\n  * @pi: port information structure\n- * @agg_id: aggregator id\n+ * @agg_id: aggregator ID\n  * @vsi_handle: software VSI handle\n- * @tc_bitmap: tc bitmap of enabled tc(s)\n+ * @tc_bitmap: TC bitmap of enabled TC(s)\n  *\n  * Move or associate VSI to a new or default aggregator node.\n  */\n@@ -2390,12 +2390,12 @@ ice_move_vsi_to_agg(struct ice_port_info *pi, u32 agg_id, u16 vsi_handle,\n }\n \n /**\n- * ice_rm_agg_cfg - remove agg configuration\n+ * ice_rm_agg_cfg - remove aggregator configuration\n  * @pi: port information structure\n- * @agg_id: aggregator id\n+ * @agg_id: aggregator ID\n  *\n- * This function removes agg reference to vsi and delete agg id info.\n- * It removes the agg configuration completely.\n+ * This function removes aggregator reference to VSI and delete aggregator ID\n+ * info. It removes the aggregator configuration completely.\n  */\n enum ice_status ice_rm_agg_cfg(struct ice_port_info *pi, u32 agg_id)\n {\n@@ -2425,7 +2425,7 @@ enum ice_status ice_rm_agg_cfg(struct ice_port_info *pi, u32 agg_id)\n \tLIST_DEL(&agg_info->list_entry);\n \tice_free(pi->hw, agg_info);\n \n-\t/* Remove unused rl profile ids from HW and SW DB */\n+\t/* Remove unused RL profile IDs from HW and SW DB */\n \tice_sched_rm_unused_rl_prof(pi);\n \n exit_ice_rm_agg_cfg:\n@@ -2434,11 +2434,11 @@ enum ice_status ice_rm_agg_cfg(struct ice_port_info *pi, u32 agg_id)\n }\n \n /**\n- * ice_set_clear_cir_bw_alloc - set or clear CIR bw alloc information\n+ * ice_set_clear_cir_bw_alloc - set or clear CIR BW alloc information\n  * @bw_t_info: bandwidth type information structure\n  * @bw_alloc: Bandwidth allocation information\n  *\n- * Save or clear CIR bw alloc information (bw_alloc) in the passed param\n+ * Save or clear CIR BW alloc information (bw_alloc) in the passed param\n  * bw_t_info.\n  */\n static void\n@@ -2452,11 +2452,11 @@ ice_set_clear_cir_bw_alloc(struct ice_bw_type_info *bw_t_info, u16 bw_alloc)\n }\n \n /**\n- * ice_set_clear_eir_bw_alloc - set or clear EIR bw alloc information\n+ * ice_set_clear_eir_bw_alloc - set or clear EIR BW alloc information\n  * @bw_t_info: bandwidth type information structure\n  * @bw_alloc: Bandwidth allocation information\n  *\n- * Save or clear EIR bw alloc information (bw_alloc) in the passed param\n+ * Save or clear EIR BW alloc information (bw_alloc) in the passed param\n  * bw_t_info.\n  */\n static void\n@@ -2470,14 +2470,14 @@ ice_set_clear_eir_bw_alloc(struct ice_bw_type_info *bw_t_info, u16 bw_alloc)\n }\n \n /**\n- * ice_sched_save_vsi_bw_alloc - save VSI node's bw alloc information\n+ * ice_sched_save_vsi_bw_alloc - save VSI node's BW alloc information\n  * @pi: port information structure\n  * @vsi_handle: sw VSI handle\n  * @tc: traffic class\n  * @rl_type: rate limit type min or max\n  * @bw_alloc: Bandwidth allocation information\n  *\n- * Save bw alloc information of VSI type node for post replay use.\n+ * Save BW alloc information of VSI type node for post replay use.\n  */\n static enum ice_status\n ice_sched_save_vsi_bw_alloc(struct ice_port_info *pi, u16 vsi_handle, u8 tc,\n@@ -2506,11 +2506,11 @@ ice_sched_save_vsi_bw_alloc(struct ice_port_info *pi, u16 vsi_handle, u8 tc,\n }\n \n /**\n- * ice_set_clear_cir_bw - set or clear CIR bw\n+ * ice_set_clear_cir_bw - set or clear CIR BW\n  * @bw_t_info: bandwidth type information structure\n  * @bw: bandwidth in Kbps - Kilo bits per sec\n  *\n- * Save or clear CIR bandwidth (bw) in the passed param bw_t_info.\n+ * Save or clear CIR bandwidth (BW) in the passed param bw_t_info.\n  */\n static void\n ice_set_clear_cir_bw(struct ice_bw_type_info *bw_t_info, u32 bw)\n@@ -2519,18 +2519,18 @@ ice_set_clear_cir_bw(struct ice_bw_type_info *bw_t_info, u32 bw)\n \t\tice_clear_bit(ICE_BW_TYPE_CIR, bw_t_info->bw_t_bitmap);\n \t\tbw_t_info->cir_bw.bw = 0;\n \t} else {\n-\t\t/* Save type of bw information */\n+\t\t/* Save type of BW information */\n \t\tice_set_bit(ICE_BW_TYPE_CIR, bw_t_info->bw_t_bitmap);\n \t\tbw_t_info->cir_bw.bw = bw;\n \t}\n }\n \n /**\n- * ice_set_clear_eir_bw - set or clear EIR bw\n+ * ice_set_clear_eir_bw - set or clear EIR BW\n  * @bw_t_info: bandwidth type information structure\n  * @bw: bandwidth in Kbps - Kilo bits per sec\n  *\n- * Save or clear EIR bandwidth (bw) in the passed param bw_t_info.\n+ * Save or clear EIR bandwidth (BW) in the passed param bw_t_info.\n  */\n static void\n ice_set_clear_eir_bw(struct ice_bw_type_info *bw_t_info, u32 bw)\n@@ -2539,24 +2539,24 @@ ice_set_clear_eir_bw(struct ice_bw_type_info *bw_t_info, u32 bw)\n \t\tice_clear_bit(ICE_BW_TYPE_EIR, bw_t_info->bw_t_bitmap);\n \t\tbw_t_info->eir_bw.bw = 0;\n \t} else {\n-\t\t/* EIR bw and Shared bw profiles are mutually exclusive and\n+\t\t/* EIR BW and Shared BW profiles are mutually exclusive and\n \t\t * hence only one of them may be set for any given element.\n-\t\t * First clear earlier saved shared bw information.\n+\t\t * First clear earlier saved shared BW information.\n \t\t */\n \t\tice_clear_bit(ICE_BW_TYPE_SHARED, bw_t_info->bw_t_bitmap);\n \t\tbw_t_info->shared_bw = 0;\n-\t\t/* save EIR bw information */\n+\t\t/* save EIR BW information */\n \t\tice_set_bit(ICE_BW_TYPE_EIR, bw_t_info->bw_t_bitmap);\n \t\tbw_t_info->eir_bw.bw = bw;\n \t}\n }\n \n /**\n- * ice_set_clear_shared_bw - set or clear shared bw\n+ * ice_set_clear_shared_bw - set or clear shared BW\n  * @bw_t_info: bandwidth type information structure\n  * @bw: bandwidth in Kbps - Kilo bits per sec\n  *\n- * Save or clear shared bandwidth (bw) in the passed param bw_t_info.\n+ * Save or clear shared bandwidth (BW) in the passed param bw_t_info.\n  */\n static void\n ice_set_clear_shared_bw(struct ice_bw_type_info *bw_t_info, u32 bw)\n@@ -2565,27 +2565,27 @@ ice_set_clear_shared_bw(struct ice_bw_type_info *bw_t_info, u32 bw)\n \t\tice_clear_bit(ICE_BW_TYPE_SHARED, bw_t_info->bw_t_bitmap);\n \t\tbw_t_info->shared_bw = 0;\n \t} else {\n-\t\t/* EIR bw and Shared bw profiles are mutually exclusive and\n+\t\t/* EIR BW and Shared BW profiles are mutually exclusive and\n \t\t * hence only one of them may be set for any given element.\n-\t\t * First clear earlier saved EIR bw information.\n+\t\t * First clear earlier saved EIR BW information.\n \t\t */\n \t\tice_clear_bit(ICE_BW_TYPE_EIR, bw_t_info->bw_t_bitmap);\n \t\tbw_t_info->eir_bw.bw = 0;\n-\t\t/* save shared bw information */\n+\t\t/* save shared BW information */\n \t\tice_set_bit(ICE_BW_TYPE_SHARED, bw_t_info->bw_t_bitmap);\n \t\tbw_t_info->shared_bw = bw;\n \t}\n }\n \n /**\n- * ice_sched_save_vsi_bw - save VSI node's bw information\n+ * ice_sched_save_vsi_bw - save VSI node's BW information\n  * @pi: port information structure\n  * @vsi_handle: sw VSI handle\n  * @tc: traffic class\n  * @rl_type: rate limit type min, max, or shared\n  * @bw: bandwidth in Kbps - Kilo bits per sec\n  *\n- * Save bw information of VSI type node for post replay use.\n+ * Save BW information of VSI type node for post replay use.\n  */\n static enum ice_status\n ice_sched_save_vsi_bw(struct ice_port_info *pi, u16 vsi_handle, u8 tc,\n@@ -2658,14 +2658,14 @@ ice_sched_save_vsi_prio(struct ice_port_info *pi, u16 vsi_handle, u8 tc,\n }\n \n /**\n- * ice_sched_save_agg_bw_alloc - save agg node's bw alloc information\n+ * ice_sched_save_agg_bw_alloc - save aggregator node's BW alloc information\n  * @pi: port information structure\n- * @agg_id: node aggregator id\n+ * @agg_id: node aggregator ID\n  * @tc: traffic class\n  * @rl_type: rate limit type min or max\n  * @bw_alloc: bandwidth alloc information\n  *\n- * Save bw alloc information of AGG type node for post replay use.\n+ * Save BW alloc information of AGG type node for post replay use.\n  */\n static enum ice_status\n ice_sched_save_agg_bw_alloc(struct ice_port_info *pi, u32 agg_id, u8 tc,\n@@ -2692,14 +2692,14 @@ ice_sched_save_agg_bw_alloc(struct ice_port_info *pi, u32 agg_id, u8 tc,\n }\n \n /**\n- * ice_sched_save_agg_bw - save agg node's bw information\n+ * ice_sched_save_agg_bw - save aggregator node's BW information\n  * @pi: port information structure\n- * @agg_id: node aggregator id\n+ * @agg_id: node aggregator ID\n  * @tc: traffic class\n  * @rl_type: rate limit type min, max, or shared\n  * @bw: bandwidth in Kbps - Kilo bits per sec\n  *\n- * Save bw information of AGG type node for post replay use.\n+ * Save BW information of AGG type node for post replay use.\n  */\n static enum ice_status\n ice_sched_save_agg_bw(struct ice_port_info *pi, u32 agg_id, u8 tc,\n@@ -2729,14 +2729,14 @@ ice_sched_save_agg_bw(struct ice_port_info *pi, u32 agg_id, u8 tc,\n }\n \n /**\n- * ice_cfg_vsi_bw_lmt_per_tc - configure VSI bw limit per tc\n+ * ice_cfg_vsi_bw_lmt_per_tc - configure VSI BW limit per TC\n  * @pi: port information structure\n  * @vsi_handle: software VSI handle\n  * @tc: traffic class\n  * @rl_type: min or max\n- * @bw: bandwidth in kbps\n+ * @bw: bandwidth in Kbps\n  *\n- * This function configures bw limit of VSI scheduling node based on tc\n+ * This function configures BW limit of VSI scheduling node based on TC\n  * information.\n  */\n enum ice_status\n@@ -2757,13 +2757,13 @@ ice_cfg_vsi_bw_lmt_per_tc(struct ice_port_info *pi, u16 vsi_handle, u8 tc,\n }\n \n /**\n- * ice_cfg_dflt_vsi_bw_lmt_per_tc - configure default VSI bw limit per tc\n+ * ice_cfg_dflt_vsi_bw_lmt_per_tc - configure default VSI BW limit per TC\n  * @pi: port information structure\n  * @vsi_handle: software VSI handle\n  * @tc: traffic class\n  * @rl_type: min or max\n  *\n- * This function configures default bw limit of VSI scheduling node based on tc\n+ * This function configures default BW limit of VSI scheduling node based on TC\n  * information.\n  */\n enum ice_status\n@@ -2786,14 +2786,14 @@ ice_cfg_vsi_bw_dflt_lmt_per_tc(struct ice_port_info *pi, u16 vsi_handle, u8 tc,\n }\n \n /**\n- * ice_cfg_agg_bw_lmt_per_tc - configure aggregator bw limit per tc\n+ * ice_cfg_agg_bw_lmt_per_tc - configure aggregator BW limit per TC\n  * @pi: port information structure\n- * @agg_id: aggregator id\n+ * @agg_id: aggregator ID\n  * @tc: traffic class\n  * @rl_type: min or max\n- * @bw: bandwidth in kbps\n+ * @bw: bandwidth in Kbps\n  *\n- * This function applies bw limit to aggregator scheduling node based on tc\n+ * This function applies BW limit to aggregator scheduling node based on TC\n  * information.\n  */\n enum ice_status\n@@ -2813,14 +2813,14 @@ ice_cfg_agg_bw_lmt_per_tc(struct ice_port_info *pi, u32 agg_id, u8 tc,\n }\n \n /**\n- * ice_cfg_agg_bw_dflt_lmt_per_tc - configure aggregator bw default limit per tc\n+ * ice_cfg_agg_bw_dflt_lmt_per_tc - configure aggregator BW default limit per TC\n  * @pi: port information structure\n- * @agg_id: aggregator id\n+ * @agg_id: aggregator ID\n  * @tc: traffic class\n  * @rl_type: min or max\n  *\n- * This function applies default bw limit to aggregator scheduling node based\n- * on tc information.\n+ * This function applies default BW limit to aggregator scheduling node based\n+ * on TC information.\n  */\n enum ice_status\n ice_cfg_agg_bw_dflt_lmt_per_tc(struct ice_port_info *pi, u32 agg_id, u8 tc,\n@@ -2841,10 +2841,10 @@ ice_cfg_agg_bw_dflt_lmt_per_tc(struct ice_port_info *pi, u32 agg_id, u8 tc,\n }\n \n /**\n- * ice_cfg_vsi_bw_shared_lmt - configure VSI bw shared limit\n+ * ice_cfg_vsi_bw_shared_lmt - configure VSI BW shared limit\n  * @pi: port information structure\n  * @vsi_handle: software VSI handle\n- * @bw: bandwidth in kbps\n+ * @bw: bandwidth in Kbps\n  *\n  * This function Configures shared rate limiter(SRL) of all VSI type nodes\n  * across all traffic classes for VSI matching handle.\n@@ -2856,7 +2856,7 @@ ice_cfg_vsi_bw_shared_lmt(struct ice_port_info *pi, u16 vsi_handle, u32 bw)\n }\n \n /**\n- * ice_cfg_vsi_bw_no_shared_lmt - configure VSI bw for no shared limiter\n+ * ice_cfg_vsi_bw_no_shared_lmt - configure VSI BW for no shared limiter\n  * @pi: port information structure\n  * @vsi_handle: software VSI handle\n  *\n@@ -2871,13 +2871,13 @@ ice_cfg_vsi_bw_no_shared_lmt(struct ice_port_info *pi, u16 vsi_handle)\n }\n \n /**\n- * ice_cfg_agg_bw_shared_lmt - configure aggregator bw shared limit\n+ * ice_cfg_agg_bw_shared_lmt - configure aggregator BW shared limit\n  * @pi: port information structure\n- * @agg_id: aggregator id\n- * @bw: bandwidth in kbps\n+ * @agg_id: aggregator ID\n+ * @bw: bandwidth in Kbps\n  *\n- * This function configures the shared rate limiter(SRL) of all agg type nodes\n- * across all traffic classes for aggregator matching agg_id.\n+ * This function configures the shared rate limiter(SRL) of all aggregator type\n+ * nodes across all traffic classes for aggregator matching agg_id.\n  */\n enum ice_status\n ice_cfg_agg_bw_shared_lmt(struct ice_port_info *pi, u32 agg_id, u32 bw)\n@@ -2886,12 +2886,12 @@ ice_cfg_agg_bw_shared_lmt(struct ice_port_info *pi, u32 agg_id, u32 bw)\n }\n \n /**\n- * ice_cfg_agg_bw_no_shared_lmt - configure aggregator bw for no shared limiter\n+ * ice_cfg_agg_bw_no_shared_lmt - configure aggregator BW for no shared limiter\n  * @pi: port information structure\n- * @agg_id: aggregator id\n+ * @agg_id: aggregator ID\n  *\n- * This function removes the shared rate limiter(SRL) of all agg type nodes\n- * across all traffic classes for aggregator matching agg_id.\n+ * This function removes the shared rate limiter(SRL) of all aggregator type\n+ * nodes across all traffic classes for aggregator matching agg_id.\n  */\n enum ice_status\n ice_cfg_agg_bw_no_shared_lmt(struct ice_port_info *pi, u32 agg_id)\n@@ -2903,12 +2903,12 @@ ice_cfg_agg_bw_no_shared_lmt(struct ice_port_info *pi, u32 agg_id)\n  * ice_config_vsi_queue_priority - config VSI queue priority of node\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_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- * passed in VSI's queue(s) for a given traffic class (tc).\n+ * passed in VSI's queue(s) for a given traffic class (TC).\n  */\n enum ice_status\n ice_cfg_vsi_q_priority(struct ice_port_info *pi, u16 num_qs, u32 *q_ids,\n@@ -2940,16 +2940,16 @@ ice_cfg_vsi_q_priority(struct ice_port_info *pi, u16 num_qs, u32 *q_ids,\n }\n \n /**\n- * ice_cfg_agg_vsi_priority_per_tc - config agg's VSI priority per tc\n+ * ice_cfg_agg_vsi_priority_per_tc - config aggregator's VSI priority per TC\n  * @pi: port information structure\n- * @agg_id: Aggregator id\n+ * @agg_id: Aggregator ID\n  * @num_vsis: number of VSI(s)\n  * @vsi_handle_arr: array of software VSI handles\n  * @node_prio: pointer to node priority\n  * @tc: traffic class\n  *\n  * This function configures the node priority (Sibling Priority) of the\n- * passed in VSI's for a given traffic class (tc) of an Aggregator id.\n+ * passed in VSI's for a given traffic class (TC) of an Aggregator ID.\n  */\n enum ice_status\n ice_cfg_agg_vsi_priority_per_tc(struct ice_port_info *pi, u32 agg_id,\n@@ -3027,14 +3027,14 @@ ice_cfg_agg_vsi_priority_per_tc(struct ice_port_info *pi, u32 agg_id,\n }\n \n /**\n- * ice_cfg_vsi_bw_alloc - config VSI bw alloc per tc\n+ * ice_cfg_vsi_bw_alloc - config VSI BW alloc per TC\n  * @pi: port information structure\n  * @vsi_handle: software VSI handle\n- * @ena_tcmap: enabled tc map\n+ * @ena_tcmap: enabled TC map\n  * @rl_type: Rate limit type CIR/EIR\n- * @bw_alloc: Array of bw alloc\n+ * @bw_alloc: Array of BW alloc\n  *\n- * This function configures the bw allocation of the passed in VSI's\n+ * This function configures the BW allocation of the passed in VSI's\n  * node(s) for enabled traffic class.\n  */\n enum ice_status\n@@ -3049,7 +3049,7 @@ ice_cfg_vsi_bw_alloc(struct ice_port_info *pi, u16 vsi_handle, u8 ena_tcmap,\n \n \tice_acquire_lock(&pi->sched_lock);\n \n-\t/* Return success if no nodes are present across tc */\n+\t/* Return success if no nodes are present across TC */\n \tfor (tc = 0; tc < ICE_MAX_TRAFFIC_CLASS; tc++) {\n \t\tstruct ice_sched_node *tc_node, *vsi_node;\n \n@@ -3079,14 +3079,14 @@ ice_cfg_vsi_bw_alloc(struct ice_port_info *pi, u16 vsi_handle, u8 ena_tcmap,\n }\n \n /**\n- * ice_cfg_agg_bw_alloc - config agg bw alloc\n+ * ice_cfg_agg_bw_alloc - config aggregator BW alloc\n  * @pi: port information structure\n- * @agg_id: aggregator id\n- * @ena_tcmap: enabled tc map\n+ * @agg_id: aggregator ID\n+ * @ena_tcmap: enabled TC map\n  * @rl_type: rate limit type CIR/EIR\n- * @bw_alloc: array of bw alloc\n+ * @bw_alloc: array of BW alloc\n  *\n- * This function configures the bw allocation of passed in aggregator for\n+ * This function configures the BW allocation of passed in aggregator for\n  * enabled traffic class(s).\n  */\n enum ice_status\n@@ -3111,7 +3111,7 @@ ice_cfg_agg_bw_alloc(struct ice_port_info *pi, u32 agg_id, u8 ena_tcmap,\n \t\tgoto exit_cfg_agg_bw_alloc;\n \t}\n \n-\t/* Return success if no nodes are present across tc */\n+\t/* Return success if no nodes are present across TC */\n \tfor (tc = 0; tc < ICE_MAX_TRAFFIC_CLASS; tc++) {\n \t\tstruct ice_sched_node *tc_node, *agg_node;\n \n@@ -3142,10 +3142,10 @@ ice_cfg_agg_bw_alloc(struct ice_port_info *pi, u32 agg_id, u8 ena_tcmap,\n }\n \n /**\n- * ice_sched_calc_wakeup - calculate rl profile wakeup parameter\n- * @bw: bandwidth in kbps\n+ * ice_sched_calc_wakeup - calculate RL profile wakeup parameter\n+ * @bw: bandwidth in Kbps\n  *\n- * This function calculates the wakeup parameter of rl profile.\n+ * This function calculates the wakeup parameter of RL profile.\n  */\n static u16 ice_sched_calc_wakeup(s32 bw)\n {\n@@ -3183,11 +3183,11 @@ static u16 ice_sched_calc_wakeup(s32 bw)\n }\n \n /**\n- * ice_sched_bw_to_rl_profile - convert bw to profile parameters\n- * @bw: bandwidth in kbps\n+ * ice_sched_bw_to_rl_profile - convert BW to profile parameters\n+ * @bw: bandwidth in Kbps\n  * @profile: profile parameters to return\n  *\n- * This function converts the bw to profile structure format.\n+ * This function converts the BW to profile structure format.\n  */\n static enum ice_status\n ice_sched_bw_to_rl_profile(u32 bw, struct ice_aqc_rl_profile_elem *profile)\n@@ -3203,7 +3203,7 @@ ice_sched_bw_to_rl_profile(u32 bw, struct ice_aqc_rl_profile_elem *profile)\n \tif (bw < ICE_SCHED_MIN_BW || bw > ICE_SCHED_MAX_BW)\n \t\treturn status;\n \n-\t/* Bytes per second from kbps */\n+\t/* Bytes per second from Kbps */\n \tbytes_per_sec = DIV_64BIT(((s64)bw * 1000), BITS_PER_BYTE);\n \n \t/* encode is 6 bits but really useful are 5 bits */\n@@ -3247,16 +3247,16 @@ ice_sched_bw_to_rl_profile(u32 bw, struct ice_aqc_rl_profile_elem *profile)\n }\n \n /**\n- * ice_sched_add_rl_profile - add rl profile\n+ * ice_sched_add_rl_profile - add RL profile\n  * @pi: port information structure\n- * @rl_type: type of rate limit bw - min, max, or shared\n+ * @rl_type: type of rate limit BW - min, max, or shared\n  * @bw: bandwidth in Kbps - Kilo bits per sec\n  * @layer_num: specifies in which layer to create profile\n  *\n- * This function first checks the existing list for corresponding bw\n+ * This function first checks the existing list for corresponding BW\n  * parameter. If it exists, it returns the associated profile otherwise\n- * it creates a new rate limit profile for requested bw, and adds it to\n- * the hw db and local list. It returns the new profile or null on error.\n+ * it creates a new rate limit profile for requested BW, and adds it to\n+ * the HW DB and local list. It returns the new profile or null on error.\n  * The caller needs to hold the scheduler lock.\n  */\n static struct ice_aqc_rl_profile_info *\n@@ -3291,10 +3291,10 @@ ice_sched_add_rl_profile(struct ice_port_info *pi,\n \t\t\t    ice_aqc_rl_profile_info, list_entry)\n \t\tif (rl_prof_elem->profile.flags == profile_type &&\n \t\t    rl_prof_elem->bw == bw)\n-\t\t\t/* Return existing profile id info */\n+\t\t\t/* Return existing profile ID info */\n \t\t\treturn rl_prof_elem;\n \n-\t/* Create new profile id */\n+\t/* Create new profile ID */\n \trl_prof_elem = (struct ice_aqc_rl_profile_info *)\n \t\tice_malloc(hw, sizeof(*rl_prof_elem));\n \n@@ -3311,7 +3311,7 @@ ice_sched_add_rl_profile(struct ice_port_info *pi,\n \trl_prof_elem->profile.flags = profile_type;\n \trl_prof_elem->profile.max_burst_size = CPU_TO_LE16(hw->max_burst_size);\n \n-\t/* Create new entry in hw db */\n+\t/* Create new entry in HW DB */\n \tbuf = (struct ice_aqc_rl_profile_generic_elem *)\n \t\t&rl_prof_elem->profile;\n \tstatus = ice_aq_add_rl_profile(hw, num_profiles, buf, sizeof(*buf),\n@@ -3435,12 +3435,12 @@ ice_sched_update_elem(struct ice_hw *hw, struct ice_sched_node *node,\n \n /**\n  * ice_sched_cfg_node_bw_lmt - configure node sched params\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  * @node: sched node to configure\n- * @rl_type: rate limit type cir, eir, or shared\n- * @rl_prof_id: rate limit profile id\n+ * @rl_type: rate limit type CIR, EIR, or shared\n+ * @rl_prof_id: rate limit profile ID\n  *\n- * This function configures node element's bw limit.\n+ * This function configures node element's BW limit.\n  */\n static enum ice_status\n ice_sched_cfg_node_bw_lmt(struct ice_hw *hw, struct ice_sched_node *node,\n@@ -3457,7 +3457,7 @@ ice_sched_cfg_node_bw_lmt(struct ice_hw *hw, struct ice_sched_node *node,\n \t\tdata->cir_bw.bw_profile_idx = CPU_TO_LE16(rl_prof_id);\n \t\tbreak;\n \tcase ICE_MAX_BW:\n-\t\t/* EIR bw and Shared bw profiles are mutually exclusive and\n+\t\t/* EIR BW and Shared BW profiles are mutually exclusive and\n \t\t * hence only one of them may be set for any given element\n \t\t */\n \t\tif (data->valid_sections & ICE_AQC_ELEM_VALID_SHARED)\n@@ -3466,11 +3466,11 @@ ice_sched_cfg_node_bw_lmt(struct ice_hw *hw, struct ice_sched_node *node,\n \t\tdata->eir_bw.bw_profile_idx = CPU_TO_LE16(rl_prof_id);\n \t\tbreak;\n \tcase ICE_SHARED_BW:\n-\t\t/* Check for removing shared bw */\n+\t\t/* Check for removing shared BW */\n \t\tif (rl_prof_id == ICE_SCHED_NO_SHARED_RL_PROF_ID) {\n \t\t\t/* remove shared profile */\n \t\t\tdata->valid_sections &= ~ICE_AQC_ELEM_VALID_SHARED;\n-\t\t\tdata->srl_id = 0; /* clear srl field */\n+\t\t\tdata->srl_id = 0; /* clear SRL field */\n \n \t\t\t/* enable back EIR to default profile */\n \t\t\tdata->valid_sections |= ICE_AQC_ELEM_VALID_EIR;\n@@ -3478,16 +3478,16 @@ ice_sched_cfg_node_bw_lmt(struct ice_hw *hw, struct ice_sched_node *node,\n \t\t\t\tCPU_TO_LE16(ICE_SCHED_DFLT_RL_PROF_ID);\n \t\t\tbreak;\n \t\t}\n-\t\t/* EIR bw and Shared bw profiles are mutually exclusive and\n+\t\t/* EIR BW and Shared BW profiles are mutually exclusive and\n \t\t * hence only one of them may be set for any given element\n \t\t */\n \t\tif ((data->valid_sections & ICE_AQC_ELEM_VALID_EIR) &&\n \t\t    (LE16_TO_CPU(data->eir_bw.bw_profile_idx) !=\n \t\t\t    ICE_SCHED_DFLT_RL_PROF_ID))\n \t\t\treturn ICE_ERR_CFG;\n-\t\t/* EIR bw is set to default, disable it */\n+\t\t/* EIR BW is set to default, disable it */\n \t\tdata->valid_sections &= ~ICE_AQC_ELEM_VALID_EIR;\n-\t\t/* Okay to enable shared bw now */\n+\t\t/* Okay to enable shared BW now */\n \t\tdata->valid_sections |= ICE_AQC_ELEM_VALID_SHARED;\n \t\tdata->srl_id = CPU_TO_LE16(rl_prof_id);\n \t\tbreak;\n@@ -3501,12 +3501,12 @@ ice_sched_cfg_node_bw_lmt(struct ice_hw *hw, struct ice_sched_node *node,\n }\n \n /**\n- * ice_sched_get_node_rl_prof_id - get node's rate limit profile id\n+ * ice_sched_get_node_rl_prof_id - get node's rate limit profile ID\n  * @node: sched node\n  * @rl_type: rate limit type\n  *\n  * If existing profile matches, it returns the corresponding rate\n- * limit profile id, otherwise it returns an invalid id as error.\n+ * limit profile ID, otherwise it returns an invalid ID as error.\n  */\n static u16\n ice_sched_get_node_rl_prof_id(struct ice_sched_node *node,\n@@ -3539,7 +3539,7 @@ ice_sched_get_node_rl_prof_id(struct ice_sched_node *node,\n /**\n  * ice_sched_get_rl_prof_layer - selects rate limit profile creation layer\n  * @pi: port information structure\n- * @rl_type: type of rate limit bw - min, max, or shared\n+ * @rl_type: type of rate limit BW - min, max, or shared\n  * @layer_index: layer index\n  *\n  * This function returns requested profile creation layer.\n@@ -3603,14 +3603,14 @@ ice_sched_get_srl_node(struct ice_sched_node *node, u8 srl_layer)\n }\n \n /**\n- * ice_sched_rm_rl_profile - remove rl profile id\n+ * ice_sched_rm_rl_profile - remove RL profile ID\n  * @pi: port information structure\n  * @layer_num: layer number where profiles are saved\n  * @profile_type: profile type like EIR, CIR, or SRL\n- * @profile_id: profile id to remove\n+ * @profile_id: profile ID to remove\n  *\n  * This function removes rate limit profile from layer 'layer_num' of type\n- * 'profile_type' and profile id as 'profile_id'. The caller needs to hold\n+ * 'profile_type' and profile ID as 'profile_id'. The caller needs to hold\n  * scheduler lock.\n  */\n static enum ice_status\n@@ -3620,7 +3620,7 @@ ice_sched_rm_rl_profile(struct ice_port_info *pi, u8 layer_num, u8 profile_type,\n \tstruct ice_aqc_rl_profile_info *rl_prof_elem;\n \tenum ice_status status = ICE_SUCCESS;\n \n-\t/* Check the existing list for rl profile */\n+\t/* Check the existing list for RL profile */\n \tLIST_FOR_EACH_ENTRY(rl_prof_elem, &pi->rl_prof_list[layer_num],\n \t\t\t    ice_aqc_rl_profile_info, list_entry)\n \t\tif (rl_prof_elem->profile.flags == profile_type &&\n@@ -3629,7 +3629,7 @@ ice_sched_rm_rl_profile(struct ice_port_info *pi, u8 layer_num, u8 profile_type,\n \t\t\tif (rl_prof_elem->prof_id_ref)\n \t\t\t\trl_prof_elem->prof_id_ref--;\n \n-\t\t\t/* Remove old profile id from database */\n+\t\t\t/* Remove old profile ID from database */\n \t\t\tstatus = ice_sched_del_rl_profile(pi->hw, rl_prof_elem);\n \t\t\tif (status && status != ICE_ERR_IN_USE)\n \t\t\t\tice_debug(pi->hw, ICE_DBG_SCHED,\n@@ -3646,10 +3646,10 @@ ice_sched_rm_rl_profile(struct ice_port_info *pi, u8 layer_num, u8 profile_type,\n  * @pi: port information structure\n  * @node: pointer to node structure\n  * @rl_type: rate limit type min, max, or shared\n- * @layer_num: layer number where rl profiles are saved\n+ * @layer_num: layer number where RL profiles are saved\n  *\n- * This function configures node element's bw rate limit profile id of\n- * type cir, eir, or srl to default. This function needs to be called\n+ * This function configures node element's BW rate limit profile ID of\n+ * type CIR, EIR, or SRL to default. This function needs to be called\n  * with the scheduler lock held.\n  */\n static enum ice_status\n@@ -3681,17 +3681,18 @@ ice_sched_set_node_bw_dflt(struct ice_port_info *pi,\n \tdefault:\n \t\treturn ICE_ERR_PARAM;\n \t}\n-\t/* Save existing rl prof id for later clean up */\n+\t/* Save existing RL prof ID for later clean up */\n \told_id = ice_sched_get_node_rl_prof_id(node, rl_type);\n-\t/* Configure bw scheduling parameters */\n+\t/* Configure BW scheduling parameters */\n \tstatus = ice_sched_cfg_node_bw_lmt(hw, node, rl_type, rl_prof_id);\n \tif (status)\n \t\treturn status;\n \n-\t/* Remove stale rl profile id */\n+\t/* Remove stale RL profile ID */\n \tif (old_id == ICE_SCHED_DFLT_RL_PROF_ID ||\n \t    old_id == ICE_SCHED_INVAL_PROF_ID)\n-\t\treturn status;\n+\t\treturn ICE_SUCCESS;\n+\n \treturn ice_sched_rm_rl_profile(pi, layer_num, profile_type, old_id);\n }\n \n@@ -3704,7 +3705,7 @@ ice_sched_set_node_bw_dflt(struct ice_port_info *pi,\n  * @bw: bandwidth value\n  *\n  * This function prepares node element's bandwidth to SRL or EIR exclusively.\n- * EIR bw and Shared bw profiles are mutually exclusive and hence only one of\n+ * EIR BW and Shared BW profiles are mutually exclusive and hence only one of\n  * them may be set for any given element. This function needs to be called\n  * with the scheduler lock held.\n  */\n@@ -3730,7 +3731,7 @@ ice_sched_set_eir_srl_excl(struct ice_port_info *pi,\n \t\t\t\t\t\t  layer_num);\n \t} else if (rl_type == ICE_MAX_BW &&\n \t\t   node->info.data.valid_sections & ICE_AQC_ELEM_VALID_SHARED) {\n-\t\t/* Remove Shared profile. Set default shared bw call\n+\t\t/* Remove Shared profile. Set default shared BW call\n \t\t * removes shared profile for a node.\n \t\t */\n \t\treturn ice_sched_set_node_bw_dflt(pi, node,\n@@ -3748,9 +3749,9 @@ ice_sched_set_eir_srl_excl(struct ice_port_info *pi,\n  * @bw: bandwidth in Kbps - Kilo bits per sec\n  * @layer_num: layer number\n  *\n- * This function adds new profile corresponding to requested bw, configures\n- * node's rl profile id of type cir, eir, or srl, and removes old profile\n- * id from local database. The caller needs to hold scheduler lock.\n+ * This function adds new profile corresponding to requested BW, configures\n+ * node's RL profile ID of type CIR, EIR, or SRL, and removes old profile\n+ * ID from local database. The caller needs to hold scheduler lock.\n  */\n static enum ice_status\n ice_sched_set_node_bw(struct ice_port_info *pi, struct ice_sched_node *node,\n@@ -3767,21 +3768,21 @@ ice_sched_set_node_bw(struct ice_port_info *pi, struct ice_sched_node *node,\n \n \trl_prof_id = LE16_TO_CPU(rl_prof_info->profile.profile_id);\n \n-\t/* Save existing rl prof id for later clean up */\n+\t/* Save existing RL prof ID for later clean up */\n \told_id = ice_sched_get_node_rl_prof_id(node, rl_type);\n-\t/* Configure bw scheduling parameters */\n+\t/* Configure BW scheduling parameters */\n \tstatus = ice_sched_cfg_node_bw_lmt(hw, node, rl_type, rl_prof_id);\n \tif (status)\n \t\treturn status;\n \n \t/* New changes has been applied */\n-\t/* Increment the profile id reference count */\n+\t/* Increment the profile ID reference count */\n \trl_prof_info->prof_id_ref++;\n \n-\t/* Check for old id removal */\n+\t/* Check for old ID removal */\n \tif ((old_id == ICE_SCHED_DFLT_RL_PROF_ID && rl_type != ICE_SHARED_BW) ||\n \t    old_id == ICE_SCHED_INVAL_PROF_ID || old_id == rl_prof_id)\n-\t\treturn status;\n+\t\treturn ICE_SUCCESS;\n \n \treturn ice_sched_rm_rl_profile(pi, layer_num,\n \t\t\t\t       rl_prof_info->profile.flags,\n@@ -3789,14 +3790,14 @@ ice_sched_set_node_bw(struct ice_port_info *pi, struct ice_sched_node *node,\n }\n \n /**\n- * ice_sched_set_node_bw_lmt - set node's bw limit\n+ * ice_sched_set_node_bw_lmt - set node's BW limit\n  * @pi: port information structure\n  * @node: tree node\n  * @rl_type: rate limit type min, max, or shared\n  * @bw: bandwidth in Kbps - Kilo bits per sec\n  *\n- * It updates node's bw limit parameters like bw rl profile id of type cir,\n- * eir, or srl. The caller needs to hold scheduler lock.\n+ * It updates node's BW limit parameters like BW RL profile ID of type CIR,\n+ * EIR, or SRL. The caller needs to hold scheduler lock.\n  */\n enum ice_status\n ice_sched_set_node_bw_lmt(struct ice_port_info *pi, struct ice_sched_node *node,\n@@ -3811,7 +3812,7 @@ ice_sched_set_node_bw_lmt(struct ice_port_info *pi, struct ice_sched_node *node,\n \tif (!pi)\n \t\treturn ICE_ERR_PARAM;\n \thw = pi->hw;\n-\t/* Remove unused rl profile ids from HW and SW DB */\n+\t/* Remove unused RL profile IDs from HW and SW DB */\n \tice_sched_rm_unused_rl_prof(pi);\n \tlayer_num = ice_sched_get_rl_prof_layer(pi, rl_type,\n \t\t\t\t\t\tnode->tx_sched_layer);\n@@ -3824,7 +3825,7 @@ ice_sched_set_node_bw_lmt(struct ice_port_info *pi, struct ice_sched_node *node,\n \t\tif (!cfg_node)\n \t\t\treturn ICE_ERR_CFG;\n \t}\n-\t/* EIR bw and Shared bw profiles are mutually exclusive and\n+\t/* EIR BW and Shared BW profiles are mutually exclusive and\n \t * hence only one of them may be set for any given element\n \t */\n \tstatus = ice_sched_set_eir_srl_excl(pi, cfg_node, layer_num, rl_type,\n@@ -3838,13 +3839,13 @@ ice_sched_set_node_bw_lmt(struct ice_port_info *pi, struct ice_sched_node *node,\n }\n \n /**\n- * ice_sched_set_node_bw_dflt_lmt - set node's bw limit to default\n+ * ice_sched_set_node_bw_dflt_lmt - set node's BW limit to default\n  * @pi: port information structure\n  * @node: pointer to node structure\n  * @rl_type: rate limit type min, max, or shared\n  *\n- * This function configures node element's bw rate limit profile id of\n- * type cir, eir, or srl to default. This function needs to be called\n+ * This function configures node element's BW rate limit profile ID of\n+ * type CIR, EIR, or SRL to default. This function needs to be called\n  * with the scheduler lock held.\n  */\n static enum ice_status\n@@ -3884,13 +3885,13 @@ ice_sched_validate_srl_node(struct ice_sched_node *node, u8 sel_layer)\n }\n \n /**\n- * ice_sched_set_q_bw_lmt - sets queue bw limit\n+ * ice_sched_set_q_bw_lmt - sets queue BW limit\n  * @pi: port information structure\n- * @q_id: queue id (leaf node teid)\n+ * @q_id: queue ID (leaf node TEID)\n  * @rl_type: min, max, or shared\n- * @bw: bandwidth in kbps\n+ * @bw: bandwidth in Kbps\n  *\n- * This function sets bw limit of queue scheduling node.\n+ * This function sets BW limit of queue scheduling node.\n  */\n static enum ice_status\n ice_sched_set_q_bw_lmt(struct ice_port_info *pi, u32 q_id,\n@@ -3937,13 +3938,13 @@ ice_sched_set_q_bw_lmt(struct ice_port_info *pi, u32 q_id,\n }\n \n /**\n- * ice_cfg_q_bw_lmt - configure queue bw limit\n+ * ice_cfg_q_bw_lmt - configure queue BW limit\n  * @pi: port information structure\n- * @q_id: queue id (leaf node teid)\n+ * @q_id: queue ID (leaf node TEID)\n  * @rl_type: min, max, or shared\n- * @bw: bandwidth in kbps\n+ * @bw: bandwidth in Kbps\n  *\n- * This function configures bw limit of queue scheduling node.\n+ * This function configures BW limit of queue scheduling node.\n  */\n enum ice_status\n ice_cfg_q_bw_lmt(struct ice_port_info *pi, u32 q_id, enum ice_rl_type rl_type,\n@@ -3953,12 +3954,12 @@ ice_cfg_q_bw_lmt(struct ice_port_info *pi, u32 q_id, enum ice_rl_type rl_type,\n }\n \n /**\n- * ice_cfg_q_bw_dflt_lmt - configure queue bw default limit\n+ * ice_cfg_q_bw_dflt_lmt - configure queue BW default limit\n  * @pi: port information structure\n- * @q_id: queue id (leaf node teid)\n+ * @q_id: queue ID (leaf node TEID)\n  * @rl_type: min, max, or shared\n  *\n- * This function configures bw default limit of queue scheduling node.\n+ * This function configures BW default limit of queue scheduling node.\n  */\n enum ice_status\n ice_cfg_q_bw_dflt_lmt(struct ice_port_info *pi, u32 q_id,\n@@ -3968,11 +3969,11 @@ ice_cfg_q_bw_dflt_lmt(struct ice_port_info *pi, u32 q_id,\n }\n \n /**\n- * ice_sched_save_tc_node_bw - save tc node bw limit\n+ * ice_sched_save_tc_node_bw - save TC node BW limit\n  * @pi: port information structure\n- * @tc: tc number\n+ * @tc: TC number\n  * @rl_type: min or max\n- * @bw: bandwidth in kbps\n+ * @bw: bandwidth in Kbps\n  *\n  * This function saves the modified values of bandwidth settings for later\n  * replay purpose (restore) after reset.\n@@ -4002,13 +4003,13 @@ ice_sched_save_tc_node_bw(struct ice_port_info *pi, u8 tc,\n }\n \n /**\n- * ice_sched_set_tc_node_bw_lmt - sets tc node bw limit\n+ * ice_sched_set_tc_node_bw_lmt - sets TC node BW limit\n  * @pi: port information structure\n- * @tc: tc number\n+ * @tc: TC number\n  * @rl_type: min or max\n- * @bw: bandwidth in kbps\n+ * @bw: bandwidth in Kbps\n  *\n- * This function configures bandwidth limit of tc node.\n+ * This function configures bandwidth limit of TC node.\n  */\n static enum ice_status\n ice_sched_set_tc_node_bw_lmt(struct ice_port_info *pi, u8 tc,\n@@ -4036,13 +4037,13 @@ ice_sched_set_tc_node_bw_lmt(struct ice_port_info *pi, u8 tc,\n }\n \n /**\n- * ice_cfg_tc_node_bw_lmt - configure tc node bw limit\n+ * ice_cfg_tc_node_bw_lmt - configure TC node BW limit\n  * @pi: port information structure\n- * @tc: tc number\n+ * @tc: TC number\n  * @rl_type: min or max\n- * @bw: bandwidth in kbps\n+ * @bw: bandwidth in Kbps\n  *\n- * This function configures bw limit of tc node.\n+ * This function configures BW limit of TC node.\n  * Note: The minimum guaranteed reservation is done via DCBX.\n  */\n enum ice_status\n@@ -4053,12 +4054,12 @@ ice_cfg_tc_node_bw_lmt(struct ice_port_info *pi, u8 tc,\n }\n \n /**\n- * ice_cfg_tc_node_bw_dflt_lmt - configure tc node bw default limit\n+ * ice_cfg_tc_node_bw_dflt_lmt - configure TC node BW default limit\n  * @pi: port information structure\n- * @tc: tc number\n+ * @tc: TC number\n  * @rl_type: min or max\n  *\n- * This function configures bw default limit of tc node.\n+ * This function configures BW default limit of TC node.\n  */\n enum ice_status\n ice_cfg_tc_node_bw_dflt_lmt(struct ice_port_info *pi, u8 tc,\n@@ -4068,13 +4069,13 @@ ice_cfg_tc_node_bw_dflt_lmt(struct ice_port_info *pi, u8 tc,\n }\n \n /**\n- * ice_sched_save_tc_node_bw_alloc - save tc node's bw alloc information\n+ * ice_sched_save_tc_node_bw_alloc - save TC node's BW alloc information\n  * @pi: port information structure\n  * @tc: traffic class\n  * @rl_type: rate limit type min or max\n  * @bw_alloc: Bandwidth allocation information\n  *\n- * Save bw alloc information of VSI type node for post replay use.\n+ * Save BW alloc information of VSI type node for post replay use.\n  */\n static enum ice_status\n ice_sched_save_tc_node_bw_alloc(struct ice_port_info *pi, u8 tc,\n@@ -4100,13 +4101,13 @@ ice_sched_save_tc_node_bw_alloc(struct ice_port_info *pi, u8 tc,\n }\n \n /**\n- * ice_sched_set_tc_node_bw_alloc - set tc node bw alloc\n+ * ice_sched_set_tc_node_bw_alloc - set TC node BW alloc\n  * @pi: port information structure\n- * @tc: tc number\n+ * @tc: TC number\n  * @rl_type: min or max\n  * @bw_alloc: bandwidth alloc\n  *\n- * This function configures bandwidth alloc of tc node, also saves the\n+ * This function configures bandwidth alloc of TC node, also saves the\n  * changed settings for replay purpose, and return success if it succeeds\n  * in modifying bandwidth alloc setting.\n  */\n@@ -4135,13 +4136,13 @@ ice_sched_set_tc_node_bw_alloc(struct ice_port_info *pi, u8 tc,\n }\n \n /**\n- * ice_cfg_tc_node_bw_alloc - configure tc node bw alloc\n+ * ice_cfg_tc_node_bw_alloc - configure TC node BW alloc\n  * @pi: port information structure\n- * @tc: tc number\n+ * @tc: TC number\n  * @rl_type: min or max\n  * @bw_alloc: bandwidth alloc\n  *\n- * This function configures bw limit of tc node.\n+ * This function configures BW limit of TC node.\n  * Note: The minimum guaranteed reservation is done via DCBX.\n  */\n enum ice_status\n@@ -4152,12 +4153,12 @@ ice_cfg_tc_node_bw_alloc(struct ice_port_info *pi, u8 tc,\n }\n \n /**\n- * ice_sched_set_agg_bw_dflt_lmt - set agg node's bw limit to default\n+ * ice_sched_set_agg_bw_dflt_lmt - set aggregator node's BW limit to default\n  * @pi: port information structure\n  * @vsi_handle: software VSI handle\n  *\n- * This function retrieves the aggregator id based on VSI id and tc,\n- * and sets node's bw limit to default. This function needs to be\n+ * This function retrieves the aggregator ID based on VSI ID and TC,\n+ * and sets node's BW limit to default. This function needs to be\n  * called with the scheduler lock held.\n  */\n enum ice_status\n@@ -4201,14 +4202,14 @@ ice_sched_set_agg_bw_dflt_lmt(struct ice_port_info *pi, u16 vsi_handle)\n }\n \n /**\n- * ice_sched_get_node_by_id_type - get node from id type\n+ * ice_sched_get_node_by_id_type - get node from ID type\n  * @pi: port information structure\n  * @id: identifier\n  * @agg_type: type of aggregator\n  * @tc: traffic class\n  *\n- * This function returns node identified by id of type aggregator, and\n- * based on traffic class (tc). This function needs to be called with\n+ * This function returns node identified by ID of type aggregator, and\n+ * based on traffic class (TC). This function needs to be called with\n  * the scheduler lock held.\n  */\n static struct ice_sched_node *\n@@ -4263,16 +4264,16 @@ ice_sched_get_node_by_id_type(struct ice_port_info *pi, u32 id,\n }\n \n /**\n- * ice_sched_set_node_bw_lmt_per_tc - set node bw limit per tc\n+ * ice_sched_set_node_bw_lmt_per_tc - set node BW limit per TC\n  * @pi: port information structure\n- * @id: id (software VSI handle or AGG id)\n+ * @id: ID (software VSI handle or AGG ID)\n  * @agg_type: aggregator type (VSI or AGG type node)\n  * @tc: traffic class\n  * @rl_type: min or max\n- * @bw: bandwidth in kbps\n+ * @bw: bandwidth in Kbps\n  *\n- * This function sets bw limit of VSI or Aggregator scheduling node\n- * based on tc information from passed in argument bw.\n+ * This function sets BW limit of VSI or Aggregator scheduling node\n+ * based on TC information from passed in argument BW.\n  */\n enum ice_status\n ice_sched_set_node_bw_lmt_per_tc(struct ice_port_info *pi, u32 id,\n@@ -4310,7 +4311,7 @@ ice_sched_set_node_bw_lmt_per_tc(struct ice_port_info *pi, u32 id,\n  * @vsi_handle: software VSI handle\n  *\n  * This function validates SRL node of the VSI node if available SRL layer is\n- * different than the VSI node layer on all tc(s).This function needs to be\n+ * different than the VSI node layer on all TC(s).This function needs to be\n  * called with scheduler lock held.\n  */\n static enum ice_status\n@@ -4322,7 +4323,7 @@ ice_sched_validate_vsi_srl_node(struct ice_port_info *pi, u16 vsi_handle)\n \tif (!ice_is_vsi_valid(pi->hw, vsi_handle))\n \t\treturn ICE_ERR_PARAM;\n \n-\t/* Return success if no nodes are present across tc */\n+\t/* Return success if no nodes are present across TC */\n \tfor (tc = 0; tc < ICE_MAX_TRAFFIC_CLASS; tc++) {\n \t\tstruct ice_sched_node *tc_node, *vsi_node;\n \t\tenum ice_rl_type rl_type = ICE_SHARED_BW;\n@@ -4356,13 +4357,13 @@ ice_sched_validate_vsi_srl_node(struct ice_port_info *pi, u16 vsi_handle)\n }\n \n /**\n- * ice_sched_set_vsi_bw_shared_lmt - set VSI bw shared limit\n+ * ice_sched_set_vsi_bw_shared_lmt - set VSI BW shared limit\n  * @pi: port information structure\n  * @vsi_handle: software VSI handle\n- * @bw: bandwidth in kbps\n+ * @bw: bandwidth in Kbps\n  *\n  * This function Configures shared rate limiter(SRL) of all VSI type nodes\n- * across all traffic classes for VSI matching handle. When bw value of\n+ * across all traffic classes for VSI matching handle. When BW value of\n  * ICE_SCHED_DFLT_BW is passed, it removes the SRL from the node.\n  */\n enum ice_status\n@@ -4382,7 +4383,7 @@ ice_sched_set_vsi_bw_shared_lmt(struct ice_port_info *pi, u16 vsi_handle,\n \tstatus = ice_sched_validate_vsi_srl_node(pi, vsi_handle);\n \tif (status)\n \t\tgoto exit_set_vsi_bw_shared_lmt;\n-\t/* Return success if no nodes are present across tc */\n+\t/* Return success if no nodes are present across TC */\n \tfor (tc = 0; tc < ICE_MAX_TRAFFIC_CLASS; tc++) {\n \t\tstruct ice_sched_node *tc_node, *vsi_node;\n \t\tenum ice_rl_type rl_type = ICE_SHARED_BW;\n@@ -4417,10 +4418,10 @@ ice_sched_set_vsi_bw_shared_lmt(struct ice_port_info *pi, u16 vsi_handle,\n /**\n  * ice_sched_validate_agg_srl_node - validate AGG SRL node\n  * @pi: port information structure\n- * @agg_id: aggregator id\n+ * @agg_id: aggregator ID\n  *\n  * This function validates SRL node of the AGG node if available SRL layer is\n- * different than the AGG node layer on all tc(s).This function needs to be\n+ * different than the AGG node layer on all TC(s).This function needs to be\n  * called with scheduler lock held.\n  */\n static enum ice_status\n@@ -4440,7 +4441,7 @@ ice_sched_validate_agg_srl_node(struct ice_port_info *pi, u32 agg_id)\n \t\t}\n \tif (!agg_id_present)\n \t\treturn ICE_ERR_PARAM;\n-\t/* Return success if no nodes are present across tc */\n+\t/* Return success if no nodes are present across TC */\n \tfor (tc = 0; tc < ICE_MAX_TRAFFIC_CLASS; tc++) {\n \t\tstruct ice_sched_node *tc_node, *agg_node;\n \t\tenum ice_rl_type rl_type = ICE_SHARED_BW;\n@@ -4472,14 +4473,14 @@ ice_sched_validate_agg_srl_node(struct ice_port_info *pi, u32 agg_id)\n }\n \n /**\n- * ice_sched_set_agg_bw_shared_lmt - set aggregator bw shared limit\n+ * ice_sched_set_agg_bw_shared_lmt - set aggregator BW shared limit\n  * @pi: port information structure\n- * @agg_id: aggregator id\n- * @bw: bandwidth in kbps\n+ * @agg_id: aggregator ID\n+ * @bw: bandwidth in Kbps\n  *\n- * This function configures the shared rate limiter(SRL) of all agg type\n+ * This function configures the shared rate limiter(SRL) of all aggregator type\n  * nodes across all traffic classes for aggregator matching agg_id. When\n- * bw value of ICE_SCHED_DFLT_BW is passed, it removes SRL from the\n+ * BW value of ICE_SCHED_DFLT_BW is passed, it removes SRL from the\n  * node(s).\n  */\n enum ice_status\n@@ -4511,7 +4512,7 @@ ice_sched_set_agg_bw_shared_lmt(struct ice_port_info *pi, u32 agg_id, u32 bw)\n \t\tgoto exit_agg_bw_shared_lmt;\n \t}\n \n-\t/* Return success if no nodes are present across tc */\n+\t/* Return success if no nodes are present across TC */\n \tfor (tc = 0; tc < ICE_MAX_TRAFFIC_CLASS; tc++) {\n \t\tenum ice_rl_type rl_type = ICE_SHARED_BW;\n \t\tstruct ice_sched_node *tc_node, *agg_node;\n@@ -4975,7 +4976,7 @@ ice_sched_move_vsi_to_agg(struct ice_port_info *pi, u16 vsi_handle, u32 agg_id,\n \n /**\n  * ice_cfg_rl_burst_size - Set burst size value\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  * @bytes: burst size in bytes\n  *\n  * This function configures/set the burst size to requested new value. The new\n@@ -4995,7 +4996,7 @@ enum ice_status ice_cfg_rl_burst_size(struct ice_hw *hw, u32 bytes)\n \t\tburst_size_to_prog = ICE_BYTE_GRANULARITY;\n \t\t/* round number to nearest 256 granularity */\n \t\tbytes = ice_round_to_num(bytes, 256);\n-\t\t/* check rounding doesn't go beyound allowed */\n+\t\t/* check rounding doesn't go beyond allowed */\n \t\tif (bytes > ICE_MAX_BURST_SIZE_BYTE_GRANULARITY)\n \t\t\tbytes = ICE_MAX_BURST_SIZE_BYTE_GRANULARITY;\n \t\tburst_size_to_prog |= (u16)bytes;\n@@ -5005,7 +5006,7 @@ enum ice_status ice_cfg_rl_burst_size(struct ice_hw *hw, u32 bytes)\n \t\tburst_size_to_prog = ICE_KBYTE_GRANULARITY;\n \t\t/* round number to nearest 1024 granularity */\n \t\tbytes = ice_round_to_num(bytes, 1024);\n-\t\t/* check rounding doesn't go beyound allowed */\n+\t\t/* check rounding doesn't go beyond allowed */\n \t\tif (bytes > ICE_MAX_BURST_SIZE_KBYTE_GRANULARITY)\n \t\t\tbytes = ICE_MAX_BURST_SIZE_KBYTE_GRANULARITY;\n \t\t/* The value is in k bytes */\n@@ -5017,7 +5018,7 @@ enum ice_status ice_cfg_rl_burst_size(struct ice_hw *hw, u32 bytes)\n \n /*\n  * ice_sched_replay_node_prio - re-configure node priority\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  * @node: sched node to configure\n  * @priority: priority value\n  *\n@@ -5043,12 +5044,12 @@ ice_sched_replay_node_prio(struct ice_hw *hw, struct ice_sched_node *node,\n }\n \n /**\n- * ice_sched_replay_node_bw - replay node(s) bw\n- * @hw: pointer to the hw struct\n+ * ice_sched_replay_node_bw - replay node(s) BW\n+ * @hw: pointer to the HW struct\n  * @node: sched node to configure\n- * @bw_t_info: bw type information\n+ * @bw_t_info: BW type information\n  *\n- * This function restores node's bw from bw_t_info. The caller needs\n+ * This function restores node's BW from bw_t_info. The caller needs\n  * to hold the scheduler lock.\n  */\n static enum ice_status\n@@ -5102,8 +5103,8 @@ ice_sched_replay_node_bw(struct ice_hw *hw, struct ice_sched_node *node,\n }\n \n /**\n- * ice_sched_replay_agg_bw - replay aggregator node(s) bw\n- * @hw: pointer to the hw struct\n+ * ice_sched_replay_agg_bw - replay aggregator node(s) BW\n+ * @hw: pointer to the HW struct\n  * @agg_info: aggregator data structure\n  *\n  * This function re-creates aggregator type nodes. The caller needs to hold\n@@ -5157,7 +5158,7 @@ ice_sched_get_ena_tc_bitmap(struct ice_port_info *pi, ice_bitmap_t *tc_bitmap,\n {\n \tu8 tc;\n \n-\t/* Some tc(s) may be missing after reset, adjust for replay */\n+\t/* Some TC(s) may be missing after reset, adjust for replay */\n \tfor (tc = 0; tc < ICE_MAX_TRAFFIC_CLASS; tc++)\n \t\tif (ice_is_tc_ena(*tc_bitmap, tc) &&\n \t\t    (ice_sched_get_tc_node(pi, tc)))\n@@ -5166,10 +5167,10 @@ ice_sched_get_ena_tc_bitmap(struct ice_port_info *pi, ice_bitmap_t *tc_bitmap,\n \n /**\n  * ice_sched_replay_agg - recreate aggregator node(s)\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  *\n  * This function recreate aggregator type nodes which are not replayed earlier.\n- * It also replay aggregator bw information. These aggregator nodes are not\n+ * It also replay aggregator BW information. These aggregator nodes are not\n  * associated with VSI type node yet.\n  */\n void ice_sched_replay_agg(struct ice_hw *hw)\n@@ -5180,7 +5181,7 @@ void ice_sched_replay_agg(struct ice_hw *hw)\n \tice_acquire_lock(&pi->sched_lock);\n \tLIST_FOR_EACH_ENTRY(agg_info, &hw->agg_list, ice_sched_agg_info,\n \t\t\t    list_entry) {\n-\t\t/* replay agg (re-create aggregator node) */\n+\t\t/* replay aggregator (re-create aggregator node) */\n \t\tif (!ice_cmp_bitmap(agg_info->tc_bitmap,\n \t\t\t\t    agg_info->replay_tc_bitmap,\n \t\t\t\t    ICE_MAX_TRAFFIC_CLASS)) {\n@@ -5203,7 +5204,7 @@ void ice_sched_replay_agg(struct ice_hw *hw)\n \t\t\t\t/* Move on to next one */\n \t\t\t\tcontinue;\n \t\t\t}\n-\t\t\t/* Replay agg node bw (restore agg bw) */\n+\t\t\t/* Replay aggregator node BW (restore aggregator BW) */\n \t\t\tstatus = ice_sched_replay_agg_bw(hw, agg_info);\n \t\t\tif (status)\n \t\t\t\tice_info(hw, \"Replay agg bw [id=%d] failed\\n\",\n@@ -5215,7 +5216,7 @@ void ice_sched_replay_agg(struct ice_hw *hw)\n \n /**\n  * ice_sched_replay_agg_vsi_preinit - Agg/VSI replay pre initialization\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  *\n  * This function initialize aggregator(s) TC bitmap to zero. A required\n  * preinit step for replaying aggregators.\n@@ -5239,10 +5240,10 @@ void ice_sched_replay_agg_vsi_preinit(struct ice_hw *hw)\n }\n \n /**\n- * ice_sched_replay_tc_node_bw - replay tc node(s) bw\n- * @hw: pointer to the hw struct\n+ * ice_sched_replay_tc_node_bw - replay TC node(s) BW\n+ * @hw: pointer to the HW struct\n  *\n- * This function replay tc nodes. The caller needs to hold the scheduler lock.\n+ * This function replay TC nodes. The caller needs to hold the scheduler lock.\n  */\n enum ice_status\n ice_sched_replay_tc_node_bw(struct ice_hw *hw)\n@@ -5257,7 +5258,7 @@ ice_sched_replay_tc_node_bw(struct ice_hw *hw)\n \n \t\ttc_node = ice_sched_get_tc_node(hw->port_info, tc);\n \t\tif (!tc_node)\n-\t\t\tcontinue; /* tc not present */\n+\t\t\tcontinue; /* TC not present */\n \t\tstatus = ice_sched_replay_node_bw(hw, tc_node,\n \t\t\t\t\t\t  &hw->tc_node_bw_t_info[tc]);\n \t\tif (status)\n@@ -5268,8 +5269,8 @@ ice_sched_replay_tc_node_bw(struct ice_hw *hw)\n }\n \n /**\n- * ice_sched_replay_vsi_bw - replay VSI type node(s) bw\n- * @hw: pointer to the hw struct\n+ * ice_sched_replay_vsi_bw - replay VSI type node(s) BW\n+ * @hw: pointer to the HW struct\n  * @vsi_handle: software VSI handle\n  * @tc_bitmap: 8 bits TC bitmap\n  *\n@@ -5308,8 +5309,8 @@ ice_sched_replay_vsi_bw(struct ice_hw *hw, u16 vsi_handle,\n }\n \n /**\n- * ice_sched_replay_vsi_agg - replay agg & VSI to aggregator node(s)\n- * @hw: pointer to the hw struct\n+ * ice_sched_replay_vsi_agg - replay aggregator & VSI to aggregator node(s)\n+ * @hw: pointer to the HW struct\n  * @vsi_handle: software VSI handle\n  *\n  * This function replays aggregator node, VSI to aggregator type nodes, and\n@@ -5336,12 +5337,12 @@ ice_sched_replay_vsi_agg(struct ice_hw *hw, u16 vsi_handle)\n \t\treturn ICE_SUCCESS; /* Not present in list - default Agg case */\n \tice_sched_get_ena_tc_bitmap(pi, agg_info->replay_tc_bitmap,\n \t\t\t\t    replay_bitmap);\n-\t/* Replay agg node associated to vsi_handle */\n+\t/* Replay aggregator node associated to vsi_handle */\n \tstatus = ice_sched_cfg_agg(hw->port_info, agg_info->agg_id,\n \t\t\t\t   ICE_AGG_TYPE_AGG, replay_bitmap);\n \tif (status)\n \t\treturn status;\n-\t/* Replay agg node bw (restore agg bw) */\n+\t/* Replay aggregator node BW (restore aggregator BW) */\n \tstatus = ice_sched_replay_agg_bw(hw, agg_info);\n \tif (status)\n \t\treturn status;\n@@ -5354,14 +5355,14 @@ ice_sched_replay_vsi_agg(struct ice_hw *hw, u16 vsi_handle)\n \t\t\t\t\t    replay_bitmap);\n \tif (status)\n \t\treturn status;\n-\t/* Replay VSI bw (restore VSI bw) */\n+\t/* Replay VSI BW (restore VSI BW) */\n \treturn ice_sched_replay_vsi_bw(hw, vsi_handle,\n \t\t\t\t       agg_vsi_info->tc_bitmap);\n }\n \n /**\n  * ice_replay_vsi_agg - replay VSI to aggregator node\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  * @vsi_handle: software VSI handle\n  *\n  * This function replays association of VSI to aggregator type nodes, and\ndiff --git a/drivers/net/ice/base/ice_sched.h b/drivers/net/ice/base/ice_sched.h\nindex a5565945e..61fa6a85b 100644\n--- a/drivers/net/ice/base/ice_sched.h\n+++ b/drivers/net/ice/base/ice_sched.h\n@@ -43,14 +43,14 @@ struct ice_aqc_rl_profile_info {\n \tstruct ice_aqc_rl_profile_elem profile;\n \tstruct LIST_ENTRY_TYPE list_entry;\n \tu32 bw;\t\t\t/* requested */\n-\tu16 prof_id_ref;\t/* profile id to node association ref count */\n+\tu16 prof_id_ref;\t/* profile ID to node association ref count */\n };\n \n struct ice_sched_agg_vsi_info {\n \tstruct LIST_ENTRY_TYPE list_entry;\n \tice_declare_bitmap(tc_bitmap, ICE_MAX_TRAFFIC_CLASS);\n \tu16 vsi_handle;\n-\t/* save agg vsi TC bitmap */\n+\t/* save aggregator VSI TC bitmap */\n \tice_declare_bitmap(replay_tc_bitmap, ICE_MAX_TRAFFIC_CLASS);\n };\n \n@@ -60,9 +60,9 @@ struct ice_sched_agg_info {\n \tice_declare_bitmap(tc_bitmap, ICE_MAX_TRAFFIC_CLASS);\n \tu32 agg_id;\n \tenum ice_agg_type agg_type;\n-\t/* bw_t_info saves agg bw information */\n+\t/* bw_t_info saves aggregator BW information */\n \tstruct ice_bw_type_info bw_t_info[ICE_MAX_TRAFFIC_CLASS];\n-\t/* save agg TC bitmap */\n+\t/* save aggregator TC bitmap */\n \tice_declare_bitmap(replay_tc_bitmap, ICE_MAX_TRAFFIC_CLASS);\n };\n \ndiff --git a/drivers/net/ice/base/ice_switch.c b/drivers/net/ice/base/ice_switch.c\nindex a7b712e17..512e64b91 100644\n--- a/drivers/net/ice/base/ice_switch.c\n+++ b/drivers/net/ice/base/ice_switch.c\n@@ -21,7 +21,7 @@\n  * byte 6 = 0x2: to identify it as locally administered SA MAC\n  * byte 12 = 0x81 & byte 13 = 0x00:\n  *\tIn case of VLAN filter first two bytes defines ether type (0x8100)\n- *\tand remaining two bytes are placeholder for programming a given VLAN id\n+ *\tand remaining two bytes are placeholder for programming a given VLAN ID\n  *\tIn case of Ether type filter it is treated as header without VLAN tag\n  *\tand byte 12 and 13 is used to program a given Ether type instead\n  */\n@@ -54,7 +54,7 @@ static const u8 dummy_eth_header[DUMMY_ETH_HDR_LEN] = { 0x2, 0, 0, 0, 0, 0,\n \n /**\n  * ice_init_def_sw_recp - initialize the recipe book keeping tables\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  *\n  * Allocate memory for the entire recipe table and initialize the structures/\n  * entries corresponding to basic recipes.\n@@ -282,7 +282,7 @@ enum ice_status ice_free_sw(struct ice_hw *hw, u16 sw_id, u16 counter_id)\n \n /**\n  * ice_aq_add_vsi\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  * @vsi_ctx: pointer to a VSI context struct\n  * @cd: pointer to command details structure or NULL\n  *\n@@ -324,7 +324,7 @@ ice_aq_add_vsi(struct ice_hw *hw, struct ice_vsi_ctx *vsi_ctx,\n \n /**\n  * ice_aq_free_vsi\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  * @vsi_ctx: pointer to a VSI context struct\n  * @keep_vsi_alloc: keep VSI allocation as part of this PF's resources\n  * @cd: pointer to command details structure or NULL\n@@ -360,7 +360,7 @@ ice_aq_free_vsi(struct ice_hw *hw, struct ice_vsi_ctx *vsi_ctx,\n \n /**\n  * ice_aq_update_vsi\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  * @vsi_ctx: pointer to a VSI context struct\n  * @cd: pointer to command details structure or NULL\n  *\n@@ -397,7 +397,7 @@ ice_aq_update_vsi(struct ice_hw *hw, struct ice_vsi_ctx *vsi_ctx,\n \n /**\n  * ice_is_vsi_valid - check whether the VSI is valid or not\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  * @vsi_handle: VSI handle\n  *\n  * check whether the VSI is valid or not\n@@ -408,11 +408,11 @@ bool ice_is_vsi_valid(struct ice_hw *hw, u16 vsi_handle)\n }\n \n /**\n- * ice_get_hw_vsi_num - return the hw VSI number\n- * @hw: pointer to the hw struct\n+ * ice_get_hw_vsi_num - return the HW VSI number\n+ * @hw: pointer to the HW struct\n  * @vsi_handle: VSI handle\n  *\n- * return the hw VSI number\n+ * return the HW VSI number\n  * Caution: call this function only if VSI is valid (ice_is_vsi_valid)\n  */\n u16 ice_get_hw_vsi_num(struct ice_hw *hw, u16 vsi_handle)\n@@ -422,7 +422,7 @@ u16 ice_get_hw_vsi_num(struct ice_hw *hw, u16 vsi_handle)\n \n /**\n  * ice_get_vsi_ctx - return the VSI context entry for a given VSI handle\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  * @vsi_handle: VSI handle\n  *\n  * return the VSI context entry for a given VSI handle\n@@ -434,7 +434,7 @@ struct ice_vsi_ctx *ice_get_vsi_ctx(struct ice_hw *hw, u16 vsi_handle)\n \n /**\n  * ice_save_vsi_ctx - save the VSI context for a given VSI handle\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  * @vsi_handle: VSI handle\n  * @vsi: VSI context pointer\n  *\n@@ -448,7 +448,7 @@ ice_save_vsi_ctx(struct ice_hw *hw, u16 vsi_handle, struct ice_vsi_ctx *vsi)\n \n /**\n  * ice_clear_vsi_ctx - clear the VSI context entry\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  * @vsi_handle: VSI handle\n  *\n  * clear the VSI context entry\n@@ -467,7 +467,7 @@ static void ice_clear_vsi_ctx(struct ice_hw *hw, u16 vsi_handle)\n \n /**\n  * ice_clear_all_vsi_ctx - clear all the VSI context entries\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  */\n void ice_clear_all_vsi_ctx(struct ice_hw *hw)\n {\n@@ -479,13 +479,13 @@ void ice_clear_all_vsi_ctx(struct ice_hw *hw)\n \n /**\n  * ice_add_vsi - add VSI context to the hardware and VSI handle list\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  * @vsi_handle: unique VSI handle provided by drivers\n  * @vsi_ctx: pointer to a VSI context struct\n  * @cd: pointer to command details structure or NULL\n  *\n  * Add a VSI context to the hardware also add it into the VSI handle list.\n- * If this function gets called after reset for exisiting VSIs then update\n+ * If this function gets called after reset for existing VSIs then update\n  * with the new HW VSI number in the corresponding VSI handle list entry.\n  */\n enum ice_status\n@@ -502,7 +502,7 @@ ice_add_vsi(struct ice_hw *hw, u16 vsi_handle, struct ice_vsi_ctx *vsi_ctx,\n \t\treturn status;\n \ttmp_vsi_ctx = ice_get_vsi_ctx(hw, vsi_handle);\n \tif (!tmp_vsi_ctx) {\n-\t\t/* Create a new vsi context */\n+\t\t/* Create a new VSI context */\n \t\ttmp_vsi_ctx = (struct ice_vsi_ctx *)\n \t\t\tice_malloc(hw, sizeof(*tmp_vsi_ctx));\n \t\tif (!tmp_vsi_ctx) {\n@@ -519,12 +519,12 @@ ice_add_vsi(struct ice_hw *hw, u16 vsi_handle, struct ice_vsi_ctx *vsi_ctx,\n \t\t\ttmp_vsi_ctx->vsi_num = vsi_ctx->vsi_num;\n \t}\n \n-\treturn status;\n+\treturn ICE_SUCCESS;\n }\n \n /**\n  * ice_free_vsi- free VSI context from hardware and VSI handle list\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  * @vsi_handle: unique VSI handle\n  * @vsi_ctx: pointer to a VSI context struct\n  * @keep_vsi_alloc: keep VSI allocation as part of this PF's resources\n@@ -549,7 +549,7 @@ ice_free_vsi(struct ice_hw *hw, u16 vsi_handle, struct ice_vsi_ctx *vsi_ctx,\n \n /**\n  * ice_update_vsi\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  * @vsi_handle: unique VSI handle\n  * @vsi_ctx: pointer to a VSI context struct\n  * @cd: pointer to command details structure or NULL\n@@ -570,8 +570,8 @@ ice_update_vsi(struct ice_hw *hw, u16 vsi_handle, struct ice_vsi_ctx *vsi_ctx,\n \n /**\n  * ice_aq_alloc_free_vsi_list\n- * @hw: pointer to the hw struct\n- * @vsi_list_id: VSI list id returned or used for lookup\n+ * @hw: pointer to the HW struct\n+ * @vsi_list_id: VSI list ID returned or used for lookup\n  * @lkup_type: switch rule filter lookup type\n  * @opc: switch rules population command type - pass in the command opcode\n  *\n@@ -629,7 +629,7 @@ ice_aq_alloc_free_vsi_list(struct ice_hw *hw, u16 *vsi_list_id,\n \n /**\n  * ice_aq_sw_rules - add/update/remove switch rules\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  * @rule_list: pointer to switch rule population list\n  * @rule_list_sz: total size of the rule list in bytes\n  * @num_rules: number of switch rules in the rule_list\n@@ -798,7 +798,7 @@ static void ice_fill_sw_info(struct ice_hw *hw, struct ice_fltr_info *fi)\n \t\t * 1. The switch is a VEB AND\n \t\t * 2\n \t\t * 2.1 The lookup is a directional lookup like ethertype,\n-\t\t * promiscuous, ethertype-mac, promiscuous-vlan\n+\t\t * promiscuous, ethertype-MAC, promiscuous-VLAN\n \t\t * and default-port OR\n \t\t * 2.2 The lookup is VLAN, OR\n \t\t * 2.3 The lookup is MAC with mcast or bcast addr for MAC, OR\n@@ -829,7 +829,7 @@ static void ice_fill_sw_info(struct ice_hw *hw, struct ice_fltr_info *fi)\n }\n \n /**\n- * ice_ilog2 - Caculates integer log base 2 of a number\n+ * ice_ilog2 - Calculates integer log base 2 of a number\n  * @n: number on which to perform operation\n  */\n static int ice_ilog2(u64 n)\n@@ -984,7 +984,7 @@ ice_fill_sw_rule(struct ice_hw *hw, struct ice_fltr_info *f_info,\n  * @hw: pointer to the hardware structure\n  * @m_ent: the management entry for which sw marker needs to be added\n  * @sw_marker: sw marker to tag the Rx descriptor with\n- * @l_id: large action resource id\n+ * @l_id: large action resource ID\n  *\n  * Create a large action to hold software marker and update the switch rule\n  * entry pointed by m_ent with newly created large action\n@@ -996,8 +996,8 @@ ice_add_marker_act(struct ice_hw *hw, struct ice_fltr_mgmt_list_entry *m_ent,\n \tstruct ice_aqc_sw_rules_elem *lg_act, *rx_tx;\n \t/* For software marker we need 3 large actions\n \t * 1. FWD action: FWD TO VSI or VSI LIST\n-\t * 2. GENERIC VALUE action to hold the profile id\n-\t * 3. GENERIC VALUE action to hold the software marker id\n+\t * 2. GENERIC VALUE action to hold the profile ID\n+\t * 3. GENERIC VALUE action to hold the software marker ID\n \t */\n \tconst u16 num_lg_acts = 3;\n \tenum ice_status status;\n@@ -1060,13 +1060,13 @@ ice_add_marker_act(struct ice_hw *hw, struct ice_fltr_mgmt_list_entry *m_ent,\n \tice_fill_sw_rule(hw, &m_ent->fltr_info, rx_tx,\n \t\t\t ice_aqc_opc_update_sw_rules);\n \n-\t/* Update the action to point to the large action id */\n+\t/* Update the action to point to the large action ID */\n \trx_tx->pdata.lkup_tx_rx.act =\n \t\tCPU_TO_LE32(ICE_SINGLE_ACT_PTR |\n \t\t\t    ((l_id << ICE_SINGLE_ACT_PTR_VAL_S) &\n \t\t\t     ICE_SINGLE_ACT_PTR_VAL_M));\n \n-\t/* Use the filter rule id of the previously created rule with single\n+\t/* Use the filter rule ID of the previously created rule with single\n \t * act. Once the update happens, hardware will treat this as large\n \t * action\n \t */\n@@ -1090,10 +1090,10 @@ ice_add_marker_act(struct ice_hw *hw, struct ice_fltr_mgmt_list_entry *m_ent,\n  * @hw: pointer to the hardware structure\n  * @vsi_handle_arr: array of VSI handles to set in the VSI mapping\n  * @num_vsi: number of VSI handles in the array\n- * @vsi_list_id: VSI list id generated as part of allocate resource\n+ * @vsi_list_id: VSI list ID generated as part of allocate resource\n  *\n- * Helper function to create a new entry of VSI list id to VSI mapping\n- * using the given VSI list id\n+ * Helper function to create a new entry of VSI list ID to VSI mapping\n+ * using the given VSI list ID\n  */\n static struct ice_vsi_list_map_info *\n ice_create_vsi_list_map(struct ice_hw *hw, u16 *vsi_handle_arr, u16 num_vsi,\n@@ -1122,13 +1122,13 @@ ice_create_vsi_list_map(struct ice_hw *hw, u16 *vsi_handle_arr, u16 num_vsi,\n  * @hw: pointer to the hardware structure\n  * @vsi_handle_arr: array of VSI handles to form a VSI list\n  * @num_vsi: number of VSI handles in the array\n- * @vsi_list_id: VSI list id generated as part of allocate resource\n+ * @vsi_list_id: VSI list ID generated as part of allocate resource\n  * @remove: Boolean value to indicate if this is a remove action\n  * @opc: switch rules population command type - pass in the command opcode\n  * @lkup_type: lookup type of the filter\n  *\n  * Call AQ command to add a new switch rule or update existing switch rule\n- * using the given VSI list id\n+ * using the given VSI list ID\n  */\n static enum ice_status\n ice_update_vsi_list_rule(struct ice_hw *hw, u16 *vsi_handle_arr, u16 num_vsi,\n@@ -1185,7 +1185,7 @@ ice_update_vsi_list_rule(struct ice_hw *hw, u16 *vsi_handle_arr, u16 num_vsi,\n \n /**\n  * ice_create_vsi_list_rule - Creates and populates a VSI list rule\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  * @vsi_handle_arr: array of VSI handles to form a VSI list\n  * @num_vsi: number of VSI handles in the array\n  * @vsi_list_id: stores the ID of the VSI list to be created\n@@ -1279,7 +1279,7 @@ ice_create_pkt_fwd_rule(struct ice_hw *hw,\n  * @f_info: filter information for switch rule\n  *\n  * Call AQ command to update a previously created switch rule with a\n- * VSI list id\n+ * VSI list ID\n  */\n static enum ice_status\n ice_update_pkt_fwd_rule(struct ice_hw *hw, struct ice_fltr_info *f_info)\n@@ -1306,7 +1306,7 @@ ice_update_pkt_fwd_rule(struct ice_hw *hw, struct ice_fltr_info *f_info)\n \n /**\n  * ice_update_sw_rule_bridge_mode\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  *\n  * Updates unicast switch filter rules based on VEB/VEPA mode\n  */\n@@ -1362,7 +1362,7 @@ enum ice_status ice_update_sw_rule_bridge_mode(struct ice_hw *hw)\n  *\t\tAllocate a new VSI list and add two VSIs\n  *\t\tto this list using switch rule command\n  *\t\tUpdate the previously created switch rule with the\n- *\t\tnewly created VSI list id\n+ *\t\tnewly created VSI list ID\n  *\tif a VSI list was previously created\n  *\t\tAdd the new VSI to the previously created VSI list set\n  *\t\tusing the update switch rule command\n@@ -1443,7 +1443,7 @@ ice_add_update_vsi_list(struct ice_hw *hw,\n \t\t\treturn ICE_SUCCESS;\n \n \t\t/* Update the previously created VSI list set with\n-\t\t * the new VSI id passed in\n+\t\t * the new VSI ID passed in\n \t\t */\n \t\tvsi_list_id = cur_fltr->fwd_id.vsi_list_id;\n \t\topcode = ice_aqc_opc_update_sw_rules;\n@@ -1451,7 +1451,7 @@ ice_add_update_vsi_list(struct ice_hw *hw,\n \t\tstatus = ice_update_vsi_list_rule(hw, &vsi_handle, 1,\n \t\t\t\t\t\t  vsi_list_id, false, opcode,\n \t\t\t\t\t\t  new_fltr->lkup_type);\n-\t\t/* update VSI list mapping info with new VSI id */\n+\t\t/* update VSI list mapping info with new VSI ID */\n \t\tif (!status)\n \t\t\tice_set_bit(vsi_handle,\n \t\t\t\t    m_entry->vsi_list_info->vsi_map);\n@@ -1495,7 +1495,7 @@ ice_find_rule_entry(struct ice_hw *hw, u8 recp_id, struct ice_fltr_info *f_info)\n  * @hw: pointer to the hardware structure\n  * @recp_id: lookup type for which VSI lists needs to be searched\n  * @vsi_handle: VSI handle to be found in VSI list\n- * @vsi_list_id: VSI list id found contaning vsi_handle\n+ * @vsi_list_id: VSI list ID found containing vsi_handle\n  *\n  * Helper function to search a VSI list with single entry containing given VSI\n  * handle element. This can be extended further to search VSI list with more\n@@ -1527,7 +1527,7 @@ ice_find_vsi_list_entry(struct ice_hw *hw, u8 recp_id, u16 vsi_handle,\n /**\n  * ice_add_rule_internal - add rule for a given lookup type\n  * @hw: pointer to the hardware structure\n- * @recp_id: lookup type (recipe id) for which rule has to be added\n+ * @recp_id: lookup type (recipe ID) for which rule has to be added\n  * @f_entry: structure containing MAC forwarding information\n  *\n  * Adds or updates the rule lists for a given recipe\n@@ -1576,7 +1576,7 @@ ice_add_rule_internal(struct ice_hw *hw, u8 recp_id,\n /**\n  * ice_remove_vsi_list_rule\n  * @hw: pointer to the hardware structure\n- * @vsi_list_id: VSI list id generated as part of allocate resource\n+ * @vsi_list_id: VSI list ID generated as part of allocate resource\n  * @lkup_type: switch rule filter lookup type\n  *\n  * The VSI list should be emptied before this function is called to remove the\n@@ -1702,7 +1702,7 @@ ice_rem_update_vsi_list(struct ice_hw *hw, u16 vsi_handle,\n  * ice_remove_rule_internal - Remove a filter rule of a given type\n  *\n  * @hw: pointer to the hardware structure\n- * @recp_id: recipe id for which the rule needs to removed\n+ * @recp_id: recipe ID for which the rule needs to removed\n  * @f_entry: rule entry containing filter information\n  */\n static enum ice_status\n@@ -1752,7 +1752,7 @@ ice_remove_rule_internal(struct ice_hw *hw, u8 recp_id,\n \t\tstatus = ice_rem_update_vsi_list(hw, vsi_handle, list_elem);\n \t\tif (status)\n \t\t\tgoto exit;\n-\t\t/* if vsi count goes to zero after updating the vsi list */\n+\t\t/* if VSI count goes to zero after updating the VSI list */\n \t\tif (list_elem->vsi_count == 0)\n \t\t\tremove_rule = true;\n \t}\n@@ -1830,7 +1830,7 @@ ice_add_mac(struct ice_hw *hw, struct LIST_HEAD_TYPE *m_list)\n \t\t\treturn ICE_ERR_PARAM;\n \t\thw_vsi_id = ice_get_hw_vsi_num(hw, vsi_handle);\n \t\tm_list_itr->fltr_info.fwd_id.hw_vsi_id = hw_vsi_id;\n-\t\t/* update the src in case it is vsi num */\n+\t\t/* update the src in case it is VSI num */\n \t\tif (m_list_itr->fltr_info.src_id != ICE_SRC_ID_VSI)\n \t\t\treturn ICE_ERR_PARAM;\n \t\tm_list_itr->fltr_info.src = hw_vsi_id;\n@@ -1907,7 +1907,7 @@ ice_add_mac(struct ice_hw *hw, struct LIST_HEAD_TYPE *m_list)\n \t\t\t((u8 *)r_iter + (elem_sent * s_rule_size));\n \t}\n \n-\t/* Fill up rule id based on the value returned from FW */\n+\t/* Fill up rule ID based on the value returned from FW */\n \tr_iter = s_rule;\n \tLIST_FOR_EACH_ENTRY(m_list_itr, m_list, ice_fltr_list_entry,\n \t\t\t    list_entry) {\n@@ -1968,7 +1968,7 @@ ice_add_vlan_internal(struct ice_hw *hw, struct ice_fltr_list_entry *f_entry)\n \t\tice_get_hw_vsi_num(hw, f_entry->fltr_info.vsi_handle);\n \tnew_fltr = &f_entry->fltr_info;\n \n-\t/* VLAN id should only be 12 bits */\n+\t/* VLAN ID should only be 12 bits */\n \tif (new_fltr->l_data.vlan.vlan_id > ICE_MAX_VLAN_ID)\n \t\treturn ICE_ERR_PARAM;\n \n@@ -2026,7 +2026,7 @@ ice_add_vlan_internal(struct ice_hw *hw, struct ice_fltr_list_entry *f_entry)\n \t\t\t}\n \t\t}\n \t} else if (v_list_itr->vsi_list_info->ref_cnt == 1) {\n-\t\t/* Update existing VSI list to add new VSI id only if it used\n+\t\t/* Update existing VSI list to add new VSI ID only if it used\n \t\t * by one VLAN rule.\n \t\t */\n \t\tcur_fltr = &v_list_itr->fltr_info;\n@@ -2036,7 +2036,7 @@ ice_add_vlan_internal(struct ice_hw *hw, struct ice_fltr_list_entry *f_entry)\n \t\t/* If VLAN rule exists and VSI list being used by this rule is\n \t\t * referenced by more than 1 VLAN rule. Then create a new VSI\n \t\t * list appending previous VSI with new VSI and update existing\n-\t\t * VLAN rule to point to new VSI list id\n+\t\t * VLAN rule to point to new VSI list ID\n \t\t */\n \t\tstruct ice_fltr_info tmp_fltr;\n \t\tu16 vsi_handle_arr[2];\n@@ -2130,9 +2130,9 @@ ice_add_vlan(struct ice_hw *hw, struct LIST_HEAD_TYPE *v_list)\n  * @hw: pointer to the hardware structure\n  * @mv_list: list of MAC and VLAN filters\n  *\n- * If the VSI on which the mac-vlan pair has to be added has RX and Tx VLAN\n+ * If the VSI on which the MAC-VLAN pair has to be added has Rx and Tx VLAN\n  * pruning bits enabled, then it is the responsibility of the caller to make\n- * sure to add a vlan only filter on the same VSI. Packets belonging to that\n+ * sure to add a VLAN only filter on the same VSI. Packets belonging to that\n  * VLAN won't be received on that VSI otherwise.\n  */\n enum ice_status\n@@ -2446,7 +2446,7 @@ ice_add_to_vsi_fltr_list(struct ice_hw *hw, u16 vsi_handle,\n \tstruct ice_fltr_mgmt_list_entry *fm_entry;\n \tenum ice_status status = ICE_SUCCESS;\n \n-\t/* check to make sure VSI id is valid and within boundary */\n+\t/* check to make sure VSI ID is valid and within boundary */\n \tif (!ice_is_vsi_valid(hw, vsi_handle))\n \t\treturn ICE_ERR_PARAM;\n \n@@ -2504,7 +2504,7 @@ static u8 ice_determine_promisc_mask(struct ice_fltr_info *fi)\n /**\n  * ice_remove_promisc - Remove promisc based filter rules\n  * @hw: pointer to the hardware structure\n- * @recp_id: recipe id for which the rule needs to removed\n+ * @recp_id: recipe ID for which the rule needs to removed\n  * @v_list: list of promisc entries\n  */\n static enum ice_status\n@@ -2851,8 +2851,8 @@ void ice_remove_vsi_fltr(struct ice_hw *hw, u16 vsi_handle)\n /**\n  * ice_replay_vsi_fltr - Replay filters for requested VSI\n  * @hw: pointer to the hardware structure\n- * @vsi_handle: driver vsi handle\n- * @recp_id: Recipe id for which rules need to be replayed\n+ * @vsi_handle: driver VSI handle\n+ * @recp_id: Recipe ID for which rules need to be replayed\n  * @list_head: list for which filters need to be replayed\n  *\n  * Replays the filter of recipe recp_id for a VSI represented via vsi_handle.\n@@ -2877,7 +2877,7 @@ ice_replay_vsi_fltr(struct ice_hw *hw, u16 vsi_handle, u8 recp_id,\n \t\tf_entry.fltr_info = itr->fltr_info;\n \t\tif (itr->vsi_count < 2 && recp_id != ICE_SW_LKUP_VLAN &&\n \t\t    itr->fltr_info.vsi_handle == vsi_handle) {\n-\t\t\t/* update the src in case it is vsi num */\n+\t\t\t/* update the src in case it is VSI num */\n \t\t\tif (f_entry.fltr_info.src_id == ICE_SRC_ID_VSI)\n \t\t\t\tf_entry.fltr_info.src = hw_vsi_id;\n \t\t\tstatus = ice_add_rule_internal(hw, recp_id, &f_entry);\n@@ -2892,7 +2892,7 @@ ice_replay_vsi_fltr(struct ice_hw *hw, u16 vsi_handle, u8 recp_id,\n \t\tice_clear_bit(vsi_handle, itr->vsi_list_info->vsi_map);\n \t\tf_entry.fltr_info.vsi_handle = vsi_handle;\n \t\tf_entry.fltr_info.fltr_act = ICE_FWD_TO_VSI;\n-\t\t/* update the src in case it is vsi num */\n+\t\t/* update the src in case it is VSI num */\n \t\tif (f_entry.fltr_info.src_id == ICE_SRC_ID_VSI)\n \t\t\tf_entry.fltr_info.src = hw_vsi_id;\n \t\tif (recp_id == ICE_SW_LKUP_VLAN)\n@@ -2910,7 +2910,7 @@ ice_replay_vsi_fltr(struct ice_hw *hw, u16 vsi_handle, u8 recp_id,\n /**\n  * ice_replay_vsi_all_fltr - replay all filters stored in bookkeeping lists\n  * @hw: pointer to the hardware structure\n- * @vsi_handle: driver vsi handle\n+ * @vsi_handle: driver VSI handle\n  *\n  * Replays filters for requested VSI via vsi_handle.\n  */\n@@ -2938,7 +2938,7 @@ enum ice_status ice_replay_vsi_all_fltr(struct ice_hw *hw, u16 vsi_handle)\n \n /**\n  * ice_rm_all_sw_replay_rule_info - deletes filter replay rules\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n  *\n  * Deletes the filter replay rules.\n  */\ndiff --git a/drivers/net/ice/base/ice_switch.h b/drivers/net/ice/base/ice_switch.h\nindex dd21781f7..90dfdabcb 100644\n--- a/drivers/net/ice/base/ice_switch.h\n+++ b/drivers/net/ice/base/ice_switch.h\n@@ -40,10 +40,10 @@ enum ice_sw_lkup_type {\n \tICE_SW_LKUP_DFLT = 5,\n \tICE_SW_LKUP_ETHERTYPE_MAC = 8,\n \tICE_SW_LKUP_PROMISC_VLAN = 9,\n-\tICE_SW_LKUP_LAST,\n+\tICE_SW_LKUP_LAST\n };\n \n-/* type of filter src id */\n+/* type of filter src ID */\n enum ice_src_id {\n \tICE_SRC_ID_UNKNOWN = 0,\n \tICE_SRC_ID_VSI,\n@@ -94,8 +94,8 @@ struct ice_fltr_info {\n \n \t/* Depending on filter action */\n \tunion {\n-\t\t/* queue id in case of ICE_FWD_TO_Q and starting\n-\t\t * queue id in case of ICE_FWD_TO_QGRP.\n+\t\t/* queue ID in case of ICE_FWD_TO_Q and starting\n+\t\t * queue ID in case of ICE_FWD_TO_QGRP.\n \t\t */\n \t\tu16 q_id:11;\n \t\tu16 hw_vsi_id:10;\n@@ -134,8 +134,8 @@ struct ice_sw_act_ctrl {\n \tenum ice_sw_fwd_act_type fltr_act;\n \t/* Depending on filter action */\n \tunion {\n-\t\t/* This is a queue id in case of ICE_FWD_TO_Q and starting\n-\t\t * queue id in case of ICE_FWD_TO_QGRP.\n+\t\t/* This is a queue ID in case of ICE_FWD_TO_Q and starting\n+\t\t * queue ID in case of ICE_FWD_TO_QGRP.\n \t\t */\n \t\tu16 q_id:11;\n \t\tu16 vsi_id:10;\n@@ -178,7 +178,7 @@ struct ice_sw_recipe {\n \tu8 chain_idx;\n \n \t/* if this recipe is a collection of other recipe then count of other\n-\t * recipes and recipe ids of those recipes\n+\t * recipes and recipe IDs of those recipes\n \t */\n \tu8 n_grp_count;\n \n@@ -211,9 +211,11 @@ struct ice_sw_recipe {\n \n \t/* AQ buffer associated with this recipe */\n \tstruct ice_aqc_recipe_data_elem *root_buf;\n+\t/* This struct saves the fv_words for a given lookup */\n+\tstruct ice_prot_lkup_ext lkup_exts;\n };\n \n-/* Bookkeeping structure to hold bitmap of VSIs corresponding to VSI list id */\n+/* Bookkeeping structure to hold bitmap of VSIs corresponding to VSI list ID */\n struct ice_vsi_list_map_info {\n \tstruct LIST_ENTRY_TYPE list_entry;\n \tice_declare_bitmap(vsi_map, ICE_MAX_VSI);\n@@ -235,7 +237,7 @@ struct ice_fltr_list_entry {\n  * used for VLAN membership.\n  */\n struct ice_fltr_mgmt_list_entry {\n-\t/* back pointer to VSI list id to VSI list mapping */\n+\t/* back pointer to VSI list ID to VSI list mapping */\n \tstruct ice_vsi_list_map_info *vsi_list_info;\n \tu16 vsi_count;\n #define ICE_INVAL_LG_ACT_INDEX 0xffff\ndiff --git a/drivers/net/ice/base/ice_type.h b/drivers/net/ice/base/ice_type.h\nindex 17d79ba21..08c974004 100644\n--- a/drivers/net/ice/base/ice_type.h\n+++ b/drivers/net/ice/base/ice_type.h\n@@ -196,7 +196,7 @@ enum ice_q {\n };\n \n /* Different reset sources for which a disable queue AQ call has to be made in\n- * order to clean the TX scheduler as a part of the reset\n+ * order to clean the Tx scheduler as a part of the reset\n  */\n enum ice_disq_rst_src {\n \tICE_NO_RESET = 0,\n@@ -242,11 +242,11 @@ struct ice_hw_common_caps {\n \tu32 rss_table_size;\t\t/* 512 for PFs and 64 for VFs */\n \tu32 rss_table_entry_width;\t/* RSS Entry width in bits */\n \n-\t/* TX/RX queues */\n-\tu32 num_rxq;\t\t\t/* Number/Total RX queues */\n-\tu32 rxq_first_id;\t\t/* First queue ID for RX queues */\n-\tu32 num_txq;\t\t\t/* Number/Total TX queues */\n-\tu32 txq_first_id;\t\t/* First queue ID for TX queues */\n+\t/* Tx/Rx queues */\n+\tu32 num_rxq;\t\t\t/* Number/Total Rx queues */\n+\tu32 rxq_first_id;\t\t/* First queue ID for Rx queues */\n+\tu32 num_txq;\t\t\t/* Number/Total Tx queues */\n+\tu32 txq_first_id;\t\t/* First queue ID for Tx queues */\n \n \t/* MSI-X vectors */\n \tu32 num_msix_vectors;\n@@ -390,7 +390,7 @@ struct ice_sched_node {\n \tstruct ice_sched_node *sibling; /* next sibling in the same layer */\n \tstruct ice_sched_node **children;\n \tstruct ice_aqc_txsched_elem_data info;\n-\tu32 agg_id;\t\t\t/* aggregator group id */\n+\tu32 agg_id;\t\t\t/* aggregator group ID */\n \tu16 vsi_handle;\n \tu8 in_use;\t\t\t/* suspended or in use */\n \tu8 tx_sched_layer;\t\t/* Logical Layer (1-9) */\n@@ -435,8 +435,8 @@ enum ice_agg_type {\n /* Rate limit types */\n enum ice_rl_type {\n \tICE_UNKNOWN_BW = 0,\n-\tICE_MIN_BW,\t\t/* for cir profile */\n-\tICE_MAX_BW,\t\t/* for eir profile */\n+\tICE_MIN_BW,\t\t/* for CIR profile */\n+\tICE_MAX_BW,\t\t/* for EIR profile */\n \tICE_SHARED_BW\t\t/* for shared profile */\n };\n \n@@ -475,7 +475,7 @@ enum ice_rl_type {\n  *\n  *  (a) is the last_node_teid(not of type Leaf). A leaf node is created under\n  *  (a) as child node where queues get added, add Tx/Rx queue admin commands;\n- *  need teid of (a) to add queues.\n+ *  need TEID of (a) to add queues.\n  *\n  *  This tree\n  *       -> has 8 branches (one for each TC)\n@@ -487,7 +487,7 @@ enum ice_rl_type {\n  *  Refer to the documentation for more info.\n  */\n \n- /* Data structure for saving bw information */\n+ /* Data structure for saving BW information */\n enum ice_bw_type {\n \tICE_BW_TYPE_PRIO,\n \tICE_BW_TYPE_CIR,\n@@ -511,12 +511,12 @@ struct ice_bw_type_info {\n \tu32 shared_bw;\n };\n \n-/* vsi type list entry to locate corresponding vsi/ag nodes */\n+/* VSI type list entry to locate corresponding VSI/aggregator nodes */\n struct ice_sched_vsi_info {\n \tstruct ice_sched_node *vsi_node[ICE_MAX_TRAFFIC_CLASS];\n \tstruct ice_sched_node *ag_node[ICE_MAX_TRAFFIC_CLASS];\n \tu16 max_lanq[ICE_MAX_TRAFFIC_CLASS];\n-\t/* bw_t_info saves VSI bw information */\n+\t/* bw_t_info saves VSI BW information */\n \tstruct ice_bw_type_info bw_t_info[ICE_MAX_TRAFFIC_CLASS];\n };\n \n@@ -577,7 +577,7 @@ struct ice_dcbx_cfg {\n \n struct ice_port_info {\n \tstruct ice_sched_node *root;\t/* Root Node per Port */\n-\tstruct ice_hw *hw;\t\t/* back pointer to hw instance */\n+\tstruct ice_hw *hw;\t\t/* back pointer to HW instance */\n \tu32 last_node_teid;\t\t/* scheduler last node info */\n \tu16 sw_id;\t\t\t/* Initial switch ID belongs to port */\n \tu16 pf_vf_num;\n@@ -592,7 +592,7 @@ struct ice_port_info {\n \tstruct ice_mac_info mac;\n \tstruct ice_phy_info phy;\n \tstruct ice_lock sched_lock;\t/* protect access to TXSched tree */\n-\t/* List contain profile id(s) and other params per layer */\n+\t/* List contain profile ID(s) and other params per layer */\n \tstruct LIST_HEAD_TYPE rl_prof_list[ICE_AQC_TOPO_MAX_LEVEL_NUM];\n #if !defined(NO_DCB_SUPPORT) || defined(ADQ_SUPPORT)\n \tstruct ice_dcbx_cfg local_dcbx_cfg;\t/* Oper/Local Cfg */\n@@ -648,7 +648,7 @@ struct ice_hw {\n \tu8 pf_id;\t\t/* device profile info */\n \n \tu16 max_burst_size;\t/* driver sets this value */\n-\t/* TX Scheduler values */\n+\t/* Tx Scheduler values */\n \tu16 num_tx_sched_layers;\n \tu16 num_tx_sched_phys_layers;\n \tu8 flattened_layers;\n@@ -659,7 +659,7 @@ struct ice_hw {\n \tstruct ice_bw_type_info tc_node_bw_t_info[ICE_MAX_TRAFFIC_CLASS];\n \tstruct ice_vsi_ctx *vsi_ctx[ICE_MAX_VSI];\n \tu8 evb_veb;\t\t/* true for VEB, false for VEPA */\n-\tu8 reset_ongoing;\t/* true if hw is in reset, false otherwise */\n+\tu8 reset_ongoing;\t/* true if HW is in reset, false otherwise */\n \tstruct ice_bus_info bus;\n \tstruct ice_nvm_info nvm;\n \tstruct ice_hw_dev_caps dev_caps;\t/* device capabilities */\n",
    "prefixes": [
        "02/37"
    ]
}