Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/989738/?format=api
{ "id": 989738, "url": "http://patchwork.ozlabs.org/api/patches/989738/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20181026184447.13547-15-anirudh.venkataramanan@intel.com/", "project": { "id": 46, "url": "http://patchwork.ozlabs.org/api/projects/46/?format=api", "name": "Intel Wired Ethernet development", "link_name": "intel-wired-lan", "list_id": "intel-wired-lan.osuosl.org", "list_email": "intel-wired-lan@osuosl.org", "web_url": "", "scm_url": "", "webscm_url": "", "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<20181026184447.13547-15-anirudh.venkataramanan@intel.com>", "list_archive_url": null, "date": "2018-10-26T18:44:46", "name": "[S9,14/15] ice: Cosmetic formatting changes", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "586ea02df6c59ea5955b2bc20d2b5e1dd47fa704", "submitter": { "id": 73601, "url": "http://patchwork.ozlabs.org/api/people/73601/?format=api", "name": "Anirudh Venkataramanan", "email": "anirudh.venkataramanan@intel.com" }, "delegate": { "id": 68, "url": "http://patchwork.ozlabs.org/api/users/68/?format=api", "username": "jtkirshe", "first_name": "Jeff", "last_name": "Kirsher", "email": "jeffrey.t.kirsher@intel.com" }, "mbox": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20181026184447.13547-15-anirudh.venkataramanan@intel.com/mbox/", "series": [ { "id": 72801, "url": "http://patchwork.ozlabs.org/api/series/72801/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=72801", "date": "2018-10-26T18:44:32", "name": "Bug fixes for ice, set 2/2", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/72801/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/989738/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/989738/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<intel-wired-lan-bounces@osuosl.org>", "X-Original-To": [ "incoming@patchwork.ozlabs.org", "intel-wired-lan@lists.osuosl.org" ], "Delivered-To": [ "patchwork-incoming@bilbo.ozlabs.org", "intel-wired-lan@lists.osuosl.org" ], "Authentication-Results": [ "ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=osuosl.org\n\t(client-ip=140.211.166.133; helo=hemlock.osuosl.org;\n\tenvelope-from=intel-wired-lan-bounces@osuosl.org;\n\treceiver=<UNKNOWN>)", "ozlabs.org;\n\tdmarc=fail (p=none dis=none) header.from=intel.com" ], "Received": [ "from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256\n\tbits)) (No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 42hXwn50qfz9sMQ\n\tfor <incoming@patchwork.ozlabs.org>;\n\tSat, 27 Oct 2018 05:44:57 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 43CF58833A;\n\tFri, 26 Oct 2018 18:44:56 +0000 (UTC)", "from hemlock.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id AqKW69XLoZIV; Fri, 26 Oct 2018 18:44:54 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id BA9B288B03;\n\tFri, 26 Oct 2018 18:44:54 +0000 (UTC)", "from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133])\n\tby ash.osuosl.org (Postfix) with ESMTP id 9E2B71BF30E\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 26 Oct 2018 18:44:52 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 6B77888781\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 26 Oct 2018 18:44:52 +0000 (UTC)", "from hemlock.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id ZI-gyklBVkvt for <intel-wired-lan@lists.osuosl.org>;\n\tFri, 26 Oct 2018 18:44:50 +0000 (UTC)", "from mga06.intel.com (mga06.intel.com [134.134.136.31])\n\tby hemlock.osuosl.org (Postfix) with ESMTPS id 29C4B88304\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 26 Oct 2018 18:44:50 +0000 (UTC)", "from orsmga005.jf.intel.com ([10.7.209.41])\n\tby orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t26 Oct 2018 11:44:47 -0700", "from shasta.jf.intel.com ([10.166.241.11])\n\tby orsmga005.jf.intel.com with ESMTP; 26 Oct 2018 11:44:47 -0700" ], "X-Virus-Scanned": [ "amavisd-new at osuosl.org", "amavisd-new at osuosl.org" ], "X-Greylist": "domain auto-whitelisted by SQLgrey-1.7.6", "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.54,428,1534834800\"; d=\"scan'208\";a=\"269078863\"", "From": "Anirudh Venkataramanan <anirudh.venkataramanan@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Fri, 26 Oct 2018 11:44:46 -0700", "Message-Id": "<20181026184447.13547-15-anirudh.venkataramanan@intel.com>", "X-Mailer": "git-send-email 2.14.3", "In-Reply-To": "<20181026184447.13547-1-anirudh.venkataramanan@intel.com>", "References": "<20181026184447.13547-1-anirudh.venkataramanan@intel.com>", "Subject": "[Intel-wired-lan] [PATCH S9 14/15] ice: Cosmetic formatting changes", "X-BeenThere": "intel-wired-lan@osuosl.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "Intel Wired Ethernet Linux Kernel Driver Development\n\t<intel-wired-lan.osuosl.org>", "List-Unsubscribe": "<https://lists.osuosl.org/mailman/options/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@osuosl.org?subject=unsubscribe>", "List-Archive": "<http://lists.osuosl.org/pipermail/intel-wired-lan/>", "List-Post": "<mailto:intel-wired-lan@osuosl.org>", "List-Help": "<mailto:intel-wired-lan-request@osuosl.org?subject=help>", "List-Subscribe": "<https://lists.osuosl.org/mailman/listinfo/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@osuosl.org?subject=subscribe>", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Errors-To": "intel-wired-lan-bounces@osuosl.org", "Sender": "\"Intel-wired-lan\" <intel-wired-lan-bounces@osuosl.org>" }, "content": "1. Fix several cases of double spacing\n2. Fix typos\n3. Capitalize abbreviations\n\nSigned-off-by: Anirudh Venkataramanan <anirudh.venkataramanan@intel.com>\n---\n drivers/net/ethernet/intel/ice/ice.h | 10 +--\n drivers/net/ethernet/intel/ice/ice_adminq_cmd.h | 16 ++---\n drivers/net/ethernet/intel/ice/ice_controlq.c | 4 +-\n drivers/net/ethernet/intel/ice/ice_lan_tx_rx.h | 79 ++++++++++++------------\n drivers/net/ethernet/intel/ice/ice_lib.c | 8 +--\n drivers/net/ethernet/intel/ice/ice_main.c | 14 ++---\n drivers/net/ethernet/intel/ice/ice_sriov.c | 2 +-\n drivers/net/ethernet/intel/ice/ice_switch.c | 4 +-\n drivers/net/ethernet/intel/ice/ice_txrx.c | 12 ++--\n drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c | 16 +++--\n drivers/net/ethernet/intel/ice/ice_virtchnl_pf.h | 2 +-\n 11 files changed, 83 insertions(+), 84 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/ice/ice.h b/drivers/net/ethernet/intel/ice/ice.h\nindex 7d8575d11786..60b2e0c9faf5 100644\n--- a/drivers/net/ethernet/intel/ice/ice.h\n+++ b/drivers/net/ethernet/intel/ice/ice.h\n@@ -150,10 +150,10 @@ enum ice_state {\n \t__ICE_RESET_FAILED,\t\t/* set by reset/rebuild */\n \t/* When checking for the PF to be in a nominal operating state, the\n \t * bits that are grouped at the beginning of the list need to be\n-\t * checked. Bits occurring before __ICE_STATE_NOMINAL_CHECK_BITS will\n-\t * be checked. If you need to add a bit into consideration for nominal\n+\t * checked. Bits occurring before __ICE_STATE_NOMINAL_CHECK_BITS will\n+\t * be checked. If you need to add a bit into consideration for nominal\n \t * operating state, it must be added before\n-\t * __ICE_STATE_NOMINAL_CHECK_BITS. Do not move this entry's position\n+\t * __ICE_STATE_NOMINAL_CHECK_BITS. Do not move this entry's position\n \t * without appropriate consideration.\n \t */\n \t__ICE_STATE_NOMINAL_CHECK_BITS,\n@@ -201,8 +201,8 @@ struct ice_vsi {\n \tint sw_base_vector;\t\t/* Irq base for OS reserved vectors */\n \tint hw_base_vector;\t\t/* HW (absolute) index of a vector */\n \tenum ice_vsi_type type;\n-\tu16 vsi_num;\t\t\t /* HW (absolute) index of this VSI */\n-\tu16 idx;\t\t\t /* software index in pf->vsi[] */\n+\tu16 vsi_num;\t\t\t/* HW (absolute) index of this VSI */\n+\tu16 idx;\t\t\t/* software index in pf->vsi[] */\n \n \t/* Interrupt thresholds */\n \tu16 work_lmt;\ndiff --git a/drivers/net/ethernet/intel/ice/ice_adminq_cmd.h b/drivers/net/ethernet/intel/ice/ice_adminq_cmd.h\nindex 4078070881ce..fcdcd80b18e7 100644\n--- a/drivers/net/ethernet/intel/ice/ice_adminq_cmd.h\n+++ b/drivers/net/ethernet/intel/ice/ice_adminq_cmd.h\n@@ -5,7 +5,7 @@\n #define _ICE_ADMINQ_CMD_H_\n \n /* This header file defines the Admin Queue commands, error codes and\n- * descriptor format. It is shared between Firmware and Software.\n+ * descriptor format. It is shared between Firmware and Software.\n */\n \n #define ICE_MAX_VSI\t\t\t768\n@@ -463,7 +463,7 @@ struct ice_aqc_sw_rules {\n };\n \n /* Add/Update/Get/Remove lookup Rx/Tx command/response entry\n- * This structures describes the lookup rules and associated actions. \"index\"\n+ * This structures describes the lookup rules and associated actions. \"index\"\n * is returned as part of a response to a successful Add command, and can be\n * used to identify the rule for Update/Get/Remove commands.\n */\n@@ -1111,7 +1111,7 @@ struct ice_aqc_get_set_rss_keys {\n };\n \n /* Get/Set RSS LUT (indirect 0x0B05/0x0B03) */\n-struct ice_aqc_get_set_rss_lut {\n+struct ice_aqc_get_set_rss_lut {\n #define ICE_AQC_GSET_RSS_LUT_VSI_VALID\tBIT(15)\n #define ICE_AQC_GSET_RSS_LUT_VSI_ID_S\t0\n #define ICE_AQC_GSET_RSS_LUT_VSI_ID_M\t(0x1FF << ICE_AQC_GSET_RSS_LUT_VSI_ID_S)\n@@ -1315,10 +1315,10 @@ struct ice_aqc_get_clear_fw_log {\n * @params: command-specific parameters\n *\n * Descriptor format for commands the driver posts on the Admin Transmit Queue\n- * (ATQ). The firmware writes back onto the command descriptor and returns\n- * the result of the command. Asynchronous events that are not an immediate\n+ * (ATQ). The firmware writes back onto the command descriptor and returns\n+ * the result of the command. Asynchronous events that are not an immediate\n * result of the command are written to the Admin Receive Queue (ARQ) using\n- * the same descriptor format. Descriptors are in little-endian notation with\n+ * the same descriptor format. Descriptors are in little-endian notation with\n * 32-bit words.\n */\n struct ice_aq_desc {\n@@ -1380,10 +1380,10 @@ struct ice_aq_desc {\n \n /* error codes */\n enum ice_aq_err {\n-\tICE_AQ_RC_OK\t\t= 0, /* success */\n+\tICE_AQ_RC_OK\t\t= 0, /* Success */\n \tICE_AQ_RC_ENOMEM\t= 9, /* Out of memory */\n \tICE_AQ_RC_EBUSY\t\t= 12, /* Device or resource busy */\n-\tICE_AQ_RC_EEXIST\t= 13, /* object already exists */\n+\tICE_AQ_RC_EEXIST\t= 13, /* Object already exists */\n \tICE_AQ_RC_ENOSPC\t= 16, /* No space left or allocation failure */\n };\n \ndiff --git a/drivers/net/ethernet/intel/ice/ice_controlq.c b/drivers/net/ethernet/intel/ice/ice_controlq.c\nindex b920403c6616..1831771a7969 100644\n--- a/drivers/net/ethernet/intel/ice/ice_controlq.c\n+++ b/drivers/net/ethernet/intel/ice/ice_controlq.c\n@@ -775,7 +775,7 @@ static bool ice_sq_done(struct ice_hw *hw, struct ice_ctl_q_info *cq)\n * @buf_size: size of buffer for indirect commands (or 0 for direct commands)\n * @cd: pointer to command details structure\n *\n- * This is the main send command routine for the ATQ. It runs the q,\n+ * This is the main send command routine for the ATQ. It runs the queue,\n * cleans the queue, etc.\n */\n enum ice_status\n@@ -969,7 +969,7 @@ void ice_fill_dflt_direct_cmd_desc(struct ice_aq_desc *desc, u16 opcode)\n * @pending: number of events that could be left to process\n *\n * This function cleans one Admin Receive Queue element and returns\n- * the contents through e. It can also return how many events are\n+ * the contents through e. It can also return how many events are\n * left to process through 'pending'.\n */\n enum ice_status\ndiff --git a/drivers/net/ethernet/intel/ice/ice_lan_tx_rx.h b/drivers/net/ethernet/intel/ice/ice_lan_tx_rx.h\nindex 7d2a66739e3f..bb51dd7defb5 100644\n--- a/drivers/net/ethernet/intel/ice/ice_lan_tx_rx.h\n+++ b/drivers/net/ethernet/intel/ice/ice_lan_tx_rx.h\n@@ -6,11 +6,11 @@\n \n union ice_32byte_rx_desc {\n \tstruct {\n-\t\t__le64 pkt_addr; /* Packet buffer address */\n-\t\t__le64 hdr_addr; /* Header buffer address */\n+\t\t__le64 pkt_addr; /* Packet buffer address */\n+\t\t__le64 hdr_addr; /* Header buffer address */\n \t\t\t/* bit 0 of hdr_addr is DD bit */\n-\t\t__le64 rsvd1;\n-\t\t__le64 rsvd2;\n+\t\t__le64 rsvd1;\n+\t\t__le64 rsvd2;\n \t} read;\n \tstruct {\n \t\tstruct {\n@@ -105,11 +105,11 @@ enum ice_rx_ptype_payload_layer {\n */\n union ice_32b_rx_flex_desc {\n \tstruct {\n-\t\t__le64 pkt_addr; /* Packet buffer address */\n-\t\t__le64 hdr_addr; /* Header buffer address */\n-\t\t\t\t /* bit 0 of hdr_addr is DD bit */\n-\t\t__le64 rsvd1;\n-\t\t__le64 rsvd2;\n+\t\t__le64 pkt_addr; /* Packet buffer address */\n+\t\t__le64 hdr_addr; /* Header buffer address */\n+\t\t\t\t /* bit 0 of hdr_addr is DD bit */\n+\t\t__le64 rsvd1;\n+\t\t__le64 rsvd2;\n \t} read;\n \tstruct {\n \t\t/* Qword 0 */\n@@ -256,6 +256,9 @@ enum ice_rx_flex_desc_status_error_0_bits {\n \n #define ICE_RXQ_CTX_SIZE_DWORDS\t\t8\n #define ICE_RXQ_CTX_SZ\t\t\t(ICE_RXQ_CTX_SIZE_DWORDS * sizeof(u32))\n+#define ICE_TX_CMPLTNQ_CTX_SIZE_DWORDS\t22\n+#define ICE_TX_DRBELL_Q_CTX_SIZE_DWORDS\t5\n+#define GLTCLAN_CQ_CNTX(i, CQ)\t\t(GLTCLAN_CQ_CNTX0(CQ) + ((i) * 0x0800))\n \n /* RLAN Rx queue context data\n *\n@@ -274,18 +277,18 @@ struct ice_rlan_ctx {\n \tu16 dbuf; /* bigger than needed, see above for reason */\n #define ICE_RLAN_CTX_HBUF_S 6\n \tu16 hbuf; /* bigger than needed, see above for reason */\n-\tu8 dtype;\n-\tu8 dsize;\n-\tu8 crcstrip;\n-\tu8 l2tsel;\n-\tu8 hsplit_0;\n-\tu8 hsplit_1;\n-\tu8 showiv;\n+\tu8 dtype;\n+\tu8 dsize;\n+\tu8 crcstrip;\n+\tu8 l2tsel;\n+\tu8 hsplit_0;\n+\tu8 hsplit_1;\n+\tu8 showiv;\n \tu32 rxmax; /* bigger than needed, see above for reason */\n-\tu8 tphrdesc_ena;\n-\tu8 tphwdesc_ena;\n-\tu8 tphdata_ena;\n-\tu8 tphhead_ena;\n+\tu8 tphrdesc_ena;\n+\tu8 tphwdesc_ena;\n+\tu8 tphdata_ena;\n+\tu8 tphhead_ena;\n \tu16 lrxqthresh; /* bigger than needed, see above for reason */\n };\n \n@@ -413,35 +416,35 @@ enum ice_tx_ctx_desc_cmd_bits {\n struct ice_tlan_ctx {\n #define ICE_TLAN_CTX_BASE_S\t7\n \tu64 base;\t\t/* base is defined in 128-byte units */\n-\tu8 port_num;\n+\tu8 port_num;\n \tu16 cgd_num;\t\t/* bigger than needed, see above for reason */\n-\tu8 pf_num;\n+\tu8 pf_num;\n \tu16 vmvf_num;\n-\tu8 vmvf_type;\n+\tu8 vmvf_type;\n #define ICE_TLAN_CTX_VMVF_TYPE_VF\t0\n #define ICE_TLAN_CTX_VMVF_TYPE_VMQ\t1\n #define ICE_TLAN_CTX_VMVF_TYPE_PF\t2\n \tu16 src_vsi;\n-\tu8 tsyn_ena;\n-\tu8 alt_vlan;\n+\tu8 tsyn_ena;\n+\tu8 alt_vlan;\n \tu16 cpuid;\t\t/* bigger than needed, see above for reason */\n-\tu8 wb_mode;\n-\tu8 tphrd_desc;\n-\tu8 tphrd;\n-\tu8 tphwr_desc;\n+\tu8 wb_mode;\n+\tu8 tphrd_desc;\n+\tu8 tphrd;\n+\tu8 tphwr_desc;\n \tu16 cmpq_id;\n \tu16 qnum_in_func;\n-\tu8 itr_notification_mode;\n-\tu8 adjust_prof_id;\n+\tu8 itr_notification_mode;\n+\tu8 adjust_prof_id;\n \tu32 qlen;\t\t/* bigger than needed, see above for reason */\n-\tu8 quanta_prof_idx;\n-\tu8 tso_ena;\n+\tu8 quanta_prof_idx;\n+\tu8 tso_ena;\n \tu16 tso_qnum;\n-\tu8 legacy_int;\n-\tu8 drop_ena;\n-\tu8 cache_prof_idx;\n-\tu8 pkt_shaper_prof_idx;\n-\tu8 int_q_state;\t/* width not needed - internal do not write */\n+\tu8 legacy_int;\n+\tu8 drop_ena;\n+\tu8 cache_prof_idx;\n+\tu8 pkt_shaper_prof_idx;\n+\tu8 int_q_state;\t/* width not needed - internal do not write */\n };\n \n /* macro to make the table lines short */\ndiff --git a/drivers/net/ethernet/intel/ice/ice_lib.c b/drivers/net/ethernet/intel/ice/ice_lib.c\nindex a5961a8fe73c..534221d80200 100644\n--- a/drivers/net/ethernet/intel/ice/ice_lib.c\n+++ b/drivers/net/ethernet/intel/ice/ice_lib.c\n@@ -1012,7 +1012,7 @@ void ice_vsi_free_q_vectors(struct ice_vsi *vsi)\n * @vsi: the VSI being configured\n * @v_idx: index of the vector in the VSI struct\n *\n- * We allocate one q_vector. If allocation fails we return -ENOMEM.\n+ * We allocate one q_vector. If allocation fails we return -ENOMEM.\n */\n static int ice_vsi_alloc_q_vector(struct ice_vsi *vsi, int v_idx)\n {\n@@ -1051,7 +1051,7 @@ static int ice_vsi_alloc_q_vector(struct ice_vsi *vsi, int v_idx)\n * ice_vsi_alloc_q_vectors - Allocate memory for interrupt vectors\n * @vsi: the VSI being configured\n *\n- * We allocate one q_vector per queue interrupt. If allocation fails we\n+ * We allocate one q_vector per queue interrupt. If allocation fails we\n * return -ENOMEM.\n */\n static int ice_vsi_alloc_q_vectors(struct ice_vsi *vsi)\n@@ -2136,9 +2136,7 @@ ice_vsi_setup(struct ice_pf *pf, struct ice_port_info *pi,\n \t\tpf->q_left_rx -= vsi->alloc_rxq;\n \t\tbreak;\n \tdefault:\n-\t\t/* if VSI type is not recognized, clean up the resources and\n-\t\t * exit\n-\t\t */\n+\t\t/* clean up the resources and exit */\n \t\tgoto unroll_vsi_init;\n \t}\n \ndiff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c\nindex 54ded5d9ab4f..9f85d6534520 100644\n--- a/drivers/net/ethernet/intel/ice/ice_main.c\n+++ b/drivers/net/ethernet/intel/ice/ice_main.c\n@@ -408,7 +408,7 @@ static void ice_reset_subtask(struct ice_pf *pf)\n \t/* When a CORER/GLOBR/EMPR is about to happen, the hardware triggers an\n \t * OICR interrupt. The OICR handler (ice_misc_intr) determines what type\n \t * of reset is pending and sets bits in pf->state indicating the reset\n-\t * type and __ICE_RESET_OICR_RECV. So, if the latter bit is set\n+\t * type and __ICE_RESET_OICR_RECV. So, if the latter bit is set\n \t * prepare for pending reset if not already (for PF software-initiated\n \t * global resets the software should already be prepared for it as\n \t * indicated by __ICE_PREPARED_FOR_RESET; for global resets initiated\n@@ -1382,7 +1382,7 @@ static void ice_free_irq_msix_misc(struct ice_pf *pf)\n * @pf: board private structure\n *\n * This sets up the handler for MSIX 0, which is used to manage the\n- * non-queue interrupts, e.g. AdminQ and errors. This is not used\n+ * non-queue interrupts, e.g. AdminQ and errors. This is not used\n * when in MSI or Legacy interrupt mode.\n */\n static int ice_req_irq_msix_misc(struct ice_pf *pf)\n@@ -3674,7 +3674,7 @@ ice_bridge_setlink(struct net_device *dev, struct nlmsghdr *nlh,\n \t\t */\n \t\tstatus = ice_update_sw_rule_bridge_mode(hw);\n \t\tif (status) {\n-\t\t\tnetdev_err(dev, \"update SW_RULE for bridge mode failed, = %d err %d aq_err %d\\n\",\n+\t\t\tnetdev_err(dev, \"switch rule update failed, mode = %d err %d aq_err %d\\n\",\n \t\t\t\t mode, status, hw->adminq.sq_last_status);\n \t\t\t/* revert hw->evb_veb */\n \t\t\thw->evb_veb = (pf_sw->bridge_mode == BRIDGE_MODE_VEB);\n@@ -3785,7 +3785,7 @@ static void ice_tx_timeout(struct net_device *netdev)\n * @netdev: network interface device structure\n *\n * The open entry point is called when a network interface is made\n- * active by the system (IFF_UP). At this point all resources needed\n+ * active by the system (IFF_UP). At this point all resources needed\n * for transmit and receive operations are allocated, the interrupt\n * handler is registered with the OS, the netdev watchdog is enabled,\n * and the stack is notified that the interface is ready.\n@@ -3818,7 +3818,7 @@ static int ice_open(struct net_device *netdev)\n * @netdev: network interface device structure\n *\n * The stop entry point is called when an interface is de-activated by the OS,\n- * and the netdevice enters the DOWN state. The hardware is still under the\n+ * and the netdevice enters the DOWN state. The hardware is still under the\n * driver's control, but the netdev interface is disabled.\n *\n * Returns success only - not allowed to fail\n@@ -3847,14 +3847,14 @@ ice_features_check(struct sk_buff *skb,\n \tsize_t len;\n \n \t/* No point in doing any of this if neither checksum nor GSO are\n-\t * being requested for this frame. We can rule out both by just\n+\t * being requested for this frame. We can rule out both by just\n \t * checking for CHECKSUM_PARTIAL\n \t */\n \tif (skb->ip_summed != CHECKSUM_PARTIAL)\n \t\treturn features;\n \n \t/* We cannot support GSO if the MSS is going to be less than\n-\t * 64 bytes. If it is then we need to drop support for GSO.\n+\t * 64 bytes. If it is then we need to drop support for GSO.\n \t */\n \tif (skb_is_gso(skb) && (skb_shinfo(skb)->gso_size < 64))\n \t\tfeatures &= ~NETIF_F_GSO_MASK;\ndiff --git a/drivers/net/ethernet/intel/ice/ice_sriov.c b/drivers/net/ethernet/intel/ice/ice_sriov.c\nindex 027eba4e13f8..533b989a23e1 100644\n--- a/drivers/net/ethernet/intel/ice/ice_sriov.c\n+++ b/drivers/net/ethernet/intel/ice/ice_sriov.c\n@@ -46,7 +46,7 @@ ice_aq_send_msg_to_vf(struct ice_hw *hw, u16 vfid, u32 v_opcode, u32 v_retval,\n * @link_speed: variable containing the link_speed to be converted\n *\n * Convert link speed supported by HW to link speed supported by virtchnl.\n- * If adv_link_support is true, then return link speed in Mbps. Else return\n+ * If adv_link_support is true, then return link speed in Mbps. Else return\n * link speed as a VIRTCHNL_LINK_SPEED_* casted to a u32. Note that the caller\n * needs to cast back to an enum virtchnl_link_speed in the case where\n * adv_link_support is false, but when adv_link_support is true the caller can\ndiff --git a/drivers/net/ethernet/intel/ice/ice_switch.c b/drivers/net/ethernet/intel/ice/ice_switch.c\nindex af55c74c2378..286a1a7afdc2 100644\n--- a/drivers/net/ethernet/intel/ice/ice_switch.c\n+++ b/drivers/net/ethernet/intel/ice/ice_switch.c\n@@ -129,7 +129,7 @@ enum ice_status ice_init_def_sw_recp(struct ice_hw *hw)\n *\n * NOTE: *req_desc is both an input/output parameter.\n * The caller of this function first calls this function with *request_desc set\n- * to 0. If the response from f/w has *req_desc set to 0, all the switch\n+ * to 0. If the response from f/w has *req_desc set to 0, all the switch\n * configuration information has been returned; if non-zero (meaning not all\n * the information was returned), the caller should call this function again\n * with *req_desc set to the previous value returned by f/w to get the\n@@ -1863,7 +1863,7 @@ ice_add_vlan_internal(struct ice_hw *hw, struct ice_fltr_list_entry *f_entry)\n \t\ttmp_fltr.fwd_id.vsi_list_id = vsi_list_id;\n \t\ttmp_fltr.fltr_act = ICE_FWD_TO_VSI_LIST;\n \t\t/* Update the previous switch rule to a new VSI list which\n-\t\t * includes current VSI thats requested\n+\t\t * includes current VSI that is requested\n \t\t */\n \t\tstatus = ice_update_pkt_fwd_rule(hw, &tmp_fltr);\n \t\tif (status)\ndiff --git a/drivers/net/ethernet/intel/ice/ice_txrx.c b/drivers/net/ethernet/intel/ice/ice_txrx.c\nindex 99954089a7fb..939510b7e8f3 100644\n--- a/drivers/net/ethernet/intel/ice/ice_txrx.c\n+++ b/drivers/net/ethernet/intel/ice/ice_txrx.c\n@@ -377,7 +377,7 @@ static void ice_release_rx_desc(struct ice_ring *rx_ring, u32 val)\n \trx_ring->next_to_alloc = val;\n \n \t/* Force memory writes to complete before letting h/w\n-\t * know there are new descriptors to fetch. (Only\n+\t * know there are new descriptors to fetch. (Only\n \t * applicable for weak-ordered memory model archs,\n \t * such as IA-64).\n \t */\n@@ -686,7 +686,7 @@ static struct sk_buff *ice_fetch_rx_buf(struct ice_ring *rx_ring,\n * ice_pull_tail - ice specific version of skb_pull_tail\n * @skb: pointer to current skb being adjusted\n *\n- * This function is an ice specific version of __pskb_pull_tail. The\n+ * This function is an ice specific version of __pskb_pull_tail. The\n * main difference between this version and the original function is that\n * this function can make several assumptions about the state of things\n * that allow for significant optimizations versus the standard function.\n@@ -768,7 +768,7 @@ static bool ice_test_staterr(union ice_32b_rx_flex_desc *rx_desc,\n * @rx_desc: Rx descriptor for current buffer\n * @skb: Current socket buffer containing buffer in progress\n *\n- * This function updates next to clean. If the buffer is an EOP buffer\n+ * This function updates next to clean. If the buffer is an EOP buffer\n * this function exits returning false, otherwise it will place the\n * sk_buff in the next buffer to be chained and return true indicating\n * that this is in fact a non-EOP buffer.\n@@ -950,7 +950,7 @@ static void ice_receive_skb(struct ice_ring *rx_ring, struct sk_buff *skb,\n * @budget: Total limit on number of packets to process\n *\n * This function provides a \"bounce buffer\" approach to Rx interrupt\n- * processing. The advantage to this is that on systems that have\n+ * processing. The advantage to this is that on systems that have\n * expensive overhead for IOMMU access this provides a means of avoiding\n * it by maintaining the mapping of the page to the system.\n *\n@@ -1553,7 +1553,7 @@ int ice_tso(struct ice_tx_buf *first, struct ice_tx_offload_params *off)\n * Finally, we add one to round up. Because 256 isn't an exact multiple of\n * 3, we'll underestimate near each multiple of 12K. This is actually more\n * accurate as we have 4K - 1 of wiggle room that we can fit into the last\n- * segment. For our purposes this is accurate out to 1M which is orders of\n+ * segment. For our purposes this is accurate out to 1M which is orders of\n * magnitude greater than our largest possible GSO size.\n *\n * This would then be implemented as:\n@@ -1621,7 +1621,7 @@ static bool __ice_chk_linearize(struct sk_buff *skb)\n \tnr_frags -= ICE_MAX_BUF_TXD - 2;\n \tfrag = &skb_shinfo(skb)->frags[0];\n \n-\t/* Initialize size to the negative value of gso_size minus 1. We\n+\t/* Initialize size to the negative value of gso_size minus 1. We\n \t * use this as the worst case scenerio in which the frag ahead\n \t * of us only provides one byte which is why we are limited to 6\n \t * descriptors for a single transmit as the header and previous\ndiff --git a/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c b/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c\nindex 20b94dee0036..05ff4f910649 100644\n--- a/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c\n+++ b/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c\n@@ -156,8 +156,6 @@ static void ice_free_vf_res(struct ice_vf *vf)\n \tclear_bit(ICE_VF_STATE_UC_PROMISC, vf->vf_states);\n }\n \n-/***********************enable_vf routines*****************************/\n-\n /**\n * ice_dis_vf_mappings\n * @vf: pointer to the VF structure\n@@ -454,7 +452,7 @@ static int ice_alloc_vsi_res(struct ice_vf *vf)\n \n \t/* Clear this bit after VF initialization since we shouldn't reclaim\n \t * and reassign interrupts for synchronous or asynchronous VFR events.\n-\t * We don't want to reconfigure interrupts since AVF driver doesn't\n+\t * We dont want to reconfigure interrupts since AVF driver doesn't\n \t * expect vector assignment to be changed unless there is a request for\n \t * more vectors.\n \t */\n@@ -1105,7 +1103,7 @@ int ice_sriov_configure(struct pci_dev *pdev, int num_vfs)\n * ice_process_vflr_event - Free VF resources via IRQ calls\n * @pf: pointer to the PF structure\n *\n- * called from the VLFR IRQ handler to\n+ * called from the VFLR IRQ handler to\n * free up VF resources and state variables\n */\n void ice_process_vflr_event(struct ice_pf *pf)\n@@ -1764,7 +1762,7 @@ static int ice_vc_cfg_qs_msg(struct ice_vf *vf, u8 *msg)\n \t\t/* copy Tx queue info from VF into VSI */\n \t\tvsi->tx_rings[i]->dma = qpi->txq.dma_ring_addr;\n \t\tvsi->tx_rings[i]->count = qpi->txq.ring_len;\n-\t\t/* copy Rx queue info from VF into vsi */\n+\t\t/* copy Rx queue info from VF into VSI */\n \t\tvsi->rx_rings[i]->dma = qpi->rxq.dma_ring_addr;\n \t\tvsi->rx_rings[i]->count = qpi->rxq.ring_len;\n \t\tif (qpi->rxq.databuffer_size > ((16 * 1024) - 128)) {\n@@ -1830,7 +1828,7 @@ static bool ice_can_vf_change_mac(struct ice_vf *vf)\n * @msg: pointer to the msg buffer\n * @set: true if mac filters are being set, false otherwise\n *\n- * add guest mac address filter\n+ * add guest MAC address filter\n */\n static int\n ice_vc_handle_mac_addr_msg(struct ice_vf *vf, u8 *msg, bool set)\n@@ -1968,9 +1966,9 @@ static int ice_vc_del_mac_addr_msg(struct ice_vf *vf, u8 *msg)\n * @msg: pointer to the msg buffer\n *\n * VFs get a default number of queues but can use this message to request a\n- * different number. If the request is successful, PF will reset the VF and\n+ * different number. If the request is successful, PF will reset the VF and\n * return 0. If unsuccessful, PF will send message informing VF of number of\n- * available queue pairs via virtchnl message response to VF.\n+ * available queue pairs via virtchnl message response to vf.\n */\n static int ice_vc_request_qs_msg(struct ice_vf *vf, u8 *msg)\n {\n@@ -1991,7 +1989,7 @@ static int ice_vc_request_qs_msg(struct ice_vf *vf, u8 *msg)\n \ttx_rx_queue_left = min_t(int, pf->q_left_tx, pf->q_left_rx);\n \tif (req_queues <= 0) {\n \t\tdev_err(&pf->pdev->dev,\n-\t\t\t\"VF %d tried to request %d queues. Ignoring.\\n\",\n+\t\t\t\"VF %d tried to request %d queues. Ignoring.\\n\",\n \t\t\tvf->vf_id, req_queues);\n \t} else if (req_queues > ICE_MAX_QS_PER_VF) {\n \t\tdev_err(&pf->pdev->dev,\ndiff --git a/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.h b/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.h\nindex 10131e0180f9..01470a8ee03a 100644\n--- a/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.h\n+++ b/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.h\n@@ -70,7 +70,7 @@ struct ice_vf {\n \tu8 spoofchk;\n \tu16 num_mac;\n \tu16 num_vlan;\n-\tu8 num_req_qs;\t\t/* num of queue pairs requested by VF */\n+\tu8 num_req_qs;\t\t\t/* num of queue pairs requested by VF */\n };\n \n #ifdef CONFIG_PCI_IOV\n", "prefixes": [ "S9", "14/15" ] }