Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1124634/?format=api
{ "id": 1124634, "url": "http://patchwork.ozlabs.org/api/patches/1124634/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20190628150332.59155-11-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": "<20190628150332.59155-11-anthony.l.nguyen@intel.com>", "list_archive_url": null, "date": "2019-06-28T15:03:29", "name": "[S23,v2,11/15] ice: Reduce wait times during VF bringup/reset", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "8cd4f88ac54acb2ce2e3ae78f3291030836d17b7", "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/20190628150332.59155-11-anthony.l.nguyen@intel.com/mbox/", "series": [ { "id": 116824, "url": "http://patchwork.ozlabs.org/api/series/116824/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=116824", "date": "2019-06-28T15:03:26", "name": "[S23,v2,01/15] ice: Implement ethtool ops for channels", "version": 2, "mbox": "http://patchwork.ozlabs.org/series/116824/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1124634/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1124634/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.136; helo=silver.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 silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\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 45bChD1rvXz9s5c\n\tfor <incoming@patchwork.ozlabs.org>;\n\tSat, 29 Jun 2019 09:31:24 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id AA20E22854;\n\tFri, 28 Jun 2019 23:31:22 +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 QQlxfxbxMW1s; Fri, 28 Jun 2019 23:31:15 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby silver.osuosl.org (Postfix) with ESMTP id A8A78229A3;\n\tFri, 28 Jun 2019 23:31:09 +0000 (UTC)", "from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133])\n\tby ash.osuosl.org (Postfix) with ESMTP id 5A02C1BF2E3\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 28 Jun 2019 23:31:06 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 57846882AA\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 28 Jun 2019 23:31:06 +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 SQFgdnBqpEEx for <intel-wired-lan@lists.osuosl.org>;\n\tFri, 28 Jun 2019 23:31:03 +0000 (UTC)", "from mga03.intel.com (mga03.intel.com [134.134.136.65])\n\tby hemlock.osuosl.org (Postfix) with ESMTPS id 37CD188266\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 28 Jun 2019 23:30:58 +0000 (UTC)", "from fmsmga007.fm.intel.com ([10.253.24.52])\n\tby orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t28 Jun 2019 16:30:57 -0700", "from unknown (HELO localhost.jf.intel.com) ([10.166.244.174])\n\tby fmsmga007.fm.intel.com with ESMTP; 28 Jun 2019 16:30:57 -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", "X-IronPort-AV": "E=Sophos;i=\"5.63,429,1557212400\"; d=\"scan'208\";a=\"164803445\"", "From": "Tony Nguyen <anthony.l.nguyen@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Fri, 28 Jun 2019 08:03:29 -0700", "Message-Id": "<20190628150332.59155-11-anthony.l.nguyen@intel.com>", "X-Mailer": "git-send-email 2.20.1", "In-Reply-To": "<20190628150332.59155-1-anthony.l.nguyen@intel.com>", "References": "<20190628150332.59155-1-anthony.l.nguyen@intel.com>", "MIME-Version": "1.0", "Subject": "[Intel-wired-lan] [PATCH S23 v2 11/15] ice: Reduce wait times\n\tduring VF bringup/reset", "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>", "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: Brett Creeley <brett.creeley@intel.com>\n\nCurrently there are a couple places where the VF is waiting too long when\nchecking the status of registers. This is causing the AVF driver to\nspin for longer than necessary in the __IAVF_STARTUP state. Sometimes\nit causes the AVF to go into the __IAVF_COMM_FAILED, which may retrigger\nthe __IAVF_STARTUP state. Try to reduce the chance of this happening by\nremoving unnecessary wait times in VF bringup/resets.\n\nSigned-off-by: Brett Creeley <brett.creeley@intel.com>\n---\n .../net/ethernet/intel/ice/ice_virtchnl_pf.c | 26 +++++++++++--------\n .../net/ethernet/intel/ice/ice_virtchnl_pf.h | 4 +++\n 2 files changed, 19 insertions(+), 11 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c b/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c\nindex b1972c39c232..f2ebbe83ae4c 100644\n--- a/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c\n+++ b/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c\n@@ -382,12 +382,15 @@ static void ice_trigger_vf_reset(struct ice_vf *vf, bool is_vflr)\n \n \twr32(hw, PF_PCI_CIAA,\n \t VF_DEVICE_STATUS | (vf_abs_id << PF_PCI_CIAA_VF_NUM_S));\n-\tfor (i = 0; i < 100; i++) {\n+\tfor (i = 0; i < ICE_PCI_CIAD_WAIT_COUNT; i++) {\n \t\treg = rd32(hw, PF_PCI_CIAD);\n-\t\tif ((reg & VF_TRANS_PENDING_M) != 0)\n-\t\t\tdev_err(&pf->pdev->dev,\n-\t\t\t\t\"VF %d PCI transactions stuck\\n\", vf->vf_id);\n-\t\tudelay(1);\n+\t\t/* no transactions pending so stop polling */\n+\t\tif ((reg & VF_TRANS_PENDING_M) == 0)\n+\t\t\tbreak;\n+\n+\t\tdev_err(&pf->pdev->dev,\n+\t\t\t\"VF %d PCI transactions stuck\\n\", vf->vf_id);\n+\t\tudelay(ICE_PCI_CIAD_WAIT_DELAY_US);\n \t}\n }\n \n@@ -1069,7 +1072,6 @@ bool ice_reset_all_vfs(struct ice_pf *pf, bool is_vflr)\n \t * finished resetting.\n \t */\n \tfor (i = 0, v = 0; i < 10 && v < pf->num_alloc_vfs; i++) {\n-\t\tusleep_range(10000, 20000);\n \n \t\t/* Check each VF in sequence */\n \t\twhile (v < pf->num_alloc_vfs) {\n@@ -1077,8 +1079,11 @@ bool ice_reset_all_vfs(struct ice_pf *pf, bool is_vflr)\n \n \t\t\tvf = &pf->vf[v];\n \t\t\treg = rd32(hw, VPGEN_VFRSTAT(vf->vf_id));\n-\t\t\tif (!(reg & VPGEN_VFRSTAT_VFRD_M))\n+\t\t\tif (!(reg & VPGEN_VFRSTAT_VFRD_M)) {\n+\t\t\t\t/* only delay if the check failed */\n+\t\t\t\tusleep_range(10, 20);\n \t\t\t\tbreak;\n+\t\t\t}\n \n \t\t\t/* If the current VF has finished resetting, move on\n \t\t\t * to the next VF in sequence.\n@@ -1092,7 +1097,6 @@ bool ice_reset_all_vfs(struct ice_pf *pf, bool is_vflr)\n \t */\n \tif (v < pf->num_alloc_vfs)\n \t\tdev_warn(&pf->pdev->dev, \"VF reset check timeout\\n\");\n-\tusleep_range(10000, 20000);\n \n \t/* free VF resources to begin resetting the VSI state */\n \tfor (v = 0; v < pf->num_alloc_vfs; v++) {\n@@ -1166,12 +1170,14 @@ static bool ice_reset_vf(struct ice_vf *vf, bool is_vflr)\n \t\t * poll the status register to make sure that the reset\n \t\t * completed successfully.\n \t\t */\n-\t\tusleep_range(10000, 20000);\n \t\treg = rd32(hw, VPGEN_VFRSTAT(vf->vf_id));\n \t\tif (reg & VPGEN_VFRSTAT_VFRD_M) {\n \t\t\trsd = true;\n \t\t\tbreak;\n \t\t}\n+\n+\t\t/* only sleep if the reset is not done */\n+\t\tusleep_range(10, 20);\n \t}\n \n \t/* Display a warning if VF didn't manage to reset in time, but need to\n@@ -1181,8 +1187,6 @@ static bool ice_reset_vf(struct ice_vf *vf, bool is_vflr)\n \t\tdev_warn(&pf->pdev->dev, \"VF reset check timeout on VF %d\\n\",\n \t\t\t vf->vf_id);\n \n-\tusleep_range(10000, 20000);\n-\n \t/* disable promiscuous modes in case they were enabled\n \t * ignore any error if disabling process failed\n \t */\ndiff --git a/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.h b/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.h\nindex 424bc0538956..79bb47f73879 100644\n--- a/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.h\n+++ b/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.h\n@@ -22,6 +22,10 @@\n #define VF_DEVICE_STATUS\t\t0xAA\n #define VF_TRANS_PENDING_M\t\t0x20\n \n+/* wait defines for polling PF_PCI_CIAD register status */\n+#define ICE_PCI_CIAD_WAIT_COUNT\t\t100\n+#define ICE_PCI_CIAD_WAIT_DELAY_US\t1\n+\n /* Specific VF states */\n enum ice_vf_states {\n \tICE_VF_STATE_INIT = 0,\n", "prefixes": [ "S23", "v2", "11/15" ] }