Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1099626/?format=api
{ "id": 1099626, "url": "http://patchwork.ozlabs.org/api/patches/1099626/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20190514173709.62431-6-alice.michael@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": "<20190514173709.62431-6-alice.michael@intel.com>", "list_archive_url": null, "date": "2019-05-14T17:37:04", "name": "[next,S5,iavf,06/11] iavf: Move commandsprocessing to the separate function", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "2601a5e837e09924c3aaa9bd9fea90334688842a", "submitter": { "id": 71123, "url": "http://patchwork.ozlabs.org/api/people/71123/?format=api", "name": "Michael, Alice", "email": "alice.michael@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/20190514173709.62431-6-alice.michael@intel.com/mbox/", "series": [ { "id": 107823, "url": "http://patchwork.ozlabs.org/api/series/107823/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=107823", "date": "2019-05-14T17:37:00", "name": "[next,S5,iavf,01/11] iavf: Create VLAN tagelements starting from the first element", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/107823/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1099626/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1099626/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" ], "Authentication-Results": [ "ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=osuosl.org\n\t(client-ip=140.211.166.138; helo=whitealder.osuosl.org;\n\tenvelope-from=intel-wired-lan-bounces@osuosl.org;\n\treceiver=<UNKNOWN>)", "ozlabs.org;\n\tdmarc=fail (p=none dis=none) header.from=intel.com" ], "Received": [ "from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256\n\tbits)) (No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 453Pyy5K3Xz9sD4\n\tfor <incoming@patchwork.ozlabs.org>;\n\tWed, 15 May 2019 03:37:46 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 2DE6986DA1;\n\tTue, 14 May 2019 17:37:45 +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 Xz7eUcMl07Bo; Tue, 14 May 2019 17:37:39 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id A016A86DAD;\n\tTue, 14 May 2019 17:37:37 +0000 (UTC)", "from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\n\tby ash.osuosl.org (Postfix) with ESMTP id 949FB1BF3FF\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 14 May 2019 17:37:34 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 9187F8607D\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 14 May 2019 17:37:34 +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 aZWN7PSOCA61 for <intel-wired-lan@lists.osuosl.org>;\n\tTue, 14 May 2019 17:37:32 +0000 (UTC)", "from mga05.intel.com (mga05.intel.com [192.55.52.43])\n\tby fraxinus.osuosl.org (Postfix) with ESMTPS id 2777A860C5\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 14 May 2019 17:37:32 +0000 (UTC)", "from orsmga003.jf.intel.com ([10.7.209.27])\n\tby fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t14 May 2019 10:37:31 -0700", "from alicemic-2.jf.intel.com ([10.166.16.121])\n\tby orsmga003.jf.intel.com with ESMTP; 14 May 2019 10:37:30 -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-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "From": "Alice Michael <alice.michael@intel.com>", "To": "alice.michael@intel.com,\n\tintel-wired-lan@lists.osuosl.org", "Date": "Tue, 14 May 2019 10:37:04 -0700", "Message-Id": "<20190514173709.62431-6-alice.michael@intel.com>", "X-Mailer": "git-send-email 2.19.2", "In-Reply-To": "<20190514173709.62431-1-alice.michael@intel.com>", "References": "<20190514173709.62431-1-alice.michael@intel.com>", "MIME-Version": "1.0", "Subject": "[Intel-wired-lan] [next PATCH S5 iavf 06/11] iavf: Move commands\n\tprocessing to the separate function", "X-BeenThere": "intel-wired-lan@osuosl.org", "X-Mailman-Version": "2.1.29", "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>", "Cc": "Jakub Pawlak <jakub.pawlak@intel.com>", "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": "From: Jakub Pawlak <jakub.pawlak@intel.com>\n\nMove the commands processing outside the watchdog_task()\nfunction. This reduce length and complexity of the function\nwhich is mainly designed to process the watchdog state machine.\n\nSigned-off-by: Jakub Pawlak <jakub.pawlak@intel.com>\n---\n drivers/net/ethernet/intel/iavf/iavf_main.c | 197 +++++++++++---------\n 1 file changed, 105 insertions(+), 92 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/iavf/iavf_main.c b/drivers/net/ethernet/intel/iavf/iavf_main.c\nindex 8a37b9f604e2..f1b51d87ee71 100644\n--- a/drivers/net/ethernet/intel/iavf/iavf_main.c\n+++ b/drivers/net/ethernet/intel/iavf/iavf_main.c\n@@ -1546,123 +1546,66 @@ static void iavf_watchdog_timer(struct timer_list *t)\n }\n \n /**\n- * iavf_watchdog_task - Periodic call-back task\n- * @work: pointer to work_struct\n+ * iavf_process_aq_command - process aq_required flags\n+ * and sends aq command\n+ * @adapter: pointer to iavf adapter structure\n+ *\n+ * Returns 0 on success\n+ * Returns error code if no command was sent\n+ * or error code if the command failed.\n **/\n-static void iavf_watchdog_task(struct work_struct *work)\n+static int iavf_process_aq_command(struct iavf_adapter *adapter)\n {\n-\tstruct iavf_adapter *adapter = container_of(work,\n-\t\t\t\t\t\t struct iavf_adapter,\n-\t\t\t\t\t\t watchdog_task);\n-\tstruct iavf_hw *hw = &adapter->hw;\n-\tu32 reg_val;\n-\n-\tif (test_and_set_bit(__IAVF_IN_CRITICAL_TASK, &adapter->crit_section))\n-\t\tgoto restart_watchdog;\n-\n-\tif (adapter->flags & IAVF_FLAG_PF_COMMS_FAILED) {\n-\t\treg_val = rd32(hw, IAVF_VFGEN_RSTAT) &\n-\t\t\t IAVF_VFGEN_RSTAT_VFR_STATE_MASK;\n-\t\tif ((reg_val == VIRTCHNL_VFR_VFACTIVE) ||\n-\t\t (reg_val == VIRTCHNL_VFR_COMPLETED)) {\n-\t\t\t/* A chance for redemption! */\n-\t\t\tdev_err(&adapter->pdev->dev, \"Hardware came out of reset. Attempting reinit.\\n\");\n-\t\t\tadapter->state = __IAVF_STARTUP;\n-\t\t\tadapter->flags &= ~IAVF_FLAG_PF_COMMS_FAILED;\n-\t\t\tschedule_delayed_work(&adapter->init_task, 10);\n-\t\t\tclear_bit(__IAVF_IN_CRITICAL_TASK,\n-\t\t\t\t &adapter->crit_section);\n-\t\t\t/* Don't reschedule the watchdog, since we've restarted\n-\t\t\t * the init task. When init_task contacts the PF and\n-\t\t\t * gets everything set up again, it'll restart the\n-\t\t\t * watchdog for us. Down, boy. Sit. Stay. Woof.\n-\t\t\t */\n-\t\t\treturn;\n-\t\t}\n-\t\tadapter->aq_required = 0;\n-\t\tadapter->current_op = VIRTCHNL_OP_UNKNOWN;\n-\t\tgoto watchdog_done;\n-\t}\n-\n-\tif ((adapter->state < __IAVF_DOWN) ||\n-\t (adapter->flags & IAVF_FLAG_RESET_PENDING))\n-\t\tgoto watchdog_done;\n-\n-\t/* check for reset */\n-\treg_val = rd32(hw, IAVF_VF_ARQLEN1) & IAVF_VF_ARQLEN1_ARQENABLE_MASK;\n-\tif (!(adapter->flags & IAVF_FLAG_RESET_PENDING) && !reg_val) {\n-\t\tadapter->state = __IAVF_RESETTING;\n-\t\tadapter->flags |= IAVF_FLAG_RESET_PENDING;\n-\t\tdev_err(&adapter->pdev->dev, \"Hardware reset detected\\n\");\n-\t\tschedule_work(&adapter->reset_task);\n-\t\tadapter->aq_required = 0;\n-\t\tadapter->current_op = VIRTCHNL_OP_UNKNOWN;\n-\t\tgoto watchdog_done;\n-\t}\n-\n-\t/* Process admin queue tasks. After init, everything gets done\n-\t * here so we don't race on the admin queue.\n-\t */\n-\tif (adapter->current_op) {\n-\t\tif (!iavf_asq_done(hw)) {\n-\t\t\tdev_dbg(&adapter->pdev->dev, \"Admin queue timeout\\n\");\n-\t\t\tiavf_send_api_ver(adapter);\n-\t\t}\n-\t\tgoto watchdog_done;\n-\t}\n-\tif (adapter->aq_required & IAVF_FLAG_AQ_GET_CONFIG) {\n-\t\tiavf_send_vf_config_msg(adapter);\n-\t\tgoto watchdog_done;\n-\t}\n-\n+\tif (adapter->aq_required & IAVF_FLAG_AQ_GET_CONFIG)\n+\t\treturn iavf_send_vf_config_msg(adapter);\n \tif (adapter->aq_required & IAVF_FLAG_AQ_DISABLE_QUEUES) {\n \t\tiavf_disable_queues(adapter);\n-\t\tgoto watchdog_done;\n+\t\treturn 0;\n \t}\n \n \tif (adapter->aq_required & IAVF_FLAG_AQ_MAP_VECTORS) {\n \t\tiavf_map_queues(adapter);\n-\t\tgoto watchdog_done;\n+\t\treturn 0;\n \t}\n \n \tif (adapter->aq_required & IAVF_FLAG_AQ_ADD_MAC_FILTER) {\n \t\tiavf_add_ether_addrs(adapter);\n-\t\tgoto watchdog_done;\n+\t\treturn 0;\n \t}\n \n \tif (adapter->aq_required & IAVF_FLAG_AQ_ADD_VLAN_FILTER) {\n \t\tiavf_add_vlans(adapter);\n-\t\tgoto watchdog_done;\n+\t\treturn 0;\n \t}\n \n \tif (adapter->aq_required & IAVF_FLAG_AQ_DEL_MAC_FILTER) {\n \t\tiavf_del_ether_addrs(adapter);\n-\t\tgoto watchdog_done;\n+\t\treturn 0;\n \t}\n \n \tif (adapter->aq_required & IAVF_FLAG_AQ_DEL_VLAN_FILTER) {\n \t\tiavf_del_vlans(adapter);\n-\t\tgoto watchdog_done;\n+\t\treturn 0;\n \t}\n \n \tif (adapter->aq_required & IAVF_FLAG_AQ_ENABLE_VLAN_STRIPPING) {\n \t\tiavf_enable_vlan_stripping(adapter);\n-\t\tgoto watchdog_done;\n+\t\treturn 0;\n \t}\n \n \tif (adapter->aq_required & IAVF_FLAG_AQ_DISABLE_VLAN_STRIPPING) {\n \t\tiavf_disable_vlan_stripping(adapter);\n-\t\tgoto watchdog_done;\n+\t\treturn 0;\n \t}\n \n \tif (adapter->aq_required & IAVF_FLAG_AQ_CONFIGURE_QUEUES) {\n \t\tiavf_configure_queues(adapter);\n-\t\tgoto watchdog_done;\n+\t\treturn 0;\n \t}\n \n \tif (adapter->aq_required & IAVF_FLAG_AQ_ENABLE_QUEUES) {\n \t\tiavf_enable_queues(adapter);\n-\t\tgoto watchdog_done;\n+\t\treturn 0;\n \t}\n \n \tif (adapter->aq_required & IAVF_FLAG_AQ_CONFIGURE_RSS) {\n@@ -1670,68 +1613,138 @@ static void iavf_watchdog_task(struct work_struct *work)\n \t\t * PF, so we don't have to set current_op as we will\n \t\t * not get a response through the ARQ.\n \t\t */\n-\t\tiavf_init_rss(adapter);\n \t\tadapter->aq_required &= ~IAVF_FLAG_AQ_CONFIGURE_RSS;\n-\t\tgoto watchdog_done;\n+\t\treturn 0;\n \t}\n \tif (adapter->aq_required & IAVF_FLAG_AQ_GET_HENA) {\n \t\tiavf_get_hena(adapter);\n-\t\tgoto watchdog_done;\n+\t\treturn 0;\n \t}\n \tif (adapter->aq_required & IAVF_FLAG_AQ_SET_HENA) {\n \t\tiavf_set_hena(adapter);\n-\t\tgoto watchdog_done;\n+\t\treturn 0;\n \t}\n \tif (adapter->aq_required & IAVF_FLAG_AQ_SET_RSS_KEY) {\n \t\tiavf_set_rss_key(adapter);\n-\t\tgoto watchdog_done;\n+\t\treturn 0;\n \t}\n \tif (adapter->aq_required & IAVF_FLAG_AQ_SET_RSS_LUT) {\n \t\tiavf_set_rss_lut(adapter);\n-\t\tgoto watchdog_done;\n+\t\treturn 0;\n \t}\n \n \tif (adapter->aq_required & IAVF_FLAG_AQ_REQUEST_PROMISC) {\n \t\tiavf_set_promiscuous(adapter, FLAG_VF_UNICAST_PROMISC |\n \t\t\t\t FLAG_VF_MULTICAST_PROMISC);\n-\t\tgoto watchdog_done;\n+\t\treturn 0;\n \t}\n \n \tif (adapter->aq_required & IAVF_FLAG_AQ_REQUEST_ALLMULTI) {\n \t\tiavf_set_promiscuous(adapter, FLAG_VF_MULTICAST_PROMISC);\n-\t\tgoto watchdog_done;\n+\t\treturn 0;\n \t}\n \n \tif ((adapter->aq_required & IAVF_FLAG_AQ_RELEASE_PROMISC) &&\n \t (adapter->aq_required & IAVF_FLAG_AQ_RELEASE_ALLMULTI)) {\n \t\tiavf_set_promiscuous(adapter, 0);\n-\t\tgoto watchdog_done;\n+\t\treturn 0;\n \t}\n \n \tif (adapter->aq_required & IAVF_FLAG_AQ_ENABLE_CHANNELS) {\n \t\tiavf_enable_channels(adapter);\n-\t\tgoto watchdog_done;\n+\t\treturn 0;\n \t}\n \n \tif (adapter->aq_required & IAVF_FLAG_AQ_DISABLE_CHANNELS) {\n \t\tiavf_disable_channels(adapter);\n-\t\tgoto watchdog_done;\n+\t\treturn 0;\n \t}\n-\n \tif (adapter->aq_required & IAVF_FLAG_AQ_ADD_CLOUD_FILTER) {\n \t\tiavf_add_cloud_filter(adapter);\n-\t\tgoto watchdog_done;\n+\t\treturn 0;\n \t}\n \n \tif (adapter->aq_required & IAVF_FLAG_AQ_DEL_CLOUD_FILTER) {\n \t\tiavf_del_cloud_filter(adapter);\n+\t\treturn 0;\n+\t}\n+\n+\treturn -EAGAIN;\n+}\n+\n+/**\n+ * iavf_watchdog_task - Periodic call-back task\n+ * @work: pointer to work_struct\n+ **/\n+static void iavf_watchdog_task(struct work_struct *work)\n+{\n+\tstruct iavf_adapter *adapter = container_of(work,\n+\t\t\t\t\t\t struct iavf_adapter,\n+\t\t\t\t\t\t watchdog_task);\n+\tstruct iavf_hw *hw = &adapter->hw;\n+\tu32 reg_val;\n+\n+\tif (test_and_set_bit(__IAVF_IN_CRITICAL_TASK, &adapter->crit_section))\n+\t\tgoto restart_watchdog;\n+\n+\tif (adapter->flags & IAVF_FLAG_PF_COMMS_FAILED) {\n+\t\treg_val = rd32(hw, IAVF_VFGEN_RSTAT) &\n+\t\t\t IAVF_VFGEN_RSTAT_VFR_STATE_MASK;\n+\t\tif (reg_val == VIRTCHNL_VFR_VFACTIVE ||\n+\t\t reg_val == VIRTCHNL_VFR_COMPLETED) {\n+\t\t\t/* A chance for redemption! */\n+\t\t\tdev_err(&adapter->pdev->dev, \"Hardware came out of reset. Attemptingreinit.\\n\");\n+\t\t\tadapter->state = __IAVF_STARTUP;\n+\t\t\tadapter->flags &= ~IAVF_FLAG_PF_COMMS_FAILED;\n+\t\t\tschedule_delayed_work(&adapter->init_task, 10);\n+\t\t\tclear_bit(__IAVF_IN_CRITICAL_TASK,\n+\t\t\t\t &adapter->crit_section);\n+\t\t\t/* Don't reschedule the watchdog, since we've restarted\n+\t\t\t * the init task. When init_task contacts the PF and\n+\t\t\t * gets everything set up again, it'll restart the\n+\t\t\t * watchdog for us. Down, boy. Sit. Stay. Woof.\n+\t\t\t */\n+\t\t\treturn;\n+\t\t}\n+\t\tadapter->aq_required = 0;\n+\t\tadapter->current_op = VIRTCHNL_OP_UNKNOWN;\n \t\tgoto watchdog_done;\n \t}\n \n-\tschedule_delayed_work(&adapter->client_task, msecs_to_jiffies(5));\n+\tif (adapter->state < __IAVF_DOWN ||\n+\t (adapter->flags & IAVF_FLAG_RESET_PENDING))\n+\t\tgoto watchdog_done;\n \n-\tif (adapter->state == __IAVF_RUNNING)\n+\t/* check for reset */\n+\treg_val = rd32(hw, IAVF_VF_ARQLEN1) & IAVF_VF_ARQLEN1_ARQENABLE_MASK;\n+\tif (!(adapter->flags & IAVF_FLAG_RESET_PENDING) && !reg_val) {\n+\t\tadapter->state = __IAVF_RESETTING;\n+\t\tadapter->flags |= IAVF_FLAG_RESET_PENDING;\n+\t\tdev_err(&adapter->pdev->dev, \"Hardware reset detected\\n\");\n+\t\tschedule_work(&adapter->reset_task);\n+\t\tadapter->aq_required = 0;\n+\t\tadapter->current_op = VIRTCHNL_OP_UNKNOWN;\n+\t\tgoto watchdog_done;\n+\t}\n+\n+\t/* Process admin queue tasks. After init, everything gets done\n+\t * here so we don't race on the admin queue.\n+\t * The check is made against -EAGAIN, as it's the error code that\n+\t * would be returned on no op to run. Failures of called functions\n+\t * return other values.\n+\t */\n+\tif (adapter->current_op) {\n+\t\tif (!iavf_asq_done(hw)) {\n+\t\t\tdev_dbg(&adapter->pdev->dev, \"Admin queue timeout\\n\");\n+\t\t\tiavf_send_api_ver(adapter);\n+\t\t}\n+\t} else if (iavf_process_aq_command(adapter) == -EAGAIN &&\n+\t\t adapter->state == __IAVF_RUNNING) {\n \t\tiavf_request_stats(adapter);\n+\t}\n+\n+\tschedule_delayed_work(&adapter->client_task, msecs_to_jiffies(5));\n+\n watchdog_done:\n \tif (adapter->state == __IAVF_RUNNING)\n \t\tiavf_detect_recover_hung(&adapter->vsi);\n", "prefixes": [ "next", "S5", "iavf", "06/11" ] }