Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1086484/?format=api
{ "id": 1086484, "url": "http://patchwork.ozlabs.org/api/patches/1086484/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20190416173052.28928-15-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": "<20190416173052.28928-15-anirudh.venkataramanan@intel.com>", "list_archive_url": null, "date": "2019-04-16T17:30:51", "name": "[S20,14/15] ice: Add a helper to trigger software interrupt", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "f6089577866d3518f4f9c38266b5137b580d6fa1", "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/20190416173052.28928-15-anirudh.venkataramanan@intel.com/mbox/", "series": [ { "id": 103108, "url": "http://patchwork.ozlabs.org/api/series/103108/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=103108", "date": "2019-04-16T17:30:37", "name": "Fixes and feature updates for ice", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/103108/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1086484/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1086484/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.137; helo=fraxinus.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 fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\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 44kC8q0VF3z9s3l\n\tfor <incoming@patchwork.ozlabs.org>;\n\tWed, 17 Apr 2019 03:31:38 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 86AE685F43;\n\tTue, 16 Apr 2019 17:31:37 +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 ng8R0r-ONF4r; Tue, 16 Apr 2019 17:31:34 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 9914185F44;\n\tTue, 16 Apr 2019 17:31:34 +0000 (UTC)", "from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\tby ash.osuosl.org (Postfix) with ESMTP id 0AEB01BF28D\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 16 Apr 2019 17:31:32 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id F2815241AE\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 16 Apr 2019 17:31:31 +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 VT+g-xujc3ne for <intel-wired-lan@lists.osuosl.org>;\n\tTue, 16 Apr 2019 17:31:28 +0000 (UTC)", "from mga09.intel.com (mga09.intel.com [134.134.136.24])\n\tby silver.osuosl.org (Postfix) with ESMTPS id B538125AA6\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 16 Apr 2019 17:31:27 +0000 (UTC)", "from orsmga002.jf.intel.com ([10.7.209.21])\n\tby orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t16 Apr 2019 10:31:25 -0700", "from shasta.jf.intel.com ([10.166.244.191])\n\tby orsmga002.jf.intel.com with ESMTP; 16 Apr 2019 10:31:25 -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.60,358,1549958400\"; d=\"scan'208\";a=\"151390492\"", "From": "Anirudh Venkataramanan <anirudh.venkataramanan@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Tue, 16 Apr 2019 10:30:51 -0700", "Message-Id": "<20190416173052.28928-15-anirudh.venkataramanan@intel.com>", "X-Mailer": "git-send-email 2.20.1", "In-Reply-To": "<20190416173052.28928-1-anirudh.venkataramanan@intel.com>", "References": "<20190416173052.28928-1-anirudh.venkataramanan@intel.com>", "MIME-Version": "1.0", "Subject": "[Intel-wired-lan] [PATCH S20 14/15] ice: Add a helper to trigger\n\tsoftware interrupt", "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\nAdd a new function ice_trigger_sw_intr to trigger interrupts.\n\nSigned-off-by: Brett Creeley <brett.creeley@intel.com>\nSigned-off-by: Anirudh Venkataramanan <anirudh.venkataramanan@intel.com>\n---\n drivers/net/ethernet/intel/ice/ice_lib.c | 24 +++++++++++++++++------\n drivers/net/ethernet/intel/ice/ice_lib.h | 2 ++\n drivers/net/ethernet/intel/ice/ice_main.c | 14 +++++--------\n 3 files changed, 25 insertions(+), 15 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/ice/ice_lib.c b/drivers/net/ethernet/intel/ice/ice_lib.c\nindex 74008d748f3a..8db9427d863f 100644\n--- a/drivers/net/ethernet/intel/ice/ice_lib.c\n+++ b/drivers/net/ethernet/intel/ice/ice_lib.c\n@@ -2018,6 +2018,19 @@ int ice_vsi_stop_rx_rings(struct ice_vsi *vsi)\n \treturn ice_vsi_ctrl_rx_rings(vsi, false);\n }\n \n+/**\n+ * ice_trigger_sw_intr - trigger a software interrupt\n+ * @hw: pointer to the HW structure\n+ * @q_vector: interrupt vector to trigger the software interrupt for\n+ */\n+void ice_trigger_sw_intr(struct ice_hw *hw, struct ice_q_vector *q_vector)\n+{\n+\twr32(hw, GLINT_DYN_CTL(q_vector->reg_idx),\n+\t (ICE_ITR_NONE << GLINT_DYN_CTL_ITR_INDX_S) |\n+\t GLINT_DYN_CTL_SWINT_TRIG_M |\n+\t GLINT_DYN_CTL_INTENA_M);\n+}\n+\n /**\n * ice_vsi_stop_tx_rings - Disable Tx rings\n * @vsi: the VSI being configured\n@@ -2065,6 +2078,8 @@ ice_vsi_stop_tx_rings(struct ice_vsi *vsi, enum ice_disq_rst_src rst_src,\n \t\t\tbreak;\n \n \t\tfor (i = 0; i < vsi->tc_cfg.tc_info[tc].qcount_tx; i++) {\n+\t\t\tstruct ice_q_vector *q_vector;\n+\n \t\t\tif (!rings || !rings[q_idx]) {\n \t\t\t\terr = -EINVAL;\n \t\t\t\tgoto err_out;\n@@ -2085,13 +2100,10 @@ ice_vsi_stop_tx_rings(struct ice_vsi *vsi, enum ice_disq_rst_src rst_src,\n \t\t\t/* trigger a software interrupt for the vector\n \t\t\t * associated to the queue to schedule NAPI handler\n \t\t\t */\n-\t\t\tif (rings[q_idx]->q_vector) {\n-\t\t\t\tint reg_idx = rings[i]->q_vector->reg_idx;\n+\t\t\tq_vector = rings[i]->q_vector;\n+\t\t\tif (q_vector)\n+\t\t\t\tice_trigger_sw_intr(hw, q_vector);\n \n-\t\t\t\twr32(hw, GLINT_DYN_CTL(reg_idx),\n-\t\t\t\t GLINT_DYN_CTL_SWINT_TRIG_M |\n-\t\t\t\t GLINT_DYN_CTL_INTENA_MSK_M);\n-\t\t\t}\n \t\t\tq_idx++;\n \t\t}\n \t\tstatus = ice_dis_vsi_txq(vsi->port_info, vsi->idx, tc,\ndiff --git a/drivers/net/ethernet/intel/ice/ice_lib.h b/drivers/net/ethernet/intel/ice/ice_lib.h\nindex a91d3553cc89..3605b7ca9120 100644\n--- a/drivers/net/ethernet/intel/ice/ice_lib.h\n+++ b/drivers/net/ethernet/intel/ice/ice_lib.h\n@@ -64,6 +64,8 @@ bool ice_is_reset_in_progress(unsigned long *state);\n \n void ice_vsi_free_q_vectors(struct ice_vsi *vsi);\n \n+void ice_trigger_sw_intr(struct ice_hw *hw, struct ice_q_vector *q_vector);\n+\n void ice_vsi_put_qs(struct ice_vsi *vsi);\n \n #ifdef CONFIG_DCB\ndiff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c\nindex 95ac79bfd92a..0bcc8402a5ee 100644\n--- a/drivers/net/ethernet/intel/ice/ice_main.c\n+++ b/drivers/net/ethernet/intel/ice/ice_main.c\n@@ -61,9 +61,10 @@ static u32 ice_get_tx_pending(struct ice_ring *ring)\n static void ice_check_for_hang_subtask(struct ice_pf *pf)\n {\n \tstruct ice_vsi *vsi = NULL;\n+\tstruct ice_hw *hw;\n \tunsigned int i;\n-\tu32 v, v_idx;\n \tint packets;\n+\tu32 v;\n \n \tice_for_each_vsi(pf, v)\n \t\tif (pf->vsi[v] && pf->vsi[v]->type == ICE_VSI_PF) {\n@@ -77,12 +78,12 @@ static void ice_check_for_hang_subtask(struct ice_pf *pf)\n \tif (!(vsi->netdev && netif_carrier_ok(vsi->netdev)))\n \t\treturn;\n \n+\thw = &vsi->back->hw;\n+\n \tfor (i = 0; i < vsi->num_txq; i++) {\n \t\tstruct ice_ring *tx_ring = vsi->tx_rings[i];\n \n \t\tif (tx_ring && tx_ring->desc) {\n-\t\t\tint itr = ICE_ITR_NONE;\n-\n \t\t\t/* If packet counter has not changed the queue is\n \t\t\t * likely stalled, so force an interrupt for this\n \t\t\t * queue.\n@@ -93,12 +94,7 @@ static void ice_check_for_hang_subtask(struct ice_pf *pf)\n \t\t\tpackets = tx_ring->stats.pkts & INT_MAX;\n \t\t\tif (tx_ring->tx_stats.prev_pkt == packets) {\n \t\t\t\t/* Trigger sw interrupt to revive the queue */\n-\t\t\t\tv_idx = tx_ring->q_vector->v_idx;\n-\t\t\t\twr32(&vsi->back->hw,\n-\t\t\t\t GLINT_DYN_CTL(vsi->base_vector + v_idx),\n-\t\t\t\t (itr << GLINT_DYN_CTL_ITR_INDX_S) |\n-\t\t\t\t GLINT_DYN_CTL_SWINT_TRIG_M |\n-\t\t\t\t GLINT_DYN_CTL_INTENA_MSK_M);\n+\t\t\t\tice_trigger_sw_intr(hw, tx_ring->q_vector);\n \t\t\t\tcontinue;\n \t\t\t}\n \n", "prefixes": [ "S20", "14/15" ] }