Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/538452/?format=api
{ "id": 538452, "url": "http://patchwork.ozlabs.org/api/patches/538452/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1446226264-29660-4-git-send-email-bpoirier@suse.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": "<1446226264-29660-4-git-send-email-bpoirier@suse.com>", "list_archive_url": null, "date": "2015-10-30T17:31:03", "name": "[v2,3/4] e1000e: Do not write lsc to ics in msi-x mode", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "0f3dd9fc89d7d99276182f3b419e703e6a839187", "submitter": { "id": 67008, "url": "http://patchwork.ozlabs.org/api/people/67008/?format=api", "name": "Benjamin Poirier", "email": "bpoirier@suse.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/1446226264-29660-4-git-send-email-bpoirier@suse.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/538452/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/538452/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 whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\tby ozlabs.org (Postfix) with ESMTP id 64F40141397\n\tfor <incoming@patchwork.ozlabs.org>;\n\tSat, 31 Oct 2015 04:32:05 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id AAA318ACB2;\n\tFri, 30 Oct 2015 17:32:04 +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 JGdQK9ZU3ERo; Fri, 30 Oct 2015 17:32:03 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 9F51E8AB80;\n\tFri, 30 Oct 2015 17:32:03 +0000 (UTC)", "from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\tby ash.osuosl.org (Postfix) with ESMTP id 958BA1C0FE9\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 30 Oct 2015 17:32:02 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 902C98B467\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 30 Oct 2015 17:32:02 +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 XBycNChpd4Nq for <intel-wired-lan@lists.osuosl.org>;\n\tFri, 30 Oct 2015 17:32:01 +0000 (UTC)", "from mx2.suse.de (mx2.suse.de [195.135.220.15])\n\tby whitealder.osuosl.org (Postfix) with ESMTPS id 6D5FE8B431\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 30 Oct 2015 17:32:01 +0000 (UTC)", "from relay1.suse.de (charybdis-ext.suse.de [195.135.220.254])\n\tby mx2.suse.de (Postfix) with ESMTP id 4B9EBAC0C;\n\tFri, 30 Oct 2015 17:32:17 +0000 (UTC)" ], "X-Virus-Scanned": [ "amavisd-new at osuosl.org", "amavisd-new at osuosl.org", "by amavisd-new at test-mx.suse.de" ], "X-Greylist": "domain auto-whitelisted by SQLgrey-1.7.6", "From": "Benjamin Poirier <bpoirier@suse.com>", "To": "Jeff Kirsher <jeffrey.t.kirsher@intel.com>", "Date": "Fri, 30 Oct 2015 10:31:03 -0700", "Message-Id": "<1446226264-29660-4-git-send-email-bpoirier@suse.com>", "X-Mailer": "git-send-email 2.6.0", "In-Reply-To": "<1446226264-29660-1-git-send-email-bpoirier@suse.com>", "References": "<1446226264-29660-1-git-send-email-bpoirier@suse.com>", "Cc": "Frank Steiner <steiner-reg@bio.ifi.lmu.de>, linux-kernel@vger.kernel.org,\n\tintel-wired-lan@lists.osuosl.org, netdev@vger.kernel.org", "Subject": "[Intel-wired-lan] [PATCH v2 3/4] e1000e: Do not write lsc to ics in\n\tmsi-x mode", "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": "In msi-x mode, there is no handler for the lsc interrupt so there is no\npoint in writing that to ics now that we always assume Other interrupts\nare caused by lsc.\n\nReviewed-by: Jasna Hodzic <jhodzic@ucdavis.edu>\nSigned-off-by: Benjamin Poirier <bpoirier@suse.com>\n---\n drivers/net/ethernet/intel/e1000e/defines.h | 3 ++-\n drivers/net/ethernet/intel/e1000e/netdev.c | 27 ++++++++++++++++-----------\n 2 files changed, 18 insertions(+), 12 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/e1000e/defines.h b/drivers/net/ethernet/intel/e1000e/defines.h\nindex 133d407..f7c7804 100644\n--- a/drivers/net/ethernet/intel/e1000e/defines.h\n+++ b/drivers/net/ethernet/intel/e1000e/defines.h\n@@ -441,12 +441,13 @@\n #define E1000_IMS_RXQ1 E1000_ICR_RXQ1 /* Rx Queue 1 Interrupt */\n #define E1000_IMS_TXQ0 E1000_ICR_TXQ0 /* Tx Queue 0 Interrupt */\n #define E1000_IMS_TXQ1 E1000_ICR_TXQ1 /* Tx Queue 1 Interrupt */\n-#define E1000_IMS_OTHER E1000_ICR_OTHER /* Other Interrupts */\n+#define E1000_IMS_OTHER E1000_ICR_OTHER /* Other Interrupt */\n \n /* Interrupt Cause Set */\n #define E1000_ICS_LSC E1000_ICR_LSC /* Link Status Change */\n #define E1000_ICS_RXSEQ E1000_ICR_RXSEQ /* Rx sequence error */\n #define E1000_ICS_RXDMT0 E1000_ICR_RXDMT0 /* Rx desc min. threshold */\n+#define E1000_ICS_OTHER E1000_ICR_OTHER /* Other Interrupt */\n \n /* Transmit Descriptor Control */\n #define E1000_TXDCTL_PTHRESH 0x0000003F /* TXDCTL Prefetch Threshold */\ndiff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c\nindex 602fcc9..639fbe8 100644\n--- a/drivers/net/ethernet/intel/e1000e/netdev.c\n+++ b/drivers/net/ethernet/intel/e1000e/netdev.c\n@@ -4131,10 +4131,23 @@ void e1000e_reset(struct e1000_adapter *adapter)\n \n }\n \n-int e1000e_up(struct e1000_adapter *adapter)\n+/**\n+ * e1000e_trigger_lsc - trigger a lsc interrupt\n+ *\n+ * Fire a link status change interrupt to start the watchdog.\n+ **/\n+static void e1000e_trigger_lsc(struct e1000_adapter *adapter)\n {\n \tstruct e1000_hw *hw = &adapter->hw;\n \n+\tif (adapter->msix_entries)\n+\t\tew32(ICS, E1000_ICS_OTHER);\n+\telse\n+\t\tew32(ICS, E1000_ICS_LSC);\n+}\n+\n+int e1000e_up(struct e1000_adapter *adapter)\n+{\n \t/* hardware has been reset, we need to reload some things */\n \te1000_configure(adapter);\n \n@@ -4146,11 +4159,7 @@ int e1000e_up(struct e1000_adapter *adapter)\n \n \tnetif_start_queue(adapter->netdev);\n \n-\t/* fire a link change interrupt to start the watchdog */\n-\tif (adapter->msix_entries)\n-\t\tew32(ICS, E1000_ICS_LSC | E1000_ICR_OTHER);\n-\telse\n-\t\tew32(ICS, E1000_ICS_LSC);\n+\te1000e_trigger_lsc(adapter);\n \n \treturn 0;\n }\n@@ -4577,11 +4586,7 @@ static int e1000_open(struct net_device *netdev)\n \thw->mac.get_link_status = true;\n \tpm_runtime_put(&pdev->dev);\n \n-\t/* fire a link status change interrupt to start the watchdog */\n-\tif (adapter->msix_entries)\n-\t\tew32(ICS, E1000_ICS_LSC | E1000_ICR_OTHER);\n-\telse\n-\t\tew32(ICS, E1000_ICS_LSC);\n+\te1000e_trigger_lsc(adapter);\n \n \treturn 0;\n \n", "prefixes": [ "v2", "3/4" ] }