{"id":788783,"url":"http://patchwork.ozlabs.org/api/1.2/patches/788783/?format=json","web_url":"http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20170714131019.52530-3-alice.michael@intel.com/","project":{"id":46,"url":"http://patchwork.ozlabs.org/api/1.2/projects/46/?format=json","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":"<20170714131019.52530-3-alice.michael@intel.com>","list_archive_url":null,"date":"2017-07-14T13:10:09","name":"[next,S76-V2,03/13] i40e: move enabling icr0 into i40e_update_enable_itr","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"60c96d329b887662faa77f9be6ee1c0f42d8faab","submitter":{"id":71123,"url":"http://patchwork.ozlabs.org/api/1.2/people/71123/?format=json","name":"Michael, Alice","email":"alice.michael@intel.com"},"delegate":{"id":68,"url":"http://patchwork.ozlabs.org/api/1.2/users/68/?format=json","username":"jtkirshe","first_name":"Jeff","last_name":"Kirsher","email":"jeffrey.t.kirsher@intel.com"},"mbox":"http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20170714131019.52530-3-alice.michael@intel.com/mbox/","series":[],"comments":"http://patchwork.ozlabs.org/api/patches/788783/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/788783/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"],"Received":["from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\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 3x8QRf2Fnmz9sNd\n\tfor <incoming@patchwork.ozlabs.org>;\n\tSat, 15 Jul 2017 07:14:22 +1000 (AEST)","from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id C83AE8840B;\n\tFri, 14 Jul 2017 21:14:20 +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 4dyh5yfW7nrH; Fri, 14 Jul 2017 21:14:20 +0000 (UTC)","from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 5184E88400;\n\tFri, 14 Jul 2017 21:14:20 +0000 (UTC)","from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133])\n\tby ash.osuosl.org (Postfix) with ESMTP id D58E91C0683\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 14 Jul 2017 21:14:18 +0000 (UTC)","from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id C42148A42B\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 14 Jul 2017 21:14:18 +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 QcBhspjAwzV5 for <intel-wired-lan@lists.osuosl.org>;\n\tFri, 14 Jul 2017 21:14:18 +0000 (UTC)","from mga05.intel.com (mga05.intel.com [192.55.52.43])\n\tby hemlock.osuosl.org (Postfix) with ESMTPS id 41D5F8A41C\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 14 Jul 2017 21:14:18 +0000 (UTC)","from orsmga002.jf.intel.com ([10.7.209.21])\n\tby fmsmga105.fm.intel.com with ESMTP; 14 Jul 2017 14:14:17 -0700","from unknown (HELO localhost.jf.intel.com) ([10.166.16.121])\n\tby orsmga002.jf.intel.com with ESMTP; 14 Jul 2017 14:14:17 -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.40,360,1496127600\"; d=\"scan'208\";a=\"111486582\"","From":"Alice Michael <alice.michael@intel.com>","To":"alice.michael@intel.com,\n\tintel-wired-lan@lists.osuosl.org","Date":"Fri, 14 Jul 2017 09:10:09 -0400","Message-Id":"<20170714131019.52530-3-alice.michael@intel.com>","X-Mailer":"git-send-email 2.9.3","In-Reply-To":"<20170714131019.52530-1-alice.michael@intel.com>","References":"<20170714131019.52530-1-alice.michael@intel.com>","Subject":"[Intel-wired-lan] [next PATCH S76-V2 03/13] i40e: move enabling\n\ticr0 into i40e_update_enable_itr","X-BeenThere":"intel-wired-lan@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.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: Jacob Keller <jacob.e.keller@intel.com>\n\nIf we don't have MSI-X enabled, we handle interrupts on all icr0. This\nis a special case, so let's move the conditional into\ni40e_update_enable_itr() in order to make i40e_napi_poll easier to\nread about.\n\nSigned-off-by: Jacob Keller <jacob.e.keller@intel.com>\n---\n drivers/net/ethernet/intel/i40e/i40e_txrx.c | 8 ++++++--\n 1 file changed, 6 insertions(+), 2 deletions(-)","diff":"diff --git a/drivers/net/ethernet/intel/i40e/i40e_txrx.c b/drivers/net/ethernet/intel/i40e/i40e_txrx.c\nindex eda8da1..d96970f 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_txrx.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_txrx.c\n@@ -2241,6 +2241,12 @@ static inline void i40e_update_enable_itr(struct i40e_vsi *vsi,\n \tint idx = q_vector->v_idx;\n \tint rx_itr_setting, tx_itr_setting;\n \n+\t/* If we don't have MSIX, then we only need to re-enable icr0 */\n+\tif (!(vsi->back->flags & I40E_FLAG_MSIX_ENABLED)) {\n+\t\ti40e_irq_dynamic_enable_icr0(vsi->back, false);\n+\t\treturn;\n+\t}\n+\n \tvector = (q_vector->v_idx + vsi->base_vector);\n \n \t/* avoid dynamic calculation if in countdown mode OR if\n@@ -2394,8 +2400,6 @@ int i40e_napi_poll(struct napi_struct *napi, int budget)\n \t */\n \tif (!clean_complete)\n \t\ti40e_force_wb(vsi, q_vector);\n-\telse if (!(vsi->back->flags & I40E_FLAG_MSIX_ENABLED))\n-\t\ti40e_irq_dynamic_enable_icr0(vsi->back, false);\n \telse\n \t\ti40e_update_enable_itr(vsi, q_vector);\n \n","prefixes":["next","S76-V2","03/13"]}