Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/631864/?format=api
{ "id": 631864, "url": "http://patchwork.ozlabs.org/api/patches/631864/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20160607230902.5457-10-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-10-jacob.e.keller@intel.com>", "list_archive_url": null, "date": "2016-06-07T23:08:53", "name": "[v2,09/18] fm10k: implement prepare_suspend and handle_resume", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "9049f2e7ead0c858ac236ee0e51808edff396ca0", "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-10-jacob.e.keller@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/631864/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/631864/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 3rPS233lN7z9ssP\n\tfor <incoming@patchwork.ozlabs.org>;\n\tWed, 8 Jun 2016 09:09:30 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 6C2EE8A871;\n\tTue, 7 Jun 2016 23:09:29 +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 sVOzdUkeHQXt; Tue, 7 Jun 2016 23:09:26 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 9CE058A8C1;\n\tTue, 7 Jun 2016 23:09:17 +0000 (UTC)", "from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\n\tby ash.osuosl.org (Postfix) with ESMTP id D59D31CEA2A\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 7 Jun 2016 23:09:12 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id D3384856E3\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 7 Jun 2016 23:09:12 +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 Kgkjo1_H8IOx 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 fraxinus.osuosl.org (Postfix) with ESMTP id 4B5F985A26\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:05 -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=\"715507168\"", "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:53 -0700", "Message-Id": "<20160607230902.5457-10-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 09/18] fm10k: implement prepare_suspend\n\tand handle_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": "Implement fm10k_prepare_suspend and fm10k_handle_resume functions which\nabstract around the now existing fm10k_prepare_for_reset and\nfm10k_handle_reset. The new functions also handle stopping the service\ntask, which is something that the original re-init flow does not need.\n\nEvery other location that does a suspend/resume type flow is expected to\nuse these functions, because otherwise they may have conflicts with the\nrunning watchdog routines. This also has the effect of preventing\npossible surprise remove events during handling of FLR events and PCIe\nerrors.\n\nSigned-off-by: Jacob Keller <jacob.e.keller@intel.com>\n---\n drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 38 ++++++++++++++++++++++++++++\n 1 file changed, 38 insertions(+)", "diff": "diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_pci.c b/drivers/net/ethernet/intel/fm10k/fm10k_pci.c\nindex 2963b41d01e2..a6ee046e9824 100644\n--- a/drivers/net/ethernet/intel/fm10k/fm10k_pci.c\n+++ b/drivers/net/ethernet/intel/fm10k/fm10k_pci.c\n@@ -2112,6 +2112,44 @@ static void fm10k_remove(struct pci_dev *pdev)\n \tpci_disable_device(pdev);\n }\n \n+static void fm10k_prepare_suspend(struct fm10k_intfc *interface)\n+{\n+\t/* the watchdog task reads from registers, which might appear like\n+\t * a surprise remove if the PCIe device is disabled while we're\n+\t * stopped. We stop the watchdog task until after we resume software\n+\t * activity.\n+\t */\n+\tset_bit(__FM10K_SERVICE_DISABLE, &interface->state);\n+\tcancel_work_sync(&interface->service_task);\n+\n+\tfm10k_prepare_for_reset(interface);\n+}\n+\n+static int fm10k_handle_resume(struct fm10k_intfc *interface)\n+{\n+\tstruct fm10k_hw *hw = &interface->hw;\n+\tint err;\n+\n+\t/* reset statistics starting values */\n+\thw->mac.ops.rebind_hw_stats(hw, &interface->stats);\n+\n+\terr = fm10k_handle_reset(interface);\n+\tif (err)\n+\t\treturn err;\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+\treturn err;\n+}\n+\n #ifdef CONFIG_PM\n /**\n * fm10k_resume - Restore device to pre-sleep state\n", "prefixes": [ "v2", "09/18" ] }