Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/631862/?format=api
{ "id": 631862, "url": "http://patchwork.ozlabs.org/api/patches/631862/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20160607230902.5457-9-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-9-jacob.e.keller@intel.com>", "list_archive_url": null, "date": "2016-06-07T23:08:52", "name": "[v2,08/18] fm10k: split fm10k_reinit into two functions", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "53ee4d3b52186d16de5998c5819c2ed69a165a2f", "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-9-jacob.e.keller@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/631862/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/631862/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 3rPS205ZlQz9sC3\n\tfor <incoming@patchwork.ozlabs.org>;\n\tWed, 8 Jun 2016 09:09:28 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 62C1D8A871;\n\tTue, 7 Jun 2016 23:09:27 +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 N2P66Id3Pa2R; Tue, 7 Jun 2016 23:09:23 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 452A18AA2E;\n\tTue, 7 Jun 2016 23:09:17 +0000 (UTC)", "from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133])\n\tby ash.osuosl.org (Postfix) with ESMTP id 9ED691C127A\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 hemlock.osuosl.org (Postfix) with ESMTP id 9B5F38828B\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 7 Jun 2016 23:09:12 +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 7wej2rymTiIY 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 40AC0881C4\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:05 -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=\"715507165\"", "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:52 -0700", "Message-Id": "<20160607230902.5457-9-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 08/18] fm10k: split fm10k_reinit into\n\ttwo functions", "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": "There are several flows in the driver which perform the similar function\nof tearing down software and restoring software to recover from certain\nerrors or PCIe events, including:\n\n * fm10k_reinit\n * fm10k_suspend/resume\n * fm10k_io_error_detected/fm10k_io_resume\n\nIn addition, we want to implement a .reset_notify() handler as well\nwhich will also perform similar function.\n\nRework how the driver codes reset and resume flows by separating out the\nreinit logic into two functions \"fm10k_prepare_for_reset\" and\n\"fm10k_handle_reset\". This first step will allow us to re-use this\nfunctionality in the similar blocks of code instead of re-coding the\nsame sequence of events slightly different.\n\nThe end result should be more maintainable and correct, fixing several\ninconsistencies with the work flow.\n\nThe new functions expect to take the rtnl_lock() themselves, and it does\nhave the unfortunate side effect of having the reinit flow take then\nrelease then take the rtnl_lock. However, this minor downside is\noutweighted by the benefits of code reduction and reducing needless\ndifference between these flows.\n\nSigned-off-by: Jacob Keller <jacob.e.keller@intel.com>\n---\n drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 33 +++++++++++++++++++++++-----\n 1 file changed, 28 insertions(+), 5 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_pci.c b/drivers/net/ethernet/intel/fm10k/fm10k_pci.c\nindex 7c9b20c6b6c1..2963b41d01e2 100644\n--- a/drivers/net/ethernet/intel/fm10k/fm10k_pci.c\n+++ b/drivers/net/ethernet/intel/fm10k/fm10k_pci.c\n@@ -136,11 +136,9 @@ static void fm10k_detach_subtask(struct fm10k_intfc *interface)\n \trtnl_unlock();\n }\n \n-static void fm10k_reinit(struct fm10k_intfc *interface)\n+static void fm10k_prepare_for_reset(struct fm10k_intfc *interface)\n {\n \tstruct net_device *netdev = interface->netdev;\n-\tstruct fm10k_hw *hw = &interface->hw;\n-\tint err;\n \n \tWARN_ON(in_interrupt());\n \n@@ -165,6 +163,17 @@ static void fm10k_reinit(struct fm10k_intfc *interface)\n \t/* delay any future reset requests */\n \tinterface->last_reset = jiffies + (10 * HZ);\n \n+\trtnl_unlock();\n+}\n+\n+static int fm10k_handle_reset(struct fm10k_intfc *interface)\n+{\n+\tstruct net_device *netdev = interface->netdev;\n+\tstruct fm10k_hw *hw = &interface->hw;\n+\tint err;\n+\n+\trtnl_lock();\n+\n \t/* reset and initialize the hardware so it is in a known state */\n \terr = hw->mac.ops.reset_hw(hw);\n \tif (err) {\n@@ -185,7 +194,7 @@ static void fm10k_reinit(struct fm10k_intfc *interface)\n \t\tgoto reinit_err;\n \t}\n \n-\t/* reassociate interrupts */\n+\t/* re-associate interrupts */\n \terr = fm10k_mbx_request_irq(interface);\n \tif (err)\n \t\tgoto err_mbx_irq;\n@@ -219,7 +228,7 @@ static void fm10k_reinit(struct fm10k_intfc *interface)\n \n \tclear_bit(__FM10K_RESETTING, &interface->state);\n \n-\treturn;\n+\treturn err;\n err_open:\n \tfm10k_mbx_free_irq(interface);\n err_mbx_irq:\n@@ -230,6 +239,20 @@ reinit_err:\n \trtnl_unlock();\n \n \tclear_bit(__FM10K_RESETTING, &interface->state);\n+\n+\treturn err;\n+}\n+\n+static void fm10k_reinit(struct fm10k_intfc *interface)\n+{\n+\tint err;\n+\n+\tfm10k_prepare_for_reset(interface);\n+\n+\terr = fm10k_handle_reset(interface);\n+\tif (err)\n+\t\tdev_err(&interface->pdev->dev,\n+\t\t\t\"fm10k_handle_reset failed: %d\\n\", err);\n }\n \n static void fm10k_reset_subtask(struct fm10k_intfc *interface)\n", "prefixes": [ "v2", "08/18" ] }