Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/854004/?format=api
{ "id": 854004, "url": "http://patchwork.ozlabs.org/api/patches/854004/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20171229134928.14308-1-alice.michael@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": "<20171229134928.14308-1-alice.michael@intel.com>", "list_archive_url": null, "date": "2017-12-29T13:49:28", "name": "[next,S85-V1,04/14] i40e/i40evf: Only track one itr setting per ring instead of Tx/Rx", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "3ec830871ee73b02207119d8a4c6e8a8c651f3f8", "submitter": { "id": 71123, "url": "http://patchwork.ozlabs.org/api/people/71123/?format=api", "name": "Michael, Alice", "email": "alice.michael@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/20171229134928.14308-1-alice.michael@intel.com/mbox/", "series": [ { "id": 20665, "url": "http://patchwork.ozlabs.org/api/series/20665/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=20665", "date": "2017-12-29T13:48:33", "name": "[next,S85-V1,01/14] i40e: fix typo in function description", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/20665/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/854004/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/854004/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.136; helo=silver.osuosl.org;\n\tenvelope-from=intel-wired-lan-bounces@osuosl.org;\n\treceiver=<UNKNOWN>)", "Received": [ "from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3z7gQl6GFVz9s7G\n\tfor <incoming@patchwork.ozlabs.org>;\n\tSat, 30 Dec 2017 08:56:31 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id 2ECED294A2;\n\tFri, 29 Dec 2017 21:56:30 +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 gaAjBEmj1aHr; Fri, 29 Dec 2017 21:56:27 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby silver.osuosl.org (Postfix) with ESMTP id C8250292AA;\n\tFri, 29 Dec 2017 21:56:27 +0000 (UTC)", "from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\n\tby ash.osuosl.org (Postfix) with ESMTP id 61A241C0180\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 29 Dec 2017 21:56:26 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 5E99F86C67\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 29 Dec 2017 21:56:26 +0000 (UTC)", "from fraxinus.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id ihObpgJEF0pi for <intel-wired-lan@lists.osuosl.org>;\n\tFri, 29 Dec 2017 21:56:25 +0000 (UTC)", "from mga05.intel.com (mga05.intel.com [192.55.52.43])\n\tby fraxinus.osuosl.org (Postfix) with ESMTPS id 47BC186C61\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 29 Dec 2017 21:56:25 +0000 (UTC)", "from orsmga001.jf.intel.com ([10.7.209.18])\n\tby fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t29 Dec 2017 13:56:24 -0800", "from alicemic-2.jf.intel.com ([10.166.16.121])\n\tby orsmga001.jf.intel.com with ESMTP; 29 Dec 2017 13:56:24 -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.45,478,1508828400\"; d=\"scan'208\";a=\"19860330\"", "From": "Alice Michael <alice.michael@intel.com>", "To": "alice.michael@intel.com,\n\tintel-wired-lan@lists.osuosl.org", "Date": "Fri, 29 Dec 2017 08:49:28 -0500", "Message-Id": "<20171229134928.14308-1-alice.michael@intel.com>", "X-Mailer": "git-send-email 2.9.5", "Subject": "[Intel-wired-lan] [next PATCH S85-V1 04/14] i40e/i40evf: Only track\n\tone itr setting per ring instead of Tx/Rx", "X-BeenThere": "intel-wired-lan@osuosl.org", "X-Mailman-Version": "2.1.24", "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": "From: Alexander Duyck <alexander.h.duyck@intel.com>\n\nThe rings are already split out into Tx and Rx rings so it does't make\nsense to have any single ring store both a Tx and Rx itr_setting value.\nSince that is the case drop the pair in favor of storing just a single ITR\nvalue.\n\nSigned-off-by: Alexander Duyck <alexander.h.duyck@intel.com>\n---\n drivers/net/ethernet/intel/i40e/i40e_debugfs.c | 12 ++++----\n drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 32 +++++++++++-----------\n drivers/net/ethernet/intel/i40e/i40e_main.c | 14 +++++-----\n drivers/net/ethernet/intel/i40e/i40e_txrx.c | 6 ++--\n drivers/net/ethernet/intel/i40e/i40e_txrx.h | 3 +-\n drivers/net/ethernet/intel/i40evf/i40e_txrx.c | 6 ++--\n drivers/net/ethernet/intel/i40evf/i40e_txrx.h | 3 +-\n drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c | 24 ++++++++--------\n drivers/net/ethernet/intel/i40evf/i40evf_main.c | 8 +++---\n 9 files changed, 53 insertions(+), 55 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/i40e/i40e_debugfs.c b/drivers/net/ethernet/intel/i40e/i40e_debugfs.c\nindex 4c3b424..e9fc51b 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_debugfs.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_debugfs.c\n@@ -315,9 +315,9 @@ static void i40e_dbg_dump_vsi_seid(struct i40e_pf *pf, int seid)\n \t\t\t i, rx_ring->vsi,\n \t\t\t rx_ring->q_vector);\n \t\tdev_info(&pf->pdev->dev,\n-\t\t\t \" rx_rings[%i]: rx_itr_setting = %d (%s)\\n\",\n-\t\t\t i, rx_ring->rx_itr_setting,\n-\t\t\t ITR_IS_DYNAMIC(rx_ring->rx_itr_setting) ? \"dynamic\" : \"fixed\");\n+\t\t\t \" rx_rings[%i]: itr_setting = %d (%s)\\n\",\n+\t\t\t i, rx_ring->itr_setting,\n+\t\t\t ITR_IS_DYNAMIC(rx_ring->itr_setting) ? \"dynamic\" : \"fixed\");\n \t}\n \tfor (i = 0; i < vsi->num_queue_pairs; i++) {\n \t\tstruct i40e_ring *tx_ring = READ_ONCE(vsi->tx_rings[i]);\n@@ -366,9 +366,9 @@ static void i40e_dbg_dump_vsi_seid(struct i40e_pf *pf, int seid)\n \t\t\t \" tx_rings[%i]: DCB tc = %d\\n\",\n \t\t\t i, tx_ring->dcb_tc);\n \t\tdev_info(&pf->pdev->dev,\n-\t\t\t \" tx_rings[%i]: tx_itr_setting = %d (%s)\\n\",\n-\t\t\t i, tx_ring->tx_itr_setting,\n-\t\t\t ITR_IS_DYNAMIC(tx_ring->tx_itr_setting) ? \"dynamic\" : \"fixed\");\n+\t\t\t \" tx_rings[%i]: itr_setting = %d (%s)\\n\",\n+\t\t\t i, tx_ring->itr_setting,\n+\t\t\t ITR_IS_DYNAMIC(tx_ring->itr_setting) ? \"dynamic\" : \"fixed\");\n \t}\n \trcu_read_unlock();\n \tdev_info(&pf->pdev->dev,\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c\nindex 8236689..f829a7a 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c\n@@ -2244,14 +2244,14 @@ static int __i40e_get_coalesce(struct net_device *netdev,\n \trx_ring = vsi->rx_rings[queue];\n \ttx_ring = vsi->tx_rings[queue];\n \n-\tif (ITR_IS_DYNAMIC(rx_ring->rx_itr_setting))\n+\tif (ITR_IS_DYNAMIC(rx_ring->itr_setting))\n \t\tec->use_adaptive_rx_coalesce = 1;\n \n-\tif (ITR_IS_DYNAMIC(tx_ring->tx_itr_setting))\n+\tif (ITR_IS_DYNAMIC(tx_ring->itr_setting))\n \t\tec->use_adaptive_tx_coalesce = 1;\n \n-\tec->rx_coalesce_usecs = rx_ring->rx_itr_setting & ~I40E_ITR_DYNAMIC;\n-\tec->tx_coalesce_usecs = tx_ring->tx_itr_setting & ~I40E_ITR_DYNAMIC;\n+\tec->rx_coalesce_usecs = rx_ring->itr_setting & ~I40E_ITR_DYNAMIC;\n+\tec->tx_coalesce_usecs = tx_ring->itr_setting & ~I40E_ITR_DYNAMIC;\n \n \t/* we use the _usecs_high to store/set the interrupt rate limit\n \t * that the hardware supports, that almost but not quite\n@@ -2315,26 +2315,26 @@ static void i40e_set_itr_per_queue(struct i40e_vsi *vsi,\n \n \tintrl = i40e_intrl_usec_to_reg(vsi->int_rate_limit);\n \n-\trx_ring->rx_itr_setting = ec->rx_coalesce_usecs;\n-\ttx_ring->tx_itr_setting = ec->tx_coalesce_usecs;\n+\trx_ring->itr_setting = ec->rx_coalesce_usecs;\n+\ttx_ring->itr_setting = ec->tx_coalesce_usecs;\n \n \tif (ec->use_adaptive_rx_coalesce)\n-\t\trx_ring->rx_itr_setting |= I40E_ITR_DYNAMIC;\n+\t\trx_ring->itr_setting |= I40E_ITR_DYNAMIC;\n \telse\n-\t\trx_ring->rx_itr_setting &= ~I40E_ITR_DYNAMIC;\n+\t\trx_ring->itr_setting &= ~I40E_ITR_DYNAMIC;\n \n \tif (ec->use_adaptive_tx_coalesce)\n-\t\ttx_ring->tx_itr_setting |= I40E_ITR_DYNAMIC;\n+\t\ttx_ring->itr_setting |= I40E_ITR_DYNAMIC;\n \telse\n-\t\ttx_ring->tx_itr_setting &= ~I40E_ITR_DYNAMIC;\n+\t\ttx_ring->itr_setting &= ~I40E_ITR_DYNAMIC;\n \n \tq_vector = rx_ring->q_vector;\n-\tq_vector->rx.itr = ITR_TO_REG(rx_ring->rx_itr_setting);\n+\tq_vector->rx.itr = ITR_TO_REG(rx_ring->itr_setting);\n \tvector = vsi->base_vector + q_vector->v_idx;\n \twr32(hw, I40E_PFINT_ITRN(I40E_RX_ITR, vector - 1), q_vector->rx.itr);\n \n \tq_vector = tx_ring->q_vector;\n-\tq_vector->tx.itr = ITR_TO_REG(tx_ring->tx_itr_setting);\n+\tq_vector->tx.itr = ITR_TO_REG(tx_ring->itr_setting);\n \tvector = vsi->base_vector + q_vector->v_idx;\n \twr32(hw, I40E_PFINT_ITRN(I40E_TX_ITR, vector - 1), q_vector->tx.itr);\n \n@@ -2364,11 +2364,11 @@ static int __i40e_set_coalesce(struct net_device *netdev,\n \t\tvsi->work_limit = ec->tx_max_coalesced_frames_irq;\n \n \tif (queue < 0) {\n-\t\tcur_rx_itr = vsi->rx_rings[0]->rx_itr_setting;\n-\t\tcur_tx_itr = vsi->tx_rings[0]->tx_itr_setting;\n+\t\tcur_rx_itr = vsi->rx_rings[0]->itr_setting;\n+\t\tcur_tx_itr = vsi->tx_rings[0]->itr_setting;\n \t} else if (queue < vsi->num_queue_pairs) {\n-\t\tcur_rx_itr = vsi->rx_rings[queue]->rx_itr_setting;\n-\t\tcur_tx_itr = vsi->tx_rings[queue]->tx_itr_setting;\n+\t\tcur_rx_itr = vsi->rx_rings[queue]->itr_setting;\n+\t\tcur_tx_itr = vsi->tx_rings[queue]->itr_setting;\n \t} else {\n \t\tnetif_info(pf, drv, netdev, \"Invalid queue value, queue range is 0 - %d\\n\",\n \t\t\t vsi->num_queue_pairs - 1);\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c\nindex ea8be7c..fdf0bfb 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_main.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c\n@@ -3434,11 +3434,11 @@ static void i40e_vsi_configure_msix(struct i40e_vsi *vsi)\n \t\tstruct i40e_q_vector *q_vector = vsi->q_vectors[i];\n \n \t\tq_vector->itr_countdown = ITR_COUNTDOWN_START;\n-\t\tq_vector->rx.itr = ITR_TO_REG(vsi->rx_rings[i]->rx_itr_setting);\n+\t\tq_vector->rx.itr = ITR_TO_REG(vsi->rx_rings[i]->itr_setting);\n \t\tq_vector->rx.latency_range = I40E_LOW_LATENCY;\n \t\twr32(hw, I40E_PFINT_ITRN(I40E_RX_ITR, vector - 1),\n \t\t q_vector->rx.itr);\n-\t\tq_vector->tx.itr = ITR_TO_REG(vsi->tx_rings[i]->tx_itr_setting);\n+\t\tq_vector->tx.itr = ITR_TO_REG(vsi->tx_rings[i]->itr_setting);\n \t\tq_vector->tx.latency_range = I40E_LOW_LATENCY;\n \t\twr32(hw, I40E_PFINT_ITRN(I40E_TX_ITR, vector - 1),\n \t\t q_vector->tx.itr);\n@@ -3543,10 +3543,10 @@ static void i40e_configure_msi_and_legacy(struct i40e_vsi *vsi)\n \n \t/* set the ITR configuration */\n \tq_vector->itr_countdown = ITR_COUNTDOWN_START;\n-\tq_vector->rx.itr = ITR_TO_REG(vsi->rx_rings[0]->rx_itr_setting);\n+\tq_vector->rx.itr = ITR_TO_REG(vsi->rx_rings[0]->itr_setting);\n \tq_vector->rx.latency_range = I40E_LOW_LATENCY;\n \twr32(hw, I40E_PFINT_ITR0(I40E_RX_ITR), q_vector->rx.itr);\n-\tq_vector->tx.itr = ITR_TO_REG(vsi->tx_rings[0]->tx_itr_setting);\n+\tq_vector->tx.itr = ITR_TO_REG(vsi->tx_rings[0]->itr_setting);\n \tq_vector->tx.latency_range = I40E_LOW_LATENCY;\n \twr32(hw, I40E_PFINT_ITR0(I40E_TX_ITR), q_vector->tx.itr);\n \n@@ -10062,7 +10062,7 @@ static int i40e_alloc_rings(struct i40e_vsi *vsi)\n \t\tring->dcb_tc = 0;\n \t\tif (vsi->back->hw_features & I40E_HW_WB_ON_ITR_CAPABLE)\n \t\t\tring->flags = I40E_TXR_FLAGS_WB_ON_ITR;\n-\t\tring->tx_itr_setting = pf->tx_itr_default;\n+\t\tring->itr_setting = pf->tx_itr_default;\n \t\tvsi->tx_rings[i] = ring++;\n \n \t\tif (!i40e_enabled_xdp_vsi(vsi))\n@@ -10080,7 +10080,7 @@ static int i40e_alloc_rings(struct i40e_vsi *vsi)\n \t\tif (vsi->back->hw_features & I40E_HW_WB_ON_ITR_CAPABLE)\n \t\t\tring->flags = I40E_TXR_FLAGS_WB_ON_ITR;\n \t\tset_ring_xdp(ring);\n-\t\tring->tx_itr_setting = pf->tx_itr_default;\n+\t\tring->itr_setting = pf->tx_itr_default;\n \t\tvsi->xdp_rings[i] = ring++;\n \n setup_rx:\n@@ -10093,7 +10093,7 @@ static int i40e_alloc_rings(struct i40e_vsi *vsi)\n \t\tring->count = vsi->num_desc;\n \t\tring->size = 0;\n \t\tring->dcb_tc = 0;\n-\t\tring->rx_itr_setting = pf->rx_itr_default;\n+\t\tring->itr_setting = pf->rx_itr_default;\n \t\tvsi->rx_rings[i] = ring;\n \t}\n \ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_txrx.c b/drivers/net/ethernet/intel/i40e/i40e_txrx.c\nindex 97c2482..44d360e 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_txrx.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_txrx.c\n@@ -2276,12 +2276,12 @@ static u32 i40e_buildreg_itr(const int type, const u16 itr)\n #define INTREG I40E_PFINT_DYN_CTLN\n static inline int get_rx_itr(struct i40e_vsi *vsi, int idx)\n {\n-\treturn vsi->rx_rings[idx]->rx_itr_setting;\n+\treturn vsi->rx_rings[idx]->itr_setting;\n }\n \n static inline int get_tx_itr(struct i40e_vsi *vsi, int idx)\n {\n-\treturn vsi->tx_rings[idx]->tx_itr_setting;\n+\treturn vsi->tx_rings[idx]->itr_setting;\n }\n \n /**\n@@ -2308,7 +2308,7 @@ static inline void i40e_update_enable_itr(struct i40e_vsi *vsi,\n \t/* avoid dynamic calculation if in countdown mode OR if\n \t * all dynamic is disabled\n \t */\n-\trxval = txval = i40e_buildreg_itr(I40E_ITR_NONE, 0);\n+\ttxval = i40e_buildreg_itr(I40E_ITR_NONE, 0);\n \n \trx_itr_setting = get_rx_itr(vsi, idx);\n \ttx_itr_setting = get_tx_itr(vsi, idx);\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_txrx.h b/drivers/net/ethernet/intel/i40e/i40e_txrx.h\nindex f1c13be..61eee3d 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_txrx.h\n+++ b/drivers/net/ethernet/intel/i40e/i40e_txrx.h\n@@ -380,8 +380,7 @@ struct i40e_ring {\n \t * these values always store the USER setting, and must be converted\n \t * before programming to a register.\n \t */\n-\tu16 rx_itr_setting;\n-\tu16 tx_itr_setting;\n+\tu16 itr_setting;\n \n \tu16 count;\t\t\t/* Number of descriptors */\n \tu16 reg_idx;\t\t\t/* HW register index of the ring */\ndiff --git a/drivers/net/ethernet/intel/i40evf/i40e_txrx.c b/drivers/net/ethernet/intel/i40evf/i40e_txrx.c\nindex 464200f..291130a 100644\n--- a/drivers/net/ethernet/intel/i40evf/i40e_txrx.c\n+++ b/drivers/net/ethernet/intel/i40evf/i40e_txrx.c\n@@ -1475,14 +1475,14 @@ static inline int get_rx_itr(struct i40e_vsi *vsi, int idx)\n {\n \tstruct i40evf_adapter *adapter = vsi->back;\n \n-\treturn adapter->rx_rings[idx].rx_itr_setting;\n+\treturn adapter->rx_rings[idx].itr_setting;\n }\n \n static inline int get_tx_itr(struct i40e_vsi *vsi, int idx)\n {\n \tstruct i40evf_adapter *adapter = vsi->back;\n \n-\treturn adapter->tx_rings[idx].tx_itr_setting;\n+\treturn adapter->tx_rings[idx].itr_setting;\n }\n \n /**\n@@ -1503,7 +1503,7 @@ static inline void i40e_update_enable_itr(struct i40e_vsi *vsi,\n \t/* avoid dynamic calculation if in countdown mode OR if\n \t * all dynamic is disabled\n \t */\n-\trxval = txval = i40e_buildreg_itr(I40E_ITR_NONE, 0);\n+\ttxval = i40e_buildreg_itr(I40E_ITR_NONE, 0);\n \n \trx_itr_setting = get_rx_itr(vsi, idx);\n \ttx_itr_setting = get_tx_itr(vsi, idx);\ndiff --git a/drivers/net/ethernet/intel/i40evf/i40e_txrx.h b/drivers/net/ethernet/intel/i40evf/i40e_txrx.h\nindex e72f16b..81210c3 100644\n--- a/drivers/net/ethernet/intel/i40evf/i40e_txrx.h\n+++ b/drivers/net/ethernet/intel/i40evf/i40e_txrx.h\n@@ -362,8 +362,7 @@ struct i40e_ring {\n \t * these values always store the USER setting, and must be converted\n \t * before programming to a register.\n \t */\n-\tu16 rx_itr_setting;\n-\tu16 tx_itr_setting;\n+\tu16 itr_setting;\n \n \tu16 count;\t\t\t/* Number of descriptors */\n \tu16 reg_idx;\t\t\t/* HW register index of the ring */\ndiff --git a/drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c b/drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c\nindex e2d8aa1..11dfdc8 100644\n--- a/drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c\n+++ b/drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c\n@@ -457,14 +457,14 @@ static int __i40evf_get_coalesce(struct net_device *netdev,\n \trx_ring = &adapter->rx_rings[queue];\n \ttx_ring = &adapter->tx_rings[queue];\n \n-\tif (ITR_IS_DYNAMIC(rx_ring->rx_itr_setting))\n+\tif (ITR_IS_DYNAMIC(rx_ring->itr_setting))\n \t\tec->use_adaptive_rx_coalesce = 1;\n \n-\tif (ITR_IS_DYNAMIC(tx_ring->tx_itr_setting))\n+\tif (ITR_IS_DYNAMIC(tx_ring->itr_setting))\n \t\tec->use_adaptive_tx_coalesce = 1;\n \n-\tec->rx_coalesce_usecs = rx_ring->rx_itr_setting & ~I40E_ITR_DYNAMIC;\n-\tec->tx_coalesce_usecs = tx_ring->tx_itr_setting & ~I40E_ITR_DYNAMIC;\n+\tec->rx_coalesce_usecs = rx_ring->itr_setting & ~I40E_ITR_DYNAMIC;\n+\tec->tx_coalesce_usecs = tx_ring->itr_setting & ~I40E_ITR_DYNAMIC;\n \n \treturn 0;\n }\n@@ -519,24 +519,24 @@ static void i40evf_set_itr_per_queue(struct i40evf_adapter *adapter,\n \tstruct i40e_q_vector *q_vector;\n \tu16 vector;\n \n-\trx_ring->rx_itr_setting = ec->rx_coalesce_usecs;\n-\ttx_ring->tx_itr_setting = ec->tx_coalesce_usecs;\n+\trx_ring->itr_setting = ec->rx_coalesce_usecs;\n+\ttx_ring->itr_setting = ec->tx_coalesce_usecs;\n \n-\trx_ring->rx_itr_setting |= I40E_ITR_DYNAMIC;\n+\trx_ring->itr_setting |= I40E_ITR_DYNAMIC;\n \tif (!ec->use_adaptive_rx_coalesce)\n-\t\trx_ring->rx_itr_setting ^= I40E_ITR_DYNAMIC;\n+\t\trx_ring->itr_setting ^= I40E_ITR_DYNAMIC;\n \n-\ttx_ring->tx_itr_setting |= I40E_ITR_DYNAMIC;\n+\ttx_ring->itr_setting |= I40E_ITR_DYNAMIC;\n \tif (!ec->use_adaptive_tx_coalesce)\n-\t\ttx_ring->tx_itr_setting ^= I40E_ITR_DYNAMIC;\n+\t\ttx_ring->itr_setting ^= I40E_ITR_DYNAMIC;\n \n \tq_vector = rx_ring->q_vector;\n-\tq_vector->rx.itr = ITR_TO_REG(rx_ring->rx_itr_setting);\n+\tq_vector->rx.itr = ITR_TO_REG(rx_ring->itr_setting);\n \tvector = vsi->base_vector + q_vector->v_idx;\n \twr32(hw, I40E_VFINT_ITRN1(I40E_RX_ITR, vector - 1), q_vector->rx.itr);\n \n \tq_vector = tx_ring->q_vector;\n-\tq_vector->tx.itr = ITR_TO_REG(tx_ring->tx_itr_setting);\n+\tq_vector->tx.itr = ITR_TO_REG(tx_ring->itr_setting);\n \tvector = vsi->base_vector + q_vector->v_idx;\n \twr32(hw, I40E_VFINT_ITRN1(I40E_TX_ITR, vector - 1), q_vector->tx.itr);\n \ndiff --git a/drivers/net/ethernet/intel/i40evf/i40evf_main.c b/drivers/net/ethernet/intel/i40evf/i40evf_main.c\nindex 16989ad..a5fb540 100644\n--- a/drivers/net/ethernet/intel/i40evf/i40evf_main.c\n+++ b/drivers/net/ethernet/intel/i40evf/i40evf_main.c\n@@ -354,7 +354,7 @@ i40evf_map_vector_to_rxq(struct i40evf_adapter *adapter, int v_idx, int r_idx)\n \tq_vector->rx.ring = rx_ring;\n \tq_vector->rx.count++;\n \tq_vector->rx.latency_range = I40E_LOW_LATENCY;\n-\tq_vector->rx.itr = ITR_TO_REG(rx_ring->rx_itr_setting);\n+\tq_vector->rx.itr = ITR_TO_REG(rx_ring->itr_setting);\n \tq_vector->ring_mask |= BIT(r_idx);\n \tq_vector->itr_countdown = ITR_COUNTDOWN_START;\n \twr32(hw, I40E_VFINT_ITRN1(I40E_RX_ITR, v_idx - 1), q_vector->rx.itr);\n@@ -379,7 +379,7 @@ i40evf_map_vector_to_txq(struct i40evf_adapter *adapter, int v_idx, int t_idx)\n \tq_vector->tx.ring = tx_ring;\n \tq_vector->tx.count++;\n \tq_vector->tx.latency_range = I40E_LOW_LATENCY;\n-\tq_vector->tx.itr = ITR_TO_REG(tx_ring->tx_itr_setting);\n+\tq_vector->tx.itr = ITR_TO_REG(tx_ring->itr_setting);\n \tq_vector->itr_countdown = ITR_COUNTDOWN_START;\n \tq_vector->num_ringpairs++;\n \twr32(hw, I40E_VFINT_ITRN1(I40E_TX_ITR, v_idx - 1), q_vector->tx.itr);\n@@ -1169,7 +1169,7 @@ static int i40evf_alloc_queues(struct i40evf_adapter *adapter)\n \t\ttx_ring->netdev = adapter->netdev;\n \t\ttx_ring->dev = &adapter->pdev->dev;\n \t\ttx_ring->count = adapter->tx_desc_count;\n-\t\ttx_ring->tx_itr_setting = I40E_ITR_TX_DEF;\n+\t\ttx_ring->itr_setting = I40E_ITR_TX_DEF;\n \t\tif (adapter->flags & I40EVF_FLAG_WB_ON_ITR_CAPABLE)\n \t\t\ttx_ring->flags |= I40E_TXR_FLAGS_WB_ON_ITR;\n \n@@ -1178,7 +1178,7 @@ static int i40evf_alloc_queues(struct i40evf_adapter *adapter)\n \t\trx_ring->netdev = adapter->netdev;\n \t\trx_ring->dev = &adapter->pdev->dev;\n \t\trx_ring->count = adapter->rx_desc_count;\n-\t\trx_ring->rx_itr_setting = I40E_ITR_RX_DEF;\n+\t\trx_ring->itr_setting = I40E_ITR_RX_DEF;\n \t}\n \n \tadapter->num_active_queues = num_active_queues;\n", "prefixes": [ "next", "S85-V1", "04/14" ] }