Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/54298/?format=api
{ "id": 54298, "url": "http://patches.dpdk.org/api/patches/54298/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20190604054248.68510-23-leyi.rong@intel.com/", "project": { "id": 1, "url": "http://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20190604054248.68510-23-leyi.rong@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20190604054248.68510-23-leyi.rong@intel.com", "date": "2019-06-04T05:42:21", "name": "[22/49] net/ice/base: add and fix debuglogs", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "1cf84e7316850d90fab27b8f89c9491883171adc", "submitter": { "id": 1204, "url": "http://patches.dpdk.org/api/people/1204/?format=api", "name": "Leyi Rong", "email": "leyi.rong@intel.com" }, "delegate": { "id": 1540, "url": "http://patches.dpdk.org/api/users/1540/?format=api", "username": "qzhan15", "first_name": "Qi", "last_name": "Zhang", "email": "qi.z.zhang@intel.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20190604054248.68510-23-leyi.rong@intel.com/mbox/", "series": [ { "id": 4879, "url": "http://patches.dpdk.org/api/series/4879/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=4879", "date": "2019-06-04T05:41:59", "name": "shared code update", "version": 1, "mbox": "http://patches.dpdk.org/series/4879/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/54298/comments/", "check": "fail", "checks": "http://patches.dpdk.org/api/patches/54298/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@dpdk.org", "Delivered-To": "patchwork@dpdk.org", "Received": [ "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 920AD1BB72;\n\tTue, 4 Jun 2019 07:44:56 +0200 (CEST)", "from mga04.intel.com (mga04.intel.com [192.55.52.120])\n\tby dpdk.org (Postfix) with ESMTP id 2D40F1BA7F\n\tfor <dev@dpdk.org>; Tue, 4 Jun 2019 07:44:18 +0200 (CEST)", "from fmsmga008.fm.intel.com ([10.253.24.58])\n\tby fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t03 Jun 2019 22:44:17 -0700", "from lrong-srv-03.sh.intel.com ([10.67.119.177])\n\tby fmsmga008.fm.intel.com with ESMTP; 03 Jun 2019 22:44:16 -0700" ], "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "From": "Leyi Rong <leyi.rong@intel.com>", "To": "qi.z.zhang@intel.com", "Cc": "dev@dpdk.org, Leyi Rong <leyi.rong@intel.com>,\n\tMarta Plantykow <marta.a.plantykow@intel.com>,\n\tPaul M Stillwell Jr <paul.m.stillwell.jr@intel.com>", "Date": "Tue, 4 Jun 2019 13:42:21 +0800", "Message-Id": "<20190604054248.68510-23-leyi.rong@intel.com>", "X-Mailer": "git-send-email 2.17.1", "In-Reply-To": "<20190604054248.68510-1-leyi.rong@intel.com>", "References": "<20190604054248.68510-1-leyi.rong@intel.com>", "Subject": "[dpdk-dev] [PATCH 22/49] net/ice/base: add and fix debuglogs", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n\t<mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "Adding missing debuglogs and fixing existing debuglogs.\n\nSigned-off-by: Marta Plantykow <marta.a.plantykow@intel.com>\nSigned-off-by: Paul M Stillwell Jr <paul.m.stillwell.jr@intel.com>\nSigned-off-by: Leyi Rong <leyi.rong@intel.com>\n---\n drivers/net/ice/base/ice_common.c | 16 +++----\n drivers/net/ice/base/ice_controlq.c | 19 ++++++++\n drivers/net/ice/base/ice_flex_pipe.c | 70 ++++++++++++++++++++++++++++\n drivers/net/ice/base/ice_flex_pipe.h | 1 +\n drivers/net/ice/base/ice_nvm.c | 14 +++---\n 5 files changed, 105 insertions(+), 15 deletions(-)", "diff": "diff --git a/drivers/net/ice/base/ice_common.c b/drivers/net/ice/base/ice_common.c\nindex 7f7f4dad0..da72434d3 100644\n--- a/drivers/net/ice/base/ice_common.c\n+++ b/drivers/net/ice/base/ice_common.c\n@@ -833,7 +833,7 @@ enum ice_status ice_init_hw(struct ice_hw *hw)\n \tu16 mac_buf_len;\n \tvoid *mac_buf;\n \n-\tice_debug(hw, ICE_DBG_TRACE, \"ice_init_hw\");\n+\tice_debug(hw, ICE_DBG_TRACE, \"%s\\n\", __func__);\n \n \n \t/* Set MAC type based on DeviceID */\n@@ -1623,7 +1623,7 @@ ice_aq_req_res(struct ice_hw *hw, enum ice_aq_res_ids res,\n \tstruct ice_aq_desc desc;\n \tenum ice_status status;\n \n-\tice_debug(hw, ICE_DBG_TRACE, \"ice_aq_req_res\");\n+\tice_debug(hw, ICE_DBG_TRACE, \"%s\\n\", __func__);\n \n \tcmd_resp = &desc.params.res_owner;\n \n@@ -1692,7 +1692,7 @@ ice_aq_release_res(struct ice_hw *hw, enum ice_aq_res_ids res, u8 sdp_number,\n \tstruct ice_aqc_req_res *cmd;\n \tstruct ice_aq_desc desc;\n \n-\tice_debug(hw, ICE_DBG_TRACE, \"ice_aq_release_res\");\n+\tice_debug(hw, ICE_DBG_TRACE, \"%s\\n\", __func__);\n \n \tcmd = &desc.params.res_owner;\n \n@@ -1722,7 +1722,7 @@ ice_acquire_res(struct ice_hw *hw, enum ice_aq_res_ids res,\n \tu32 time_left = timeout;\n \tenum ice_status status;\n \n-\tice_debug(hw, ICE_DBG_TRACE, \"ice_acquire_res\");\n+\tice_debug(hw, ICE_DBG_TRACE, \"%s\\n\", __func__);\n \n \tstatus = ice_aq_req_res(hw, res, access, 0, &time_left, NULL);\n \n@@ -1780,7 +1780,7 @@ void ice_release_res(struct ice_hw *hw, enum ice_aq_res_ids res)\n \tenum ice_status status;\n \tu32 total_delay = 0;\n \n-\tice_debug(hw, ICE_DBG_TRACE, \"ice_release_res\");\n+\tice_debug(hw, ICE_DBG_TRACE, \"%s\\n\", __func__);\n \n \tstatus = ice_aq_release_res(hw, res, 0, NULL);\n \n@@ -1814,7 +1814,7 @@ ice_aq_alloc_free_res(struct ice_hw *hw, u16 num_entries,\n \tstruct ice_aqc_alloc_free_res_cmd *cmd;\n \tstruct ice_aq_desc desc;\n \n-\tice_debug(hw, ICE_DBG_TRACE, \"ice_aq_alloc_free_res\");\n+\tice_debug(hw, ICE_DBG_TRACE, \"%s\\n\", __func__);\n \n \tcmd = &desc.params.sw_res_ctrl;\n \n@@ -3189,7 +3189,7 @@ ice_aq_add_lan_txq(struct ice_hw *hw, u8 num_qgrps,\n \tstruct ice_aqc_add_txqs *cmd;\n \tstruct ice_aq_desc desc;\n \n-\tice_debug(hw, ICE_DBG_TRACE, \"ice_aq_add_lan_txq\");\n+\tice_debug(hw, ICE_DBG_TRACE, \"%s\\n\", __func__);\n \n \tcmd = &desc.params.add_txqs;\n \n@@ -3245,7 +3245,7 @@ ice_aq_dis_lan_txq(struct ice_hw *hw, u8 num_qgrps,\n \tenum ice_status status;\n \tu16 i, sz = 0;\n \n-\tice_debug(hw, ICE_DBG_TRACE, \"ice_aq_dis_lan_txq\");\n+\tice_debug(hw, ICE_DBG_TRACE, \"%s\\n\", __func__);\n \tcmd = &desc.params.dis_txqs;\n \tice_fill_dflt_direct_cmd_desc(&desc, ice_aqc_opc_dis_txqs);\n \ndiff --git a/drivers/net/ice/base/ice_controlq.c b/drivers/net/ice/base/ice_controlq.c\nindex 6d893e2f2..4cb6df113 100644\n--- a/drivers/net/ice/base/ice_controlq.c\n+++ b/drivers/net/ice/base/ice_controlq.c\n@@ -35,6 +35,8 @@ static void ice_adminq_init_regs(struct ice_hw *hw)\n {\n \tstruct ice_ctl_q_info *cq = &hw->adminq;\n \n+\tice_debug(hw, ICE_DBG_TRACE, \"%s\\n\", __func__);\n+\n \tICE_CQ_INIT_REGS(cq, PF_FW);\n }\n \n@@ -295,6 +297,8 @@ static enum ice_status ice_init_sq(struct ice_hw *hw, struct ice_ctl_q_info *cq)\n {\n \tenum ice_status ret_code;\n \n+\tice_debug(hw, ICE_DBG_TRACE, \"%s\\n\", __func__);\n+\n \tif (cq->sq.count > 0) {\n \t\t/* queue already initialized */\n \t\tret_code = ICE_ERR_NOT_READY;\n@@ -354,6 +358,8 @@ static enum ice_status ice_init_rq(struct ice_hw *hw, struct ice_ctl_q_info *cq)\n {\n \tenum ice_status ret_code;\n \n+\tice_debug(hw, ICE_DBG_TRACE, \"%s\\n\", __func__);\n+\n \tif (cq->rq.count > 0) {\n \t\t/* queue already initialized */\n \t\tret_code = ICE_ERR_NOT_READY;\n@@ -422,6 +428,8 @@ ice_shutdown_sq(struct ice_hw *hw, struct ice_ctl_q_info *cq)\n {\n \tenum ice_status ret_code = ICE_SUCCESS;\n \n+\tice_debug(hw, ICE_DBG_TRACE, \"%s\\n\", __func__);\n+\n \tice_acquire_lock(&cq->sq_lock);\n \n \tif (!cq->sq.count) {\n@@ -485,6 +493,8 @@ ice_shutdown_rq(struct ice_hw *hw, struct ice_ctl_q_info *cq)\n {\n \tenum ice_status ret_code = ICE_SUCCESS;\n \n+\tice_debug(hw, ICE_DBG_TRACE, \"%s\\n\", __func__);\n+\n \tice_acquire_lock(&cq->rq_lock);\n \n \tif (!cq->rq.count) {\n@@ -521,6 +531,8 @@ static enum ice_status ice_init_check_adminq(struct ice_hw *hw)\n \tstruct ice_ctl_q_info *cq = &hw->adminq;\n \tenum ice_status status;\n \n+\tice_debug(hw, ICE_DBG_TRACE, \"%s\\n\", __func__);\n+\n \n \tstatus = ice_aq_get_fw_ver(hw, NULL);\n \tif (status)\n@@ -559,6 +571,8 @@ static enum ice_status ice_init_ctrlq(struct ice_hw *hw, enum ice_ctl_q q_type)\n \tstruct ice_ctl_q_info *cq;\n \tenum ice_status ret_code;\n \n+\tice_debug(hw, ICE_DBG_TRACE, \"%s\\n\", __func__);\n+\n \tswitch (q_type) {\n \tcase ICE_CTL_Q_ADMIN:\n \t\tice_adminq_init_regs(hw);\n@@ -617,6 +631,8 @@ enum ice_status ice_init_all_ctrlq(struct ice_hw *hw)\n {\n \tenum ice_status ret_code;\n \n+\tice_debug(hw, ICE_DBG_TRACE, \"%s\\n\", __func__);\n+\n \n \t/* Init FW admin queue */\n \tret_code = ice_init_ctrlq(hw, ICE_CTL_Q_ADMIN);\n@@ -677,6 +693,8 @@ static void ice_shutdown_ctrlq(struct ice_hw *hw, enum ice_ctl_q q_type)\n {\n \tstruct ice_ctl_q_info *cq;\n \n+\tice_debug(hw, ICE_DBG_TRACE, \"%s\\n\", __func__);\n+\n \tswitch (q_type) {\n \tcase ICE_CTL_Q_ADMIN:\n \t\tcq = &hw->adminq;\n@@ -704,6 +722,7 @@ static void ice_shutdown_ctrlq(struct ice_hw *hw, enum ice_ctl_q q_type)\n */\n void ice_shutdown_all_ctrlq(struct ice_hw *hw)\n {\n+\tice_debug(hw, ICE_DBG_TRACE, \"ice_shutdown_all_ctrlq\\n\");\n \t/* Shutdown FW admin queue */\n \tice_shutdown_ctrlq(hw, ICE_CTL_Q_ADMIN);\n \t/* Shutdown PF-VF Mailbox */\ndiff --git a/drivers/net/ice/base/ice_flex_pipe.c b/drivers/net/ice/base/ice_flex_pipe.c\nindex b569b91a7..e7e349298 100644\n--- a/drivers/net/ice/base/ice_flex_pipe.c\n+++ b/drivers/net/ice/base/ice_flex_pipe.c\n@@ -2417,6 +2417,11 @@ ice_vsig_free(struct ice_hw *hw, enum ice_block blk, u16 vsig)\n \t\tice_free(hw, del);\n \t}\n \n+\t/* if VSIG characteristic list was cleared for reset\n+\t * re-initialize the list head\n+\t */\n+\tINIT_LIST_HEAD(&hw->blk[blk].xlt2.vsig_tbl[idx].prop_lst);\n+\n \treturn ICE_SUCCESS;\n }\n \n@@ -3138,6 +3143,71 @@ static void ice_init_flow_profs(struct ice_hw *hw, u8 blk_idx)\n \tINIT_LIST_HEAD(&hw->fl_profs[blk_idx]);\n }\n \n+/**\n+ * ice_clear_hw_tbls - clear HW tables and flow profiles\n+ * @hw: pointer to the hardware structure\n+ */\n+void ice_clear_hw_tbls(struct ice_hw *hw)\n+{\n+\tu8 i;\n+\n+\tfor (i = 0; i < ICE_BLK_COUNT; i++) {\n+\t\tstruct ice_prof_redir *prof_redir = &hw->blk[i].prof_redir;\n+\t\tstruct ice_prof_tcam *prof = &hw->blk[i].prof;\n+\t\tstruct ice_xlt1 *xlt1 = &hw->blk[i].xlt1;\n+\t\tstruct ice_xlt2 *xlt2 = &hw->blk[i].xlt2;\n+\t\tstruct ice_es *es = &hw->blk[i].es;\n+\n+\t\tif (hw->blk[i].is_list_init) {\n+\t\t\tstruct ice_prof_map *del, *tmp;\n+\n+\t\t\tice_acquire_lock(&es->prof_map_lock);\n+\t\t\tLIST_FOR_EACH_ENTRY_SAFE(del, tmp, &es->prof_map,\n+\t\t\t\t\t\t ice_prof_map, list) {\n+\t\t\t\tLIST_DEL(&del->list);\n+\t\t\t\tice_free(hw, del);\n+\t\t\t}\n+\t\t\tINIT_LIST_HEAD(&es->prof_map);\n+\t\t\tice_release_lock(&es->prof_map_lock);\n+\n+\t\t\tice_acquire_lock(&hw->fl_profs_locks[i]);\n+\t\t\tice_free_flow_profs(hw, i);\n+\t\t\tice_release_lock(&hw->fl_profs_locks[i]);\n+\t\t}\n+\n+\t\tice_free_vsig_tbl(hw, (enum ice_block)i);\n+\n+\t\tice_memset(xlt1->ptypes, 0, xlt1->count * sizeof(*xlt1->ptypes),\n+\t\t\t ICE_NONDMA_MEM);\n+\t\tice_memset(xlt1->ptg_tbl, 0,\n+\t\t\t ICE_MAX_PTGS * sizeof(*xlt1->ptg_tbl),\n+\t\t\t ICE_NONDMA_MEM);\n+\t\tice_memset(xlt1->t, 0, xlt1->count * sizeof(*xlt1->t),\n+\t\t\t ICE_NONDMA_MEM);\n+\n+\t\tice_memset(xlt2->vsis, 0, xlt2->count * sizeof(*xlt2->vsis),\n+\t\t\t ICE_NONDMA_MEM);\n+\t\tice_memset(xlt2->vsig_tbl, 0,\n+\t\t\t xlt2->count * sizeof(*xlt2->vsig_tbl),\n+\t\t\t ICE_NONDMA_MEM);\n+\t\tice_memset(xlt2->t, 0, xlt2->count * sizeof(*xlt2->t),\n+\t\t\t ICE_NONDMA_MEM);\n+\n+\t\tice_memset(prof->t, 0, prof->count * sizeof(*prof->t),\n+\t\t\t ICE_NONDMA_MEM);\n+\t\tice_memset(prof_redir->t, 0,\n+\t\t\t prof_redir->count * sizeof(*prof_redir->t),\n+\t\t\t ICE_NONDMA_MEM);\n+\n+\t\tice_memset(es->t, 0, es->count * sizeof(*es->t),\n+\t\t\t ICE_NONDMA_MEM);\n+\t\tice_memset(es->ref_count, 0, es->count * sizeof(*es->ref_count),\n+\t\t\t ICE_NONDMA_MEM);\n+\t\tice_memset(es->written, 0, es->count * sizeof(*es->written),\n+\t\t\t ICE_NONDMA_MEM);\n+\t}\n+}\n+\n /**\n * ice_init_hw_tbls - init hardware table memory\n * @hw: pointer to the hardware structure\ndiff --git a/drivers/net/ice/base/ice_flex_pipe.h b/drivers/net/ice/base/ice_flex_pipe.h\nindex 375758c8d..df8eac05b 100644\n--- a/drivers/net/ice/base/ice_flex_pipe.h\n+++ b/drivers/net/ice/base/ice_flex_pipe.h\n@@ -107,6 +107,7 @@ ice_copy_and_init_pkg(struct ice_hw *hw, const u8 *buf, u32 len);\n enum ice_status ice_init_hw_tbls(struct ice_hw *hw);\n void ice_free_seg(struct ice_hw *hw);\n void ice_fill_blk_tbls(struct ice_hw *hw);\n+void ice_clear_hw_tbls(struct ice_hw *hw);\n void ice_free_hw_tbls(struct ice_hw *hw);\n enum ice_status\n ice_add_flow(struct ice_hw *hw, enum ice_block blk, u16 vsi[], u8 count,\ndiff --git a/drivers/net/ice/base/ice_nvm.c b/drivers/net/ice/base/ice_nvm.c\nindex b770abfd0..fa9c348ce 100644\n--- a/drivers/net/ice/base/ice_nvm.c\n+++ b/drivers/net/ice/base/ice_nvm.c\n@@ -24,7 +24,7 @@ ice_aq_read_nvm(struct ice_hw *hw, u16 module_typeid, u32 offset, u16 length,\n \tstruct ice_aq_desc desc;\n \tstruct ice_aqc_nvm *cmd;\n \n-\tice_debug(hw, ICE_DBG_TRACE, \"ice_aq_read_nvm\");\n+\tice_debug(hw, ICE_DBG_TRACE, \"%s\\n\", __func__);\n \n \tcmd = &desc.params.nvm;\n \n@@ -95,7 +95,7 @@ ice_read_sr_aq(struct ice_hw *hw, u32 offset, u16 words, u16 *data,\n {\n \tenum ice_status status;\n \n-\tice_debug(hw, ICE_DBG_TRACE, \"ice_read_sr_aq\");\n+\tice_debug(hw, ICE_DBG_TRACE, \"%s\\n\", __func__);\n \n \tstatus = ice_check_sr_access_params(hw, offset, words);\n \n@@ -123,7 +123,7 @@ ice_read_sr_word_aq(struct ice_hw *hw, u16 offset, u16 *data)\n {\n \tenum ice_status status;\n \n-\tice_debug(hw, ICE_DBG_TRACE, \"ice_read_sr_word_aq\");\n+\tice_debug(hw, ICE_DBG_TRACE, \"%s\\n\", __func__);\n \n \tstatus = ice_read_sr_aq(hw, offset, 1, data, true);\n \tif (!status)\n@@ -152,7 +152,7 @@ ice_read_sr_buf_aq(struct ice_hw *hw, u16 offset, u16 *words, u16 *data)\n \tu16 words_read = 0;\n \tu16 i = 0;\n \n-\tice_debug(hw, ICE_DBG_TRACE, \"ice_read_sr_buf_aq\");\n+\tice_debug(hw, ICE_DBG_TRACE, \"%s\\n\", __func__);\n \n \tdo {\n \t\tu16 read_size, off_w;\n@@ -202,7 +202,7 @@ ice_read_sr_buf_aq(struct ice_hw *hw, u16 offset, u16 *words, u16 *data)\n static enum ice_status\n ice_acquire_nvm(struct ice_hw *hw, enum ice_aq_res_access_type access)\n {\n-\tice_debug(hw, ICE_DBG_TRACE, \"ice_acquire_nvm\");\n+\tice_debug(hw, ICE_DBG_TRACE, \"ice_acquire_nvm\\n\");\n \n \tif (hw->nvm.blank_nvm_mode)\n \t\treturn ICE_SUCCESS;\n@@ -218,7 +218,7 @@ ice_acquire_nvm(struct ice_hw *hw, enum ice_aq_res_access_type access)\n */\n static void ice_release_nvm(struct ice_hw *hw)\n {\n-\tice_debug(hw, ICE_DBG_TRACE, \"ice_release_nvm\");\n+\tice_debug(hw, ICE_DBG_TRACE, \"ice_release_nvm\\n\");\n \n \tif (hw->nvm.blank_nvm_mode)\n \t\treturn;\n@@ -263,7 +263,7 @@ enum ice_status ice_init_nvm(struct ice_hw *hw)\n \tu32 fla, gens_stat;\n \tu8 sr_size;\n \n-\tice_debug(hw, ICE_DBG_TRACE, \"ice_init_nvm\");\n+\tice_debug(hw, ICE_DBG_TRACE, \"%s\\n\", __func__);\n \n \t/* The SR size is stored regardless of the NVM programming mode\n \t * as the blank mode may be used in the factory line.\n", "prefixes": [ "22/49" ] }