Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/989696/?format=api
{ "id": 989696, "url": "http://patchwork.ozlabs.org/api/patches/989696/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20181026174105.11628-12-anirudh.venkataramanan@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": "<20181026174105.11628-12-anirudh.venkataramanan@intel.com>", "list_archive_url": null, "date": "2018-10-26T17:41:00", "name": "[S8,11/16] ice: Fix debug print in ice_tx_timeout", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "8426066ff98ed09d8abf5955916f0536c22997b8", "submitter": { "id": 73601, "url": "http://patchwork.ozlabs.org/api/people/73601/?format=api", "name": "Anirudh Venkataramanan", "email": "anirudh.venkataramanan@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/20181026174105.11628-12-anirudh.venkataramanan@intel.com/mbox/", "series": [ { "id": 72783, "url": "http://patchwork.ozlabs.org/api/series/72783/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=72783", "date": "2018-10-26T17:40:52", "name": "Bug fixes for ice, set 1/2", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/72783/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/989696/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/989696/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 42hWjz71xRz9sLt\n\tfor <incoming@patchwork.ozlabs.org>;\n\tSat, 27 Oct 2018 04:50:31 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id 6BA06306B0;\n\tFri, 26 Oct 2018 17:50:30 +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 fKzvrnrSSG33; Fri, 26 Oct 2018 17:50:29 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby silver.osuosl.org (Postfix) with ESMTP id 86546227DB;\n\tFri, 26 Oct 2018 17:50:29 +0000 (UTC)", "from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\n\tby ash.osuosl.org (Postfix) with ESMTP id 933AB1BF30F\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 26 Oct 2018 17:50:27 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 90C228706A\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 26 Oct 2018 17:50:27 +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 dDZGVc4i8Fvu for <intel-wired-lan@lists.osuosl.org>;\n\tFri, 26 Oct 2018 17:50:27 +0000 (UTC)", "from mga03.intel.com (mga03.intel.com [134.134.136.65])\n\tby fraxinus.osuosl.org (Postfix) with ESMTPS id 0645686EEE\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 26 Oct 2018 17:50:26 +0000 (UTC)", "from orsmga004.jf.intel.com ([10.7.209.38])\n\tby orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t26 Oct 2018 10:41:06 -0700", "from shasta.jf.intel.com ([10.166.241.11])\n\tby orsmga004.jf.intel.com with ESMTP; 26 Oct 2018 10:41: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-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.54,428,1534834800\"; d=\"scan'208\";a=\"244654992\"", "From": "Anirudh Venkataramanan <anirudh.venkataramanan@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Fri, 26 Oct 2018 10:41:00 -0700", "Message-Id": "<20181026174105.11628-12-anirudh.venkataramanan@intel.com>", "X-Mailer": "git-send-email 2.14.3", "In-Reply-To": "<20181026174105.11628-1-anirudh.venkataramanan@intel.com>", "References": "<20181026174105.11628-1-anirudh.venkataramanan@intel.com>", "Subject": "[Intel-wired-lan] [PATCH S8 11/16] ice: Fix debug print in\n\tice_tx_timeout", "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>", "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": "From: Brett Creeley <brett.creeley@intel.com>\n\nCurrently the debug print in ice_tx_timeout is printing useless and\nduplicate values. First, head is being assigned to tx_ring->next_to_clean\nand we are printing both of those values, but naming them HWB and NTC\nrespectively. Also, reading tail always returns 0 so remove that as well.\n\nInstead of assigning head the SW head (NTC) read the actual head register\nand change the debug print to note that this is HW_HEAD. Also reduce thei\nscope of a couple variables.\n\nSigned-off-by: Brett Creeley <brett.creeley@intel.com>\nSigned-off-by: Anirudh Venkataramanan <anirudh.venkataramanan@intel.com>\n---\n[Anirudh Venkataramanan <anirudh.venkataramanan@intel.com> cleaned up commit message]\n---\n drivers/net/ethernet/intel/ice/ice_hw_autogen.h | 3 +++\n drivers/net/ethernet/intel/ice/ice_main.c | 15 +++++++++------\n 2 files changed, 12 insertions(+), 6 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/ice/ice_hw_autogen.h b/drivers/net/ethernet/intel/ice/ice_hw_autogen.h\nindex 596b9fb1c510..5507928c8fbe 100644\n--- a/drivers/net/ethernet/intel/ice/ice_hw_autogen.h\n+++ b/drivers/net/ethernet/intel/ice/ice_hw_autogen.h\n@@ -7,6 +7,9 @@\n #define _ICE_HW_AUTOGEN_H_\n \n #define QTX_COMM_DBELL(_DBQM)\t\t\t(0x002C0000 + ((_DBQM) * 4))\n+#define QTX_COMM_HEAD(_DBQM)\t\t\t(0x000E0000 + ((_DBQM) * 4))\n+#define QTX_COMM_HEAD_HEAD_S\t\t\t0\n+#define QTX_COMM_HEAD_HEAD_M\t\t\tICE_M(0x1FFF, 0)\n #define PF_FW_ARQBAH\t\t\t\t0x00080180\n #define PF_FW_ARQBAL\t\t\t\t0x00080080\n #define PF_FW_ARQH\t\t\t\t0x00080380\ndiff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c\nindex 333312a1d595..8584061e1bc6 100644\n--- a/drivers/net/ethernet/intel/ice/ice_main.c\n+++ b/drivers/net/ethernet/intel/ice/ice_main.c\n@@ -3691,8 +3691,8 @@ static void ice_tx_timeout(struct net_device *netdev)\n \tstruct ice_ring *tx_ring = NULL;\n \tstruct ice_vsi *vsi = np->vsi;\n \tstruct ice_pf *pf = vsi->back;\n-\tu32 head, val = 0, i;\n \tint hung_queue = -1;\n+\tu32 i;\n \n \tpf->tx_timeout_count++;\n \n@@ -3736,17 +3736,20 @@ static void ice_tx_timeout(struct net_device *netdev)\n \t\treturn;\n \n \tif (tx_ring) {\n-\t\thead = tx_ring->next_to_clean;\n+\t\tstruct ice_hw *hw = &pf->hw;\n+\t\tu32 head, val = 0;\n+\n+\t\thead = (rd32(hw, QTX_COMM_HEAD(vsi->txq_map[hung_queue])) &\n+\t\t\tQTX_COMM_HEAD_HEAD_M) >> QTX_COMM_HEAD_HEAD_S;\n \t\t/* Read interrupt register */\n \t\tif (test_bit(ICE_FLAG_MSIX_ENA, pf->flags))\n-\t\t\tval = rd32(&pf->hw,\n+\t\t\tval = rd32(hw,\n \t\t\t\t GLINT_DYN_CTL(tx_ring->q_vector->v_idx +\n \t\t\t\t\ttx_ring->vsi->hw_base_vector));\n \n-\t\tnetdev_info(netdev, \"tx_timeout: VSI_num: %d, Q %d, NTC: 0x%x, HWB: 0x%x, NTU: 0x%x, TAIL: 0x%x, INT: 0x%x\\n\",\n+\t\tnetdev_info(netdev, \"tx_timeout: VSI_num: %d, Q %d, NTC: 0x%x, HW_HEAD: 0x%x, NTU: 0x%x, INT: 0x%x\\n\",\n \t\t\t vsi->vsi_num, hung_queue, tx_ring->next_to_clean,\n-\t\t\t head, tx_ring->next_to_use,\n-\t\t\t readl(tx_ring->tail), val);\n+\t\t\t head, tx_ring->next_to_use, val);\n \t}\n \n \tpf->tx_timeout_last_recovery = jiffies;\n", "prefixes": [ "S8", "11/16" ] }