Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/695769/?format=api
{ "id": 695769, "url": "http://patchwork.ozlabs.org/api/patches/695769/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20161116192534.12765.65734.stgit@localhost6.localdomain6/", "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": "<20161116192534.12765.65734.stgit@localhost6.localdomain6>", "list_archive_url": null, "date": "2016-11-16T19:25:34", "name": "ixgbevf: fix AER error handling", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "35119fbdd309f84e00779ad40bed6d58391caf1e", "submitter": { "id": 1670, "url": "http://patchwork.ozlabs.org/api/people/1670/?format=api", "name": "Tantilov, Emil S", "email": "emil.s.tantilov@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/20161116192534.12765.65734.stgit@localhost6.localdomain6/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/695769/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/695769/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 hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133])\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 3tJvWs6LKFz9t0v\n\tfor <incoming@patchwork.ozlabs.org>;\n\tThu, 17 Nov 2016 06:31:37 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 275A086222;\n\tWed, 16 Nov 2016 19:31:36 +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 DXMCjHj-BgYV; Wed, 16 Nov 2016 19:31:34 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id C586586218;\n\tWed, 16 Nov 2016 19:31:34 +0000 (UTC)", "from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\tby ash.osuosl.org (Postfix) with ESMTP id 154221C04E9\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 16 Nov 2016 19:31:34 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id A7D80241B1\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 16 Nov 2016 19:31:25 +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 g0cuccsDlKZ0 for <intel-wired-lan@lists.osuosl.org>;\n\tWed, 16 Nov 2016 19:31:23 +0000 (UTC)", "from mga01.intel.com (mga01.intel.com [192.55.52.88])\n\tby silver.osuosl.org (Postfix) with ESMTPS id D4F9223FBA\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 16 Nov 2016 19:31:23 +0000 (UTC)", "from orsmga003.jf.intel.com ([10.7.209.27])\n\tby fmsmga101.fm.intel.com with ESMTP; 16 Nov 2016 11:31:23 -0800", "from estantil-desk3.jf.intel.com (HELO localhost6.localdomain6)\n\t([134.134.3.186])\n\tby orsmga003.jf.intel.com with ESMTP; 16 Nov 2016 11:31:23 -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-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.31,649,1473145200\"; d=\"scan'208\";a=\"902194466\"", "From": "Emil Tantilov <emil.s.tantilov@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Wed, 16 Nov 2016 11:25:34 -0800", "Message-ID": "<20161116192534.12765.65734.stgit@localhost6.localdomain6>", "User-Agent": "StGit/0.17.1-17-ge4e0", "MIME-Version": "1.0", "Subject": "[Intel-wired-lan] [PATCH] ixgbevf: fix AER error handling", "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>", "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": "Make sure that we free the IRQs in ixgbevf_io_error_detected() when\nresponding to an PCIe AER error and also restore them when the\ninterface recovers from it.\n\nPreviously it was possible to trigger BUG_ON() check in free_msix_irqs()\nin the case where we call ixgbevf_remove() after a failed recovery from\nAER error because the inerrupts were not freed.\n\nAlso moved the down and free functions into ixgbevf_close_suspend()\nsame as with ixgbe.\n\nSigned-off-by: Emil Tantilov <emil.s.tantilov@intel.com>\n---\n drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 43 ++++++++++++---------\n 1 file changed, 25 insertions(+), 18 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c\nindex 2cc3d90..8bc3e4d 100644\n--- a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c\n+++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c\n@@ -3228,6 +3228,21 @@ int ixgbevf_open(struct net_device *netdev)\n }\n \n /**\n+ * ixgbevf_close_suspend - actions necessary to both suspend and close flows\n+ * @adapter: the private adapter struct\n+ *\n+ * This function should contain the necessary work common to both suspending\n+ * and closing of the device.\n+ */\n+static void ixgbevf_close_suspend(struct ixgbevf_adapter *adapter)\n+{\n+\t\tixgbevf_down(adapter);\n+\t\tixgbevf_free_irq(adapter);\n+\t\tixgbevf_free_all_tx_resources(adapter);\n+\t\tixgbevf_free_all_rx_resources(adapter);\n+}\n+\n+/**\n * ixgbevf_close - Disables a network interface\n * @netdev: network interface device structure\n *\n@@ -3242,14 +3257,8 @@ int ixgbevf_close(struct net_device *netdev)\n {\n \tstruct ixgbevf_adapter *adapter = netdev_priv(netdev);\n \n-\tif (!netif_device_present(netdev))\n-\t\treturn 0;\n-\n-\tixgbevf_down(adapter);\n-\tixgbevf_free_irq(adapter);\n-\n-\tixgbevf_free_all_tx_resources(adapter);\n-\tixgbevf_free_all_rx_resources(adapter);\n+\tif (netif_device_present(netdev))\n+\t\tixgbevf_close_suspend(adapter);\n \n \treturn 0;\n }\n@@ -3802,13 +3811,10 @@ static int ixgbevf_suspend(struct pci_dev *pdev, pm_message_t state)\n \trtnl_lock();\n \tnetif_device_detach(netdev);\n \n-\tif (netif_running(netdev)) {\n-\t\tixgbevf_down(adapter);\n-\t\tixgbevf_free_irq(adapter);\n-\t\tixgbevf_free_all_tx_resources(adapter);\n-\t\tixgbevf_free_all_rx_resources(adapter);\n-\t\tixgbevf_clear_interrupt_scheme(adapter);\n-\t}\n+\tif (netif_running(netdev))\n+\t\tixgbevf_close_suspend(adapter);\n+\n+\tixgbevf_clear_interrupt_scheme(adapter);\n \trtnl_unlock();\n \n #ifdef CONFIG_PM\n@@ -4247,7 +4253,7 @@ static pci_ers_result_t ixgbevf_io_error_detected(struct pci_dev *pdev,\n \t}\n \n \tif (netif_running(netdev))\n-\t\tixgbevf_down(adapter);\n+\t\tixgbevf_close_suspend(adapter);\n \n \tif (!test_and_set_bit(__IXGBEVF_DISABLED, &adapter->state))\n \t\tpci_disable_device(pdev);\n@@ -4295,12 +4301,13 @@ static pci_ers_result_t ixgbevf_io_slot_reset(struct pci_dev *pdev)\n static void ixgbevf_io_resume(struct pci_dev *pdev)\n {\n \tstruct net_device *netdev = pci_get_drvdata(pdev);\n-\tstruct ixgbevf_adapter *adapter = netdev_priv(netdev);\n \n+\trtnl_lock();\n \tif (netif_running(netdev))\n-\t\tixgbevf_up(adapter);\n+\t\tixgbevf_open(netdev);\n \n \tnetif_device_attach(netdev);\n+\trtnl_unlock();\n }\n \n /* PCI Error Recovery (ERS) */\n", "prefixes": [] }