Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/631851/?format=api
{ "id": 631851, "url": "http://patchwork.ozlabs.org/api/patches/631851/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20160607230902.5457-13-jacob.e.keller@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": "<20160607230902.5457-13-jacob.e.keller@intel.com>", "list_archive_url": null, "date": "2016-06-07T23:08:56", "name": "[v2,12/18] fm10k: use common flow for suspend and resume", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "3f71abe6b465f3b2289680f0513676aa5ce72740", "submitter": { "id": 9784, "url": "http://patchwork.ozlabs.org/api/people/9784/?format=api", "name": "Jacob Keller", "email": "jacob.e.keller@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/20160607230902.5457-13-jacob.e.keller@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/631851/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/631851/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\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 3rPS1l2v2Sz9ssP\n\tfor <incoming@patchwork.ozlabs.org>;\n\tWed, 8 Jun 2016 09:09:15 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id F01B98A7C7;\n\tTue, 7 Jun 2016 23:09:13 +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 O52gd1s8AJlI; Tue, 7 Jun 2016 23:09:11 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 0E4278A801;\n\tTue, 7 Jun 2016 23:09:10 +0000 (UTC)", "from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133])\n\tby ash.osuosl.org (Postfix) with ESMTP id 0349F1C127A\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 7 Jun 2016 23:09:07 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id F3D4B88A7E\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 7 Jun 2016 23:09:06 +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 m+Lal4RR+wnd for <intel-wired-lan@lists.osuosl.org>;\n\tTue, 7 Jun 2016 23:09:06 +0000 (UTC)", "from mga04.intel.com (mga04.intel.com [192.55.52.120])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 7C9ED8828B\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 7 Jun 2016 23:09:06 +0000 (UTC)", "from fmsmga003.fm.intel.com ([10.253.24.29])\n\tby fmsmga104.fm.intel.com with ESMTP; 07 Jun 2016 16:09:06 -0700", "from jekeller-desk.amr.corp.intel.com (HELO\n\tjekeller-desk.jekeller.internal) ([134.134.3.116])\n\tby FMSMGA003.fm.intel.com with ESMTP; 07 Jun 2016 16:09:06 -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.26,436,1459839600\"; d=\"scan'208\";a=\"715507178\"", "From": "Jacob Keller <jacob.e.keller@intel.com>", "To": "Intel Wired LAN <intel-wired-lan@lists.osuosl.org>", "Date": "Tue, 7 Jun 2016 16:08:56 -0700", "Message-Id": "<20160607230902.5457-13-jacob.e.keller@intel.com>", "X-Mailer": "git-send-email 2.9.0.rc1.405.g81f467e", "In-Reply-To": "<20160607230902.5457-1-jacob.e.keller@intel.com>", "References": "<20160607230902.5457-1-jacob.e.keller@intel.com>", "Subject": "[Intel-wired-lan] [PATCH v2 12/18] fm10k: use common flow for\n\tsuspend and resume", "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": "Continuing the effort to commonize the similar suspend/resume flows,\nfinish up by using the new fm10k_handle_suspand and fm10k_handle_resume\nfunctions for the standard suspend/resume flow.\n\nSigned-off-by: Jacob Keller <jacob.e.keller@intel.com>\n---\n drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 73 ++--------------------------\n 1 file changed, 3 insertions(+), 70 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_pci.c b/drivers/net/ethernet/intel/fm10k/fm10k_pci.c\nindex c60c3b0f89e9..b02361c42705 100644\n--- a/drivers/net/ethernet/intel/fm10k/fm10k_pci.c\n+++ b/drivers/net/ethernet/intel/fm10k/fm10k_pci.c\n@@ -2186,60 +2186,13 @@ static int fm10k_resume(struct pci_dev *pdev)\n \t/* refresh hw_addr in case it was dropped */\n \thw->hw_addr = interface->uc_addr;\n \n-\t/* reset hardware to known state */\n-\terr = hw->mac.ops.init_hw(&interface->hw);\n-\tif (err) {\n-\t\tdev_err(&pdev->dev, \"init_hw failed: %d\\n\", err);\n+\terr = fm10k_handle_resume(interface);\n+\tif (err)\n \t\treturn err;\n-\t}\n-\n-\t/* reset statistics starting values */\n-\thw->mac.ops.rebind_hw_stats(hw, &interface->stats);\n-\n-\trtnl_lock();\n-\n-\terr = fm10k_init_queueing_scheme(interface);\n-\tif (err)\n-\t\tgoto err_queueing_scheme;\n-\n-\terr = fm10k_mbx_request_irq(interface);\n-\tif (err)\n-\t\tgoto err_mbx_irq;\n-\n-\terr = fm10k_hw_ready(interface);\n-\tif (err)\n-\t\tgoto err_open;\n-\n-\terr = netif_running(netdev) ? fm10k_open(netdev) : 0;\n-\tif (err)\n-\t\tgoto err_open;\n-\n-\trtnl_unlock();\n-\n-\t/* assume host is not ready, to prevent race with watchdog in case we\n-\t * actually don't have connection to the switch\n-\t */\n-\tinterface->host_ready = false;\n-\tfm10k_watchdog_host_not_ready(interface);\n-\n-\t/* clear the service task disable bit to allow service task to start */\n-\tclear_bit(__FM10K_SERVICE_DISABLE, &interface->state);\n-\tfm10k_service_event_schedule(interface);\n-\n-\t/* restore SR-IOV interface */\n-\tfm10k_iov_resume(pdev);\n \n \tnetif_device_attach(netdev);\n \n \treturn 0;\n-err_open:\n-\tfm10k_mbx_free_irq(interface);\n-err_mbx_irq:\n-\tfm10k_clear_queueing_scheme(interface);\n-err_queueing_scheme:\n-\trtnl_unlock();\n-\n-\treturn err;\n }\n \n /**\n@@ -2259,27 +2212,7 @@ static int fm10k_suspend(struct pci_dev *pdev,\n \n \tnetif_device_detach(netdev);\n \n-\tfm10k_iov_suspend(pdev);\n-\n-\t/* the watchdog tasks may read registers, which will appear like a\n-\t * surprise-remove event once the PCI device is disabled. This will\n-\t * cause us to close the netdevice, so we don't retain the open/closed\n-\t * state post-resume. Prevent this by disabling the service task while\n-\t * suspended, until we actually resume.\n-\t */\n-\tset_bit(__FM10K_SERVICE_DISABLE, &interface->state);\n-\tcancel_work_sync(&interface->service_task);\n-\n-\trtnl_lock();\n-\n-\tif (netif_running(netdev))\n-\t\tfm10k_close(netdev);\n-\n-\tfm10k_mbx_free_irq(interface);\n-\n-\tfm10k_clear_queueing_scheme(interface);\n-\n-\trtnl_unlock();\n+\tfm10k_prepare_suspend(interface);\n \n \terr = pci_save_state(pdev);\n \tif (err)\n", "prefixes": [ "v2", "12/18" ] }