Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/972023/?format=api
{ "id": 972023, "url": "http://patchwork.ozlabs.org/api/patches/972023/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20180920002311.10891-7-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": "<20180920002311.10891-7-anirudh.venkataramanan@intel.com>", "list_archive_url": null, "date": "2018-09-20T00:23:09", "name": "[6/8] ice: Query the Tx scheduler node before adding it", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "5f0c3bc5106a9f88f3b4fe9781e6b2a24628a214", "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/20180920002311.10891-7-anirudh.venkataramanan@intel.com/mbox/", "series": [ { "id": 66524, "url": "http://patchwork.ozlabs.org/api/series/66524/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=66524", "date": "2018-09-20T00:23:03", "name": "Minor updates and bug fixes", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/66524/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/972023/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/972023/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 42FyBQ0SXlz9sC2\n\tfor <incoming@patchwork.ozlabs.org>;\n\tThu, 20 Sep 2018 10:23:24 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 741FC881F4;\n\tThu, 20 Sep 2018 00:23:23 +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 lxhWAw-lWRpN; Thu, 20 Sep 2018 00:23:21 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id EFC4D88209;\n\tThu, 20 Sep 2018 00:23:20 +0000 (UTC)", "from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\tby ash.osuosl.org (Postfix) with ESMTP id 48DB31C08AF\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 20 Sep 2018 00:23:19 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 4654287FF0\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 20 Sep 2018 00:23:19 +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 CEPOc4dOOGp0 for <intel-wired-lan@lists.osuosl.org>;\n\tThu, 20 Sep 2018 00:23:18 +0000 (UTC)", "from mga12.intel.com (mga12.intel.com [192.55.52.136])\n\tby whitealder.osuosl.org (Postfix) with ESMTPS id 86BB088220\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 20 Sep 2018 00:23:18 +0000 (UTC)", "from orsmga006.jf.intel.com ([10.7.209.51])\n\tby fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t19 Sep 2018 17:23:17 -0700", "from shasta.jf.intel.com ([10.166.241.11])\n\tby orsmga006.jf.intel.com with ESMTP; 19 Sep 2018 17:23:11 -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.53,396,1531810800\"; d=\"scan'208\";a=\"75747553\"", "From": "Anirudh Venkataramanan <anirudh.venkataramanan@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Wed, 19 Sep 2018 17:23:09 -0700", "Message-Id": "<20180920002311.10891-7-anirudh.venkataramanan@intel.com>", "X-Mailer": "git-send-email 2.14.3", "In-Reply-To": "<20180920002311.10891-1-anirudh.venkataramanan@intel.com>", "References": "<20180920002311.10891-1-anirudh.venkataramanan@intel.com>", "Subject": "[Intel-wired-lan] [PATCH 6/8] ice: Query the Tx scheduler node\n\tbefore adding it", "X-BeenThere": "intel-wired-lan@osuosl.org", "X-Mailman-Version": "2.1.24", "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": "Query the Tx scheduler tree node information from FW before adding it to\nthe driver's software database. This will keep the node information current\nin driver.\n\nSigned-off-by: Anirudh Venkataramanan <anirudh.venkataramanan@intel.com>\n---\n drivers/net/ethernet/intel/ice/ice_adminq_cmd.h | 5 ++\n drivers/net/ethernet/intel/ice/ice_sched.c | 67 ++++++++++++++++++++++++-\n 2 files changed, 71 insertions(+), 1 deletion(-)", "diff": "diff --git a/drivers/net/ethernet/intel/ice/ice_adminq_cmd.h b/drivers/net/ethernet/intel/ice/ice_adminq_cmd.h\nindex f8dfd675486c..c100b4bda195 100644\n--- a/drivers/net/ethernet/intel/ice/ice_adminq_cmd.h\n+++ b/drivers/net/ethernet/intel/ice/ice_adminq_cmd.h\n@@ -736,6 +736,10 @@ struct ice_aqc_add_elem {\n \tstruct ice_aqc_txsched_elem_data generic[1];\n };\n \n+struct ice_aqc_get_elem {\n+\tstruct ice_aqc_txsched_elem_data generic[1];\n+};\n+\n struct ice_aqc_get_topo_elem {\n \tstruct ice_aqc_txsched_topo_grp_info_hdr hdr;\n \tstruct ice_aqc_txsched_elem_data\n@@ -1409,6 +1413,7 @@ enum ice_adminq_opc {\n \t/* transmit scheduler commands */\n \tice_aqc_opc_get_dflt_topo\t\t\t= 0x0400,\n \tice_aqc_opc_add_sched_elems\t\t\t= 0x0401,\n+\tice_aqc_opc_get_sched_elems\t\t\t= 0x0404,\n \tice_aqc_opc_suspend_sched_elems\t\t\t= 0x0409,\n \tice_aqc_opc_resume_sched_elems\t\t\t= 0x040A,\n \tice_aqc_opc_delete_sched_elems\t\t\t= 0x040F,\ndiff --git a/drivers/net/ethernet/intel/ice/ice_sched.c b/drivers/net/ethernet/intel/ice/ice_sched.c\nindex 9b7b50554952..9c4f408f222d 100644\n--- a/drivers/net/ethernet/intel/ice/ice_sched.c\n+++ b/drivers/net/ethernet/intel/ice/ice_sched.c\n@@ -84,6 +84,62 @@ ice_sched_find_node_by_teid(struct ice_sched_node *start_node, u32 teid)\n \treturn NULL;\n }\n \n+/**\n+ * ice_aq_query_sched_elems - query scheduler elements\n+ * @hw: pointer to the hw struct\n+ * @elems_req: number of elements to query\n+ * @buf: pointer to buffer\n+ * @buf_size: buffer size in bytes\n+ * @elems_ret: returns total number of elements returned\n+ * @cd: pointer to command details structure or NULL\n+ *\n+ * Query scheduling elements (0x0404)\n+ */\n+static enum ice_status\n+ice_aq_query_sched_elems(struct ice_hw *hw, u16 elems_req,\n+\t\t\t struct ice_aqc_get_elem *buf, u16 buf_size,\n+\t\t\t u16 *elems_ret, struct ice_sq_cd *cd)\n+{\n+\tstruct ice_aqc_get_cfg_elem *cmd;\n+\tstruct ice_aq_desc desc;\n+\tenum ice_status status;\n+\n+\tcmd = &desc.params.get_update_elem;\n+\tice_fill_dflt_direct_cmd_desc(&desc, ice_aqc_opc_get_sched_elems);\n+\tcmd->num_elem_req = cpu_to_le16(elems_req);\n+\tdesc.flags |= cpu_to_le16(ICE_AQ_FLAG_RD);\n+\tstatus = ice_aq_send_cmd(hw, &desc, buf, buf_size, cd);\n+\tif (!status && elems_ret)\n+\t\t*elems_ret = le16_to_cpu(cmd->num_elem_resp);\n+\n+\treturn status;\n+}\n+\n+/**\n+ * ice_sched_query_elem - query element information from hw\n+ * @hw: pointer to the hw struct\n+ * @node_teid: node teid to be queried\n+ * @buf: buffer to element information\n+ *\n+ * This function queries HW element information\n+ */\n+static enum ice_status\n+ice_sched_query_elem(struct ice_hw *hw, u32 node_teid,\n+\t\t struct ice_aqc_get_elem *buf)\n+{\n+\tu16 buf_size, num_elem_ret = 0;\n+\tenum ice_status status;\n+\n+\tbuf_size = sizeof(*buf);\n+\tmemset(buf, 0, buf_size);\n+\tbuf->generic[0].node_teid = cpu_to_le32(node_teid);\n+\tstatus = ice_aq_query_sched_elems(hw, 1, buf, buf_size, &num_elem_ret,\n+\t\t\t\t\t NULL);\n+\tif (status || num_elem_ret != 1)\n+\t\tice_debug(hw, ICE_DBG_SCHED, \"query element failed\\n\");\n+\treturn status;\n+}\n+\n /**\n * ice_sched_add_node - Insert the Tx scheduler node in SW DB\n * @pi: port information structure\n@@ -97,7 +153,9 @@ ice_sched_add_node(struct ice_port_info *pi, u8 layer,\n \t\t struct ice_aqc_txsched_elem_data *info)\n {\n \tstruct ice_sched_node *parent;\n+\tstruct ice_aqc_get_elem elem;\n \tstruct ice_sched_node *node;\n+\tenum ice_status status;\n \tstruct ice_hw *hw;\n \n \tif (!pi)\n@@ -115,6 +173,13 @@ ice_sched_add_node(struct ice_port_info *pi, u8 layer,\n \t\treturn ICE_ERR_PARAM;\n \t}\n \n+\t/* query the current node information from FW before additing it\n+\t * to the SW DB\n+\t */\n+\tstatus = ice_sched_query_elem(hw, le32_to_cpu(info->node_teid), &elem);\n+\tif (status)\n+\t\treturn status;\n+\n \tnode = devm_kzalloc(ice_hw_to_dev(hw), sizeof(*node), GFP_KERNEL);\n \tif (!node)\n \t\treturn ICE_ERR_NO_MEMORY;\n@@ -133,7 +198,7 @@ ice_sched_add_node(struct ice_port_info *pi, u8 layer,\n \tnode->parent = parent;\n \tnode->tx_sched_layer = layer;\n \tparent->children[parent->num_children++] = node;\n-\tmemcpy(&node->info, info, sizeof(*info));\n+\tmemcpy(&node->info, &elem.generic[0], sizeof(node->info));\n \treturn 0;\n }\n \n", "prefixes": [ "6/8" ] }