Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1234520/?format=api
{ "id": 1234520, "url": "http://patchwork.ozlabs.org/api/patches/1234520/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20200206092013.23388-15-anthony.l.nguyen@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": "<20200206092013.23388-15-anthony.l.nguyen@intel.com>", "list_archive_url": null, "date": "2020-02-06T09:20:13", "name": "[S37,v3,15/15] ice: Trivial fixes", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "83e01bdc0b7ec5ede68cc2608c6373a214fc31b5", "submitter": { "id": 68875, "url": "http://patchwork.ozlabs.org/api/people/68875/?format=api", "name": "Tony Nguyen", "email": "anthony.l.nguyen@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/20200206092013.23388-15-anthony.l.nguyen@intel.com/mbox/", "series": [ { "id": 157176, "url": "http://patchwork.ozlabs.org/api/series/157176/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=157176", "date": "2020-02-06T09:20:02", "name": "[S37,v3,01/15] ice: Fix DCB rebuild after reset", "version": 3, "mbox": "http://patchwork.ozlabs.org/series/157176/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1234520/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1234520/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; spf=pass (sender SPF authorized)\n\tsmtp.mailfrom=osuosl.org (client-ip=140.211.166.136;\n\thelo=silver.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 silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\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 48D5dK6YrVz9sRR\n\tfor <incoming@patchwork.ozlabs.org>;\n\tFri, 7 Feb 2020 04:53:25 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id 7917D20382;\n\tThu, 6 Feb 2020 17:53:24 +0000 (UTC)", "from silver.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id oNV6Tf9uKFwq; Thu, 6 Feb 2020 17:53:18 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby silver.osuosl.org (Postfix) with ESMTP id D107D220A9;\n\tThu, 6 Feb 2020 17:53:18 +0000 (UTC)", "from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\tby ash.osuosl.org (Postfix) with ESMTP id E768B1BF326\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 6 Feb 2020 17:53:11 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id E079086938\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 6 Feb 2020 17:53:11 +0000 (UTC)", "from whitealder.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id JIj0czK-ls0L for <intel-wired-lan@lists.osuosl.org>;\n\tThu, 6 Feb 2020 17:53:09 +0000 (UTC)", "from mga04.intel.com (mga04.intel.com [192.55.52.120])\n\tby whitealder.osuosl.org (Postfix) with ESMTPS id 377FC869B4\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 6 Feb 2020 17:53:09 +0000 (UTC)", "from fmsmga004.fm.intel.com ([10.253.24.48])\n\tby fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t06 Feb 2020 09:53:08 -0800", "from unknown (HELO localhost.jf.intel.com) ([10.166.244.174])\n\tby fmsmga004.fm.intel.com with ESMTP; 06 Feb 2020 09:53:08 -0800" ], "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.70,410,1574150400\"; d=\"scan'208\";a=\"255160943\"", "From": "Tony Nguyen <anthony.l.nguyen@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Thu, 6 Feb 2020 01:20:13 -0800", "Message-Id": "<20200206092013.23388-15-anthony.l.nguyen@intel.com>", "X-Mailer": "git-send-email 2.20.1", "In-Reply-To": "<20200206092013.23388-1-anthony.l.nguyen@intel.com>", "References": "<20200206092013.23388-1-anthony.l.nguyen@intel.com>", "MIME-Version": "1.0", "Subject": "[Intel-wired-lan] [PATCH S37 v3 15/15] ice: Trivial fixes", "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>", "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": "This is a collection of trivial fixes including fixing whitespace, typos,\nfunction headers, reverse Christmas tree, etc.\n\nSigned-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>\n---\nv2:\n- Another whitespace fix\n---\n drivers/net/ethernet/intel/ice/ice_adminq_cmd.h | 1 +\n drivers/net/ethernet/intel/ice/ice_common.c | 4 ++--\n drivers/net/ethernet/intel/ice/ice_dcb.c | 8 ++++----\n drivers/net/ethernet/intel/ice/ice_dcb_lib.c | 4 ++--\n drivers/net/ethernet/intel/ice/ice_ethtool.c | 14 +++++++-------\n drivers/net/ethernet/intel/ice/ice_lib.c | 7 ++++---\n drivers/net/ethernet/intel/ice/ice_main.c | 4 +++-\n drivers/net/ethernet/intel/ice/ice_txrx.c | 9 ++++-----\n drivers/net/ethernet/intel/ice/ice_txrx.h | 4 ++--\n drivers/net/ethernet/intel/ice/ice_type.h | 2 +-\n drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c | 3 +--\n 11 files changed, 31 insertions(+), 29 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/ice/ice_adminq_cmd.h b/drivers/net/ethernet/intel/ice/ice_adminq_cmd.h\nindex 2722789fa703..210113eade20 100644\n--- a/drivers/net/ethernet/intel/ice/ice_adminq_cmd.h\n+++ b/drivers/net/ethernet/intel/ice/ice_adminq_cmd.h\n@@ -1691,6 +1691,7 @@ struct ice_aqc_get_pkg_info_resp {\n \t__le32 count;\n \tstruct ice_aqc_get_pkg_info pkg_info[1];\n };\n+\n /**\n * struct ice_aq_desc - Admin Queue (AQ) descriptor\n * @flags: ICE_AQ_FLAG_* flags\ndiff --git a/drivers/net/ethernet/intel/ice/ice_common.c b/drivers/net/ethernet/intel/ice/ice_common.c\nindex 8931c6a3e3f6..e7e528631757 100644\n--- a/drivers/net/ethernet/intel/ice/ice_common.c\n+++ b/drivers/net/ethernet/intel/ice/ice_common.c\n@@ -588,10 +588,10 @@ void ice_output_fw_log(struct ice_hw *hw, struct ice_aq_desc *desc, void *buf)\n }\n \n /**\n- * ice_get_itr_intrl_gran - determine int/intrl granularity\n+ * ice_get_itr_intrl_gran\n * @hw: pointer to the HW struct\n *\n- * Determines the ITR/intrl granularities based on the maximum aggregate\n+ * Determines the ITR/INTRL granularities based on the maximum aggregate\n * bandwidth according to the device's configuration during power-on.\n */\n static void ice_get_itr_intrl_gran(struct ice_hw *hw)\ndiff --git a/drivers/net/ethernet/intel/ice/ice_dcb.c b/drivers/net/ethernet/intel/ice/ice_dcb.c\nindex 713e8a892e14..adb8dab765c8 100644\n--- a/drivers/net/ethernet/intel/ice/ice_dcb.c\n+++ b/drivers/net/ethernet/intel/ice/ice_dcb.c\n@@ -1323,13 +1323,13 @@ enum ice_status ice_set_dcb_cfg(struct ice_port_info *pi)\n }\n \n /**\n- * ice_aq_query_port_ets - query port ets configuration\n+ * ice_aq_query_port_ets - query port ETS configuration\n * @pi: port information structure\n * @buf: pointer to buffer\n * @buf_size: buffer size in bytes\n * @cd: pointer to command details structure or NULL\n *\n- * query current port ets configuration\n+ * query current port ETS configuration\n */\n static enum ice_status\n ice_aq_query_port_ets(struct ice_port_info *pi,\n@@ -1416,13 +1416,13 @@ ice_update_port_tc_tree_cfg(struct ice_port_info *pi,\n }\n \n /**\n- * ice_query_port_ets - query port ets configuration\n+ * ice_query_port_ets - query port ETS configuration\n * @pi: port information structure\n * @buf: pointer to buffer\n * @buf_size: buffer size in bytes\n * @cd: pointer to command details structure or NULL\n *\n- * query current port ets configuration and update the\n+ * query current port ETS configuration and update the\n * SW DB with the TC changes\n */\n enum ice_status\ndiff --git a/drivers/net/ethernet/intel/ice/ice_dcb_lib.c b/drivers/net/ethernet/intel/ice/ice_dcb_lib.c\nindex b76bbd560c9c..017b71d8e894 100644\n--- a/drivers/net/ethernet/intel/ice/ice_dcb_lib.c\n+++ b/drivers/net/ethernet/intel/ice/ice_dcb_lib.c\n@@ -436,9 +436,9 @@ static int ice_dcb_init_cfg(struct ice_pf *pf, bool locked)\n }\n \n /**\n- * ice_dcb_sw_default_config - Apply a default DCB config\n+ * ice_dcb_sw_dflt_cfg - Apply a default DCB config\n * @pf: PF to apply config to\n- * @ets_willing: configure ets willing\n+ * @ets_willing: configure ETS willing\n * @locked: was this function called with RTNL held\n */\n static int ice_dcb_sw_dflt_cfg(struct ice_pf *pf, bool ets_willing, bool locked)\ndiff --git a/drivers/net/ethernet/intel/ice/ice_ethtool.c b/drivers/net/ethernet/intel/ice/ice_ethtool.c\nindex 4b29d1ae56a7..b002ab4e5838 100644\n--- a/drivers/net/ethernet/intel/ice/ice_ethtool.c\n+++ b/drivers/net/ethernet/intel/ice/ice_ethtool.c\n@@ -3800,11 +3800,11 @@ ice_get_module_eeprom(struct net_device *netdev,\n static const struct ethtool_ops ice_ethtool_ops = {\n \t.get_link_ksettings\t= ice_get_link_ksettings,\n \t.set_link_ksettings\t= ice_set_link_ksettings,\n-\t.get_drvinfo = ice_get_drvinfo,\n-\t.get_regs_len = ice_get_regs_len,\n-\t.get_regs = ice_get_regs,\n-\t.get_msglevel = ice_get_msglevel,\n-\t.set_msglevel = ice_set_msglevel,\n+\t.get_drvinfo\t\t= ice_get_drvinfo,\n+\t.get_regs_len\t\t= ice_get_regs_len,\n+\t.get_regs\t\t= ice_get_regs,\n+\t.get_msglevel\t\t= ice_get_msglevel,\n+\t.set_msglevel\t\t= ice_set_msglevel,\n \t.self_test\t\t= ice_self_test,\n \t.get_link\t\t= ethtool_op_get_link,\n \t.get_eeprom_len\t\t= ice_get_eeprom_len,\n@@ -3831,8 +3831,8 @@ static const struct ethtool_ops ice_ethtool_ops = {\n \t.get_channels\t\t= ice_get_channels,\n \t.set_channels\t\t= ice_set_channels,\n \t.get_ts_info\t\t= ethtool_op_get_ts_info,\n-\t.get_per_queue_coalesce = ice_get_per_q_coalesce,\n-\t.set_per_queue_coalesce = ice_set_per_q_coalesce,\n+\t.get_per_queue_coalesce\t= ice_get_per_q_coalesce,\n+\t.set_per_queue_coalesce\t= ice_set_per_q_coalesce,\n \t.get_fecparam\t\t= ice_get_fecparam,\n \t.set_fecparam\t\t= ice_set_fecparam,\n \t.get_module_info\t= ice_get_module_info,\ndiff --git a/drivers/net/ethernet/intel/ice/ice_lib.c b/drivers/net/ethernet/intel/ice/ice_lib.c\nindex 7d546c75dcc6..3c9353d7b0ed 100644\n--- a/drivers/net/ethernet/intel/ice/ice_lib.c\n+++ b/drivers/net/ethernet/intel/ice/ice_lib.c\n@@ -1241,8 +1241,9 @@ static void ice_vsi_set_rss_flow_fld(struct ice_vsi *vsi)\n *\n * Returns 0 on success or ENOMEM on failure.\n */\n-int ice_add_mac_to_list(struct ice_vsi *vsi, struct list_head *add_list,\n-\t\t\tconst u8 *macaddr)\n+int\n+ice_add_mac_to_list(struct ice_vsi *vsi, struct list_head *add_list,\n+\t\t const u8 *macaddr)\n {\n \tstruct ice_fltr_list_entry *tmp;\n \tstruct ice_pf *pf = vsi->back;\n@@ -2874,8 +2875,8 @@ static void ice_vsi_update_q_map(struct ice_vsi *vsi, struct ice_vsi_ctx *ctx)\n int ice_vsi_cfg_tc(struct ice_vsi *vsi, u8 ena_tc)\n {\n \tu16 max_txqs[ICE_MAX_TRAFFIC_CLASS] = { 0 };\n-\tstruct ice_vsi_ctx *ctx;\n \tstruct ice_pf *pf = vsi->back;\n+\tstruct ice_vsi_ctx *ctx;\n \tenum ice_status status;\n \tstruct device *dev;\n \tint i, ret = 0;\ndiff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c\nindex 2297a5a5c572..1bf6d21c38e4 100644\n--- a/drivers/net/ethernet/intel/ice/ice_main.c\n+++ b/drivers/net/ethernet/intel/ice/ice_main.c\n@@ -3179,7 +3179,9 @@ ice_probe(struct pci_dev *pdev, const struct pci_device_id __always_unused *ent)\n \tstruct ice_hw *hw;\n \tint err;\n \n-\t/* this driver uses devres, see Documentation/driver-api/driver-model/devres.rst */\n+\t/* this driver uses devres, see\n+\t * Documentation/driver-api/driver-model/devres.rst\n+\t */\n \terr = pcim_enable_device(pdev);\n \tif (err)\n \t\treturn err;\ndiff --git a/drivers/net/ethernet/intel/ice/ice_txrx.c b/drivers/net/ethernet/intel/ice/ice_txrx.c\nindex 1d4755acca3d..4de61dbedd36 100644\n--- a/drivers/net/ethernet/intel/ice/ice_txrx.c\n+++ b/drivers/net/ethernet/intel/ice/ice_txrx.c\n@@ -644,7 +644,7 @@ static bool ice_page_is_reserved(struct page *page)\n * Update the offset within page so that Rx buf will be ready to be reused.\n * For systems with PAGE_SIZE < 8192 this function will flip the page offset\n * so the second half of page assigned to Rx buffer will be used, otherwise\n- * the offset is moved by the @size bytes\n+ * the offset is moved by \"size\" bytes\n */\n static void\n ice_rx_buf_adjust_pg_offset(struct ice_rx_buf *rx_buf, unsigned int size)\n@@ -1619,11 +1619,11 @@ ice_tx_map(struct ice_ring *tx_ring, struct ice_tx_buf *first,\n {\n \tu64 td_offset, td_tag, td_cmd;\n \tu16 i = tx_ring->next_to_use;\n-\tskb_frag_t *frag;\n \tunsigned int data_len, size;\n \tstruct ice_tx_desc *tx_desc;\n \tstruct ice_tx_buf *tx_buf;\n \tstruct sk_buff *skb;\n+\tskb_frag_t *frag;\n \tdma_addr_t dma;\n \n \ttd_tag = off->td_l2tag1;\n@@ -1736,9 +1736,8 @@ ice_tx_map(struct ice_ring *tx_ring, struct ice_tx_buf *first,\n \tice_maybe_stop_tx(tx_ring, DESC_NEEDED);\n \n \t/* notify HW of packet */\n-\tif (netif_xmit_stopped(txring_txq(tx_ring)) || !netdev_xmit_more()) {\n+\tif (netif_xmit_stopped(txring_txq(tx_ring)) || !netdev_xmit_more())\n \t\twritel(i, tx_ring->tail);\n-\t}\n \n \treturn;\n \n@@ -2076,7 +2075,7 @@ static bool __ice_chk_linearize(struct sk_buff *skb)\n \tfrag = &skb_shinfo(skb)->frags[0];\n \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 * use this as the worst case scenario 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\n \t * fragment are already consuming 2 descriptors.\ndiff --git a/drivers/net/ethernet/intel/ice/ice_txrx.h b/drivers/net/ethernet/intel/ice/ice_txrx.h\nindex a86270696df1..14a1bf445889 100644\n--- a/drivers/net/ethernet/intel/ice/ice_txrx.h\n+++ b/drivers/net/ethernet/intel/ice/ice_txrx.h\n@@ -33,8 +33,8 @@\n * frame.\n *\n * Note: For cache line sizes 256 or larger this value is going to end\n- * up negative. In these cases we should fall back to the legacy\n- * receive path.\n+ *\t up negative. In these cases we should fall back to the legacy\n+ *\t receive path.\n */\n #if (PAGE_SIZE < 8192)\n #define ICE_2K_TOO_SMALL_WITH_PADDING \\\ndiff --git a/drivers/net/ethernet/intel/ice/ice_type.h b/drivers/net/ethernet/intel/ice/ice_type.h\nindex 5224b066730a..bf67f6df5333 100644\n--- a/drivers/net/ethernet/intel/ice/ice_type.h\n+++ b/drivers/net/ethernet/intel/ice/ice_type.h\n@@ -521,7 +521,7 @@ struct ice_hw {\n \tstruct ice_fw_log_cfg fw_log;\n \n /* Device max aggregate bandwidths corresponding to the GL_PWR_MODE_CTL\n- * register. Used for determining the ITR/intrl granularity during\n+ * register. Used for determining the ITR/INTRL granularity during\n * initialization.\n */\n #define ICE_MAX_AGG_BW_200G\t0x0\ndiff --git a/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c b/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c\nindex 6d78bcdd162d..1874bfa65796 100644\n--- a/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c\n+++ b/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c\n@@ -1093,7 +1093,6 @@ bool ice_reset_all_vfs(struct ice_pf *pf, bool is_vflr)\n \t * finished resetting.\n \t */\n \tfor (i = 0, v = 0; i < 10 && v < pf->num_alloc_vfs; i++) {\n-\n \t\t/* Check each VF in sequence */\n \t\twhile (v < pf->num_alloc_vfs) {\n \t\t\tu32 reg;\n@@ -2612,8 +2611,8 @@ static int ice_vc_request_qs_msg(struct ice_vf *vf, u8 *msg)\n \tstruct ice_pf *pf = vf->pf;\n \tu16 max_allowed_vf_queues;\n \tu16 tx_rx_queue_left;\n-\tu16 cur_queues;\n \tstruct device *dev;\n+\tu16 cur_queues;\n \n \tdev = ice_pf_to_dev(pf);\n \tif (!test_bit(ICE_VF_STATE_ACTIVE, vf->vf_states)) {\n", "prefixes": [ "S37", "v3", "15/15" ] }