Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/786366/?format=api
{ "id": 786366, "url": "http://patchwork.ozlabs.org/api/patches/786366/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20170710202319.22110-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": "<20170710202319.22110-9-jacob.e.keller@intel.com>", "list_archive_url": null, "date": "2017-07-10T20:23:12", "name": "[v3,09/16] fm10k: move fm10k_prepare_for_reset and fm10k_handle_reset", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "b5beaa0d3bbe238ff0e1dfbd94423fb54e077177", "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/20170710202319.22110-9-jacob.e.keller@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/786366/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/786366/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<intel-wired-lan-bounces@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 3x5xVr3Lj0z9s06\n\tfor <incoming@patchwork.ozlabs.org>;\n\tTue, 11 Jul 2017 06:23:32 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 0CAF888949;\n\tMon, 10 Jul 2017 20:23:31 +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 Isvlq5GQq88G; Mon, 10 Jul 2017 20:23:30 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 211F388896;\n\tMon, 10 Jul 2017 20:23:30 +0000 (UTC)", "from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\tby ash.osuosl.org (Postfix) with ESMTP id 297851CEAC7\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 10 Jul 2017 20:23:23 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id DD96E2FFC6\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 10 Jul 2017 20:23:23 +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 f+BehO5gi0sU for <intel-wired-lan@lists.osuosl.org>;\n\tMon, 10 Jul 2017 20:23:22 +0000 (UTC)", "from mga14.intel.com (mga14.intel.com [192.55.52.115])\n\tby silver.osuosl.org (Postfix) with ESMTPS id 8E77E2FFBF\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 10 Jul 2017 20:23:22 +0000 (UTC)", "from fmsmga004.fm.intel.com ([10.253.24.48])\n\tby fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t10 Jul 2017 13:23:21 -0700", "from jekeller-desk.amr.corp.intel.com (HELO\n\tjekeller-desk.jekeller.internal) ([134.134.177.230])\n\tby fmsmga004.fm.intel.com with ESMTP; 10 Jul 2017 13:23:21 -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.40,342,1496127600\"; d=\"scan'208\";a=\"285198862\"", "From": "Jacob Keller <jacob.e.keller@intel.com>", "To": "jtkirhse@osuosl.org, Intel Wired LAN <intel-wired-lan@lists.osuosl.org>", "Date": "Mon, 10 Jul 2017 13:23:12 -0700", "Message-Id": "<20170710202319.22110-9-jacob.e.keller@intel.com>", "X-Mailer": "git-send-email 2.13.0.615.gb09ed6e59a40", "In-Reply-To": "<20170710202319.22110-1-jacob.e.keller@intel.com>", "References": "<20170710202319.22110-1-jacob.e.keller@intel.com>", "Cc": "jekeller@osuosl.org", "Subject": "[Intel-wired-lan] [PATCH v3 09/16] fm10k: move\n\tfm10k_prepare_for_reset and fm10k_handle_reset", "X-BeenThere": "intel-wired-lan@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.osuosl.org>", "List-Unsubscribe": "<https://lists.osuosl.org/mailman/options/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@osuosl.org?subject=unsubscribe>", "List-Archive": "<http://lists.osuosl.org/pipermail/intel-wired-lan/>", "List-Post": "<mailto:intel-wired-lan@osuosl.org>", "List-Help": "<mailto:intel-wired-lan-request@osuosl.org?subject=help>", "List-Subscribe": "<https://lists.osuosl.org/mailman/listinfo/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@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@osuosl.org", "Sender": "\"Intel-wired-lan\" <intel-wired-lan-bounces@osuosl.org>" }, "content": "A future patch needs these functions defined earlier in the file. Move\nthem closer to above where they will be called.\n\nSigned-off-by: Jacob Keller <jacob.e.keller@intel.com>\n---\n drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 58 ++++++++++++++--------------\n 1 file changed, 29 insertions(+), 29 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_pci.c b/drivers/net/ethernet/intel/fm10k/fm10k_pci.c\nindex 32b5ace82cad..6a7b4c5429ae 100644\n--- a/drivers/net/ethernet/intel/fm10k/fm10k_pci.c\n+++ b/drivers/net/ethernet/intel/fm10k/fm10k_pci.c\n@@ -132,35 +132,6 @@ static void fm10k_service_timer(unsigned long data)\n \tfm10k_service_event_schedule(interface);\n }\n \n-static void fm10k_detach_subtask(struct fm10k_intfc *interface)\n-{\n-\tstruct net_device *netdev = interface->netdev;\n-\tu32 __iomem *hw_addr;\n-\tu32 value;\n-\n-\t/* do nothing if device is still present or hw_addr is set */\n-\tif (netif_device_present(netdev) || interface->hw.hw_addr)\n-\t\treturn;\n-\n-\t/* check the real address space to see if we've recovered */\n-\thw_addr = READ_ONCE(interface->uc_addr);\n-\tvalue = readl(hw_addr);\n-\tif (~value) {\n-\t\tinterface->hw.hw_addr = interface->uc_addr;\n-\t\tnetif_device_attach(netdev);\n-\t\tset_bit(FM10K_FLAG_RESET_REQUESTED, interface->flags);\n-\t\tnetdev_warn(netdev, \"PCIe link restored, device now attached\\n\");\n-\t\treturn;\n-\t}\n-\n-\trtnl_lock();\n-\n-\tif (netif_running(netdev))\n-\t\tdev_close(netdev);\n-\n-\trtnl_unlock();\n-}\n-\n static void fm10k_prepare_for_reset(struct fm10k_intfc *interface)\n {\n \tstruct net_device *netdev = interface->netdev;\n@@ -270,6 +241,35 @@ static int fm10k_handle_reset(struct fm10k_intfc *interface)\n \treturn err;\n }\n \n+static void fm10k_detach_subtask(struct fm10k_intfc *interface)\n+{\n+\tstruct net_device *netdev = interface->netdev;\n+\tu32 __iomem *hw_addr;\n+\tu32 value;\n+\n+\t/* do nothing if device is still present or hw_addr is set */\n+\tif (netif_device_present(netdev) || interface->hw.hw_addr)\n+\t\treturn;\n+\n+\t/* check the real address space to see if we've recovered */\n+\thw_addr = READ_ONCE(interface->uc_addr);\n+\tvalue = readl(hw_addr);\n+\tif (~value) {\n+\t\tinterface->hw.hw_addr = interface->uc_addr;\n+\t\tnetif_device_attach(netdev);\n+\t\tset_bit(FM10K_FLAG_RESET_REQUESTED, interface->flags);\n+\t\tnetdev_warn(netdev, \"PCIe link restored, device now attached\\n\");\n+\t\treturn;\n+\t}\n+\n+\trtnl_lock();\n+\n+\tif (netif_running(netdev))\n+\t\tdev_close(netdev);\n+\n+\trtnl_unlock();\n+}\n+\n static void fm10k_reinit(struct fm10k_intfc *interface)\n {\n \tint err;\n", "prefixes": [ "v3", "09/16" ] }