Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1304287/?format=api
{ "id": 1304287, "url": "http://patchwork.ozlabs.org/api/patches/1304287/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20200605170946.23494-4-anthony.l.nguyen@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": "<20200605170946.23494-4-anthony.l.nguyen@intel.com>", "list_archive_url": null, "date": "2020-06-05T17:09:46", "name": "[4/4] iavf: increase reset complete wait time", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "363263cbafaec19496c663b6cc3648bf11a3c81f", "submitter": { "id": 68875, "url": "http://patchwork.ozlabs.org/api/people/68875/?format=api", "name": "Tony Nguyen", "email": "anthony.l.nguyen@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/20200605170946.23494-4-anthony.l.nguyen@intel.com/mbox/", "series": [ { "id": 181598, "url": "http://patchwork.ozlabs.org/api/series/181598/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=181598", "date": "2020-06-05T17:09:45", "name": "[1/4] iavf: fix speed reporting over virtchnl", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/181598/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1304287/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1304287/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 spf=pass (sender SPF authorized) smtp.mailfrom=osuosl.org\n (client-ip=140.211.166.137; helo=fraxinus.osuosl.org;\n envelope-from=intel-wired-lan-bounces@osuosl.org; receiver=<UNKNOWN>)", "ozlabs.org;\n dmarc=fail (p=none dis=none) header.from=intel.com" ], "Received": [ "from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 49dq2c1tjGz9sSf\n\tfor <incoming@patchwork.ozlabs.org>; Sat, 6 Jun 2020 03:12:24 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id CE517871D8;\n\tFri, 5 Jun 2020 17:12:22 +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 1zIpNyevtICQ; Fri, 5 Jun 2020 17:12:22 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 40A6A87184;\n\tFri, 5 Jun 2020 17:12:22 +0000 (UTC)", "from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n by ash.osuosl.org (Postfix) with ESMTP id D13C61BF30B\n for <intel-wired-lan@lists.osuosl.org>; Fri, 5 Jun 2020 17:12:19 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n by silver.osuosl.org (Postfix) with ESMTP id BC79B20371\n for <intel-wired-lan@lists.osuosl.org>; Fri, 5 Jun 2020 17:12:19 +0000 (UTC)", "from silver.osuosl.org ([127.0.0.1])\n by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n with ESMTP id mntGxE75LoZy for <intel-wired-lan@lists.osuosl.org>;\n Fri, 5 Jun 2020 17:12:16 +0000 (UTC)", "from mga04.intel.com (mga04.intel.com [192.55.52.120])\n by silver.osuosl.org (Postfix) with ESMTPS id 16633228B0\n for <intel-wired-lan@lists.osuosl.org>; Fri, 5 Jun 2020 17:12:16 +0000 (UTC)", "from orsmga006.jf.intel.com ([10.7.209.51])\n by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 05 Jun 2020 10:12:15 -0700", "from unknown (HELO localhost.jf.intel.com) ([10.166.241.65])\n by orsmga006.jf.intel.com with ESMTP; 05 Jun 2020 10:12:14 -0700" ], "X-Virus-Scanned": [ "amavisd-new at osuosl.org", "amavisd-new at osuosl.org" ], "X-Greylist": "domain auto-whitelisted by SQLgrey-1.7.6", "IronPort-SDR": [ "\n 4MSQdDhgvwX3DGEhFONFUA59MgHED6uND272CDi7qMegcgr2P3My+G0xs+RHzeSNLAq7qQnkYO\n gOj6W1LnknjQ==", "\n SC5kS4EgB/rVaKsX0jt9OCwxGFwLuBRmvFB6wn9f4t9h98vaDUyBDZIrHLF2Pty1HIX7cbsVSw\n lc1HvRw7+Wgg==" ], "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.73,477,1583222400\"; d=\"scan'208\";a=\"273530624\"", "From": "Tony Nguyen <anthony.l.nguyen@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Fri, 5 Jun 2020 10:09:46 -0700", "Message-Id": "<20200605170946.23494-4-anthony.l.nguyen@intel.com>", "X-Mailer": "git-send-email 2.20.1", "In-Reply-To": "<20200605170946.23494-1-anthony.l.nguyen@intel.com>", "References": "<20200605170946.23494-1-anthony.l.nguyen@intel.com>", "MIME-Version": "1.0", "Subject": "[Intel-wired-lan] [PATCH 4/4] iavf: increase reset complete wait\n time", "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 <intel-wired-lan.osuosl.org>", "List-Unsubscribe": "<https://lists.osuosl.org/mailman/options/intel-wired-lan>,\n <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 <mailto:intel-wired-lan-request@osuosl.org?subject=subscribe>", "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: Paul Greenwalt <paul.greenwalt@intel.com>\n\nWith an increased number of VFs, it's possible to encounter the following\nissue during reset.\n\n iavf b8d4:00:02.0: Hardware reset detected\n iavf b8d4:00:02.0: Reset never finished (0)\n iavf b8d4:00:02.0: Reset task did not complete, VF disabled\n\nIncrease the reset complete wait count to allow for 128 VFs to complete\nreset.\n\nSigned-off-by: Paul Greenwalt <paul.greenwalt@intel.com>\nSigned-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>\n---\n drivers/net/ethernet/intel/iavf/iavf.h | 4 ++++\n drivers/net/ethernet/intel/iavf/iavf_main.c | 12 +++++-------\n 2 files changed, 9 insertions(+), 7 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/iavf/iavf.h b/drivers/net/ethernet/intel/iavf/iavf.h\nindex 56cd1a39a4b5..8a65525a7c0d 100644\n--- a/drivers/net/ethernet/intel/iavf/iavf.h\n+++ b/drivers/net/ethernet/intel/iavf/iavf.h\n@@ -219,6 +219,10 @@ struct iavf_cloud_filter {\n \tbool add;\t\t/* filter needs to be added */\n };\n \n+#define IAVF_RESET_WAIT_MS 10\n+#define IAVF_RESET_WAIT_DETECTED_COUNT 500\n+#define IAVF_RESET_WAIT_COMPLETE_COUNT 2000\n+\n /* board specific private data structure */\n struct iavf_adapter {\n \tstruct work_struct reset_task;\ndiff --git a/drivers/net/ethernet/intel/iavf/iavf_main.c b/drivers/net/ethernet/intel/iavf/iavf_main.c\nindex 3f3c6260c5df..78bd9e3df3ac 100644\n--- a/drivers/net/ethernet/intel/iavf/iavf_main.c\n+++ b/drivers/net/ethernet/intel/iavf/iavf_main.c\n@@ -2035,8 +2035,6 @@ static void iavf_disable_vf(struct iavf_adapter *adapter)\n \tdev_info(&adapter->pdev->dev, \"Reset task did not complete, VF disabled\\n\");\n }\n \n-#define IAVF_RESET_WAIT_MS 10\n-#define IAVF_RESET_WAIT_COUNT 500\n /**\n * iavf_reset_task - Call-back task to handle hardware reset\n * @work: pointer to work_struct\n@@ -2090,20 +2088,20 @@ static void iavf_reset_task(struct work_struct *work)\n \tadapter->flags |= IAVF_FLAG_RESET_PENDING;\n \n \t/* poll until we see the reset actually happen */\n-\tfor (i = 0; i < IAVF_RESET_WAIT_COUNT; i++) {\n+\tfor (i = 0; i < IAVF_RESET_WAIT_DETECTED_COUNT; i++) {\n \t\treg_val = rd32(hw, IAVF_VF_ARQLEN1) &\n \t\t\t IAVF_VF_ARQLEN1_ARQENABLE_MASK;\n \t\tif (!reg_val)\n \t\t\tbreak;\n \t\tusleep_range(5000, 10000);\n \t}\n-\tif (i == IAVF_RESET_WAIT_COUNT) {\n+\tif (i == IAVF_RESET_WAIT_DETECTED_COUNT) {\n \t\tdev_info(&adapter->pdev->dev, \"Never saw reset\\n\");\n \t\tgoto continue_reset; /* act like the reset happened */\n \t}\n \n \t/* wait until the reset is complete and the PF is responding to us */\n-\tfor (i = 0; i < IAVF_RESET_WAIT_COUNT; i++) {\n+\tfor (i = 0; i < IAVF_RESET_WAIT_COMPLETE_COUNT; i++) {\n \t\t/* sleep first to make sure a minimum wait time is met */\n \t\tmsleep(IAVF_RESET_WAIT_MS);\n \n@@ -2115,7 +2113,7 @@ static void iavf_reset_task(struct work_struct *work)\n \n \tpci_set_master(adapter->pdev);\n \n-\tif (i == IAVF_RESET_WAIT_COUNT) {\n+\tif (i == IAVF_RESET_WAIT_COMPLETE_COUNT) {\n \t\tdev_err(&adapter->pdev->dev, \"Reset never finished (%x)\\n\",\n \t\t\treg_val);\n \t\tiavf_disable_vf(adapter);\n@@ -3418,7 +3416,7 @@ static int iavf_check_reset_complete(struct iavf_hw *hw)\n \tu32 rstat;\n \tint i;\n \n-\tfor (i = 0; i < 100; i++) {\n+\tfor (i = 0; i < IAVF_RESET_WAIT_COMPLETE_COUNT; i++) {\n \t\trstat = rd32(hw, IAVF_VFGEN_RSTAT) &\n \t\t\t IAVF_VFGEN_RSTAT_VFR_STATE_MASK;\n \t\tif ((rstat == VIRTCHNL_VFR_VFACTIVE) ||\n", "prefixes": [ "4/4" ] }