Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/499534/?format=api
{ "id": 499534, "url": "http://patchwork.ozlabs.org/api/patches/499534/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1437684884-222825-13-git-send-email-catherine.sullivan@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": "<1437684884-222825-13-git-send-email-catherine.sullivan@intel.com>", "list_archive_url": null, "date": "2015-07-23T20:54:41", "name": "[next,S9,12/15] i40e: refactor interrupt enable", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "e6c8c9925e405bd58b90314d68acacd141e96ccf", "submitter": { "id": 13931, "url": "http://patchwork.ozlabs.org/api/people/13931/?format=api", "name": "Catherine Sullivan", "email": "catherine.sullivan@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/1437684884-222825-13-git-send-email-catherine.sullivan@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/499534/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/499534/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<intel-wired-lan-bounces@lists.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" ], "Received": [ "from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\n\tby ozlabs.org (Postfix) with ESMTP id 46D3C140D19\n\tfor <incoming@patchwork.ozlabs.org>;\n\tFri, 24 Jul 2015 06:53:57 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 798B3A43A2;\n\tThu, 23 Jul 2015 20:53:56 +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 Eg2Ht16G03Y2; Thu, 23 Jul 2015 20:53:56 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 111EFA43A1;\n\tThu, 23 Jul 2015 20:53:56 +0000 (UTC)", "from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\tby ash.osuosl.org (Postfix) with ESMTP id CD0091BFA6C\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 23 Jul 2015 20:53:54 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id C5DE991FF8\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 23 Jul 2015 20:53:54 +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 0z9HKUVrcTXz for <intel-wired-lan@lists.osuosl.org>;\n\tThu, 23 Jul 2015 20:53:54 +0000 (UTC)", "from mga11.intel.com (mga11.intel.com [192.55.52.93])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 5E38691FF1\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 23 Jul 2015 20:53:54 +0000 (UTC)", "from fmsmga001.fm.intel.com ([10.253.24.23])\n\tby fmsmga102.fm.intel.com with ESMTP; 23 Jul 2015 13:53:54 -0700", "from catheri1-tigger.jf.intel.com ([134.134.176.92])\n\tby fmsmga001.fm.intel.com with ESMTP; 23 Jul 2015 13:53:54 -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-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.15,533,1432623600\"; d=\"scan'208\";a=\"753353414\"", "From": "Catherine Sullivan <catherine.sullivan@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Thu, 23 Jul 2015 16:54:41 -0400", "Message-Id": "<1437684884-222825-13-git-send-email-catherine.sullivan@intel.com>", "X-Mailer": "git-send-email 1.9.3", "In-Reply-To": "<1437684884-222825-1-git-send-email-catherine.sullivan@intel.com>", "References": "<1437684884-222825-1-git-send-email-catherine.sullivan@intel.com>", "Subject": "[Intel-wired-lan] [next PATCH S9 12/15] i40e: refactor interrupt\n\tenable", "X-BeenThere": "intel-wired-lan@lists.osuosl.org", "X-Mailman-Version": "2.1.18-1", "Precedence": "list", "List-Id": "Intel Wired Ethernet Linux Kernel Driver Development\n\t<intel-wired-lan.lists.osuosl.org>", "List-Unsubscribe": "<http://lists.osuosl.org/mailman/options/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@lists.osuosl.org?subject=unsubscribe>", "List-Archive": "<http://lists.osuosl.org/pipermail/intel-wired-lan/>", "List-Post": "<mailto:intel-wired-lan@lists.osuosl.org>", "List-Help": "<mailto:intel-wired-lan-request@lists.osuosl.org?subject=help>", "List-Subscribe": "<http://lists.osuosl.org/mailman/listinfo/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@lists.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@lists.osuosl.org", "Sender": "\"Intel-wired-lan\" <intel-wired-lan-bounces@lists.osuosl.org>" }, "content": "From: Jesse Brandeburg <jesse.brandeburg@intel.com>\n\nThe interrupt enable function was always making the caller add\nthe base_vector from the vsi struct which is already passed to\nthe function. Just collapse the math into the helper function.\n\nSigned-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>\nChange-ID: I54ef33aa7ceebc3231c3cc48f7b39fd0c3ff5806\n---\n drivers/net/ethernet/intel/i40e/i40e_main.c | 10 ++++------\n drivers/net/ethernet/intel/i40e/i40e_txrx.c | 6 ++----\n 2 files changed, 6 insertions(+), 10 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c\nindex 464fba3..1681e7f 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_main.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c\n@@ -2960,7 +2960,7 @@ void i40e_irq_dynamic_enable_icr0(struct i40e_pf *pf)\n /**\n * i40e_irq_dynamic_enable - Enable default interrupt generation settings\n * @vsi: pointer to a vsi\n- * @vector: enable a particular Hw Interrupt vector\n+ * @vector: enable a particular Hw Interrupt vector, without base_vector\n **/\n void i40e_irq_dynamic_enable(struct i40e_vsi *vsi, int vector)\n {\n@@ -2971,7 +2971,7 @@ void i40e_irq_dynamic_enable(struct i40e_vsi *vsi, int vector)\n \tval = I40E_PFINT_DYN_CTLN_INTENA_MASK |\n \t I40E_PFINT_DYN_CTLN_CLEARPBA_MASK |\n \t (I40E_ITR_NONE << I40E_PFINT_DYN_CTLN_ITR_INDX_SHIFT);\n-\twr32(hw, I40E_PFINT_DYN_CTLN(vector - 1), val);\n+\twr32(hw, I40E_PFINT_DYN_CTLN(vector + vsi->base_vector - 1), val);\n \t/* skip the flush */\n }\n \n@@ -3114,8 +3114,7 @@ static int i40e_vsi_enable_irq(struct i40e_vsi *vsi)\n \tint i;\n \n \tif (pf->flags & I40E_FLAG_MSIX_ENABLED) {\n-\t\tfor (i = vsi->base_vector;\n-\t\t i < (vsi->num_q_vectors + vsi->base_vector); i++)\n+\t\tfor (i = 0; i < vsi->num_q_vectors; i++)\n \t\t\ti40e_irq_dynamic_enable(vsi, i);\n \t} else {\n \t\ti40e_irq_dynamic_enable_icr0(pf);\n@@ -3347,8 +3346,7 @@ static bool i40e_clean_fdir_tx_irq(struct i40e_ring *tx_ring, int budget)\n \ttx_ring->next_to_clean = i;\n \n \tif (vsi->back->flags & I40E_FLAG_MSIX_ENABLED) {\n-\t\ti40e_irq_dynamic_enable(vsi,\n-\t\t\t\ttx_ring->q_vector->v_idx + vsi->base_vector);\n+\t\ti40e_irq_dynamic_enable(vsi, tx_ring->q_vector->v_idx);\n \t}\n \treturn budget > 0;\n }\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_txrx.c b/drivers/net/ethernet/intel/i40e/i40e_txrx.c\nindex 8a3d596..ce3f7cc 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_txrx.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_txrx.c\n@@ -1860,8 +1860,7 @@ static inline void i40e_update_enable_itr(struct i40e_vsi *vsi,\n \t\tif (!test_bit(__I40E_DOWN, &vsi->state))\n \t\t\twr32(hw, I40E_PFINT_DYN_CTLN(vector - 1), val);\n \t} else {\n-\t\ti40e_irq_dynamic_enable(vsi,\n-\t\t\t\t\tq_vector->v_idx + vsi->base_vector);\n+\t\ti40e_irq_dynamic_enable(vsi, q_vector->v_idx);\n \t}\n \tif (ITR_IS_DYNAMIC(vsi->tx_itr_setting)) {\n \t\told_itr = q_vector->tx.itr;\n@@ -1883,8 +1882,7 @@ static inline void i40e_update_enable_itr(struct i40e_vsi *vsi,\n \t\t\twr32(hw, I40E_PFINT_DYN_CTLN(q_vector->v_idx +\n \t\t\t vsi->base_vector - 1), val);\n \t} else {\n-\t\ti40e_irq_dynamic_enable(vsi,\n-\t\t\t\t\tq_vector->v_idx + vsi->base_vector);\n+\t\ti40e_irq_dynamic_enable(vsi, q_vector->v_idx);\n \t}\n }\n \n", "prefixes": [ "next", "S9", "12/15" ] }