Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/54708/?format=api
{ "id": 54708, "url": "http://patches.dpdk.org/api/patches/54708/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20190611155221.2703-50-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": "<20190611155221.2703-50-leyi.rong@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20190611155221.2703-50-leyi.rong@intel.com", "date": "2019-06-11T15:52:04", "name": "[v2,49/66] net/ice/base: code clean up", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "79e513d905da91adeb69ee6bbe342cbdd1e832ae", "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/20190611155221.2703-50-leyi.rong@intel.com/mbox/", "series": [ { "id": 4981, "url": "http://patches.dpdk.org/api/series/4981/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=4981", "date": "2019-06-11T15:51:15", "name": "shared code update", "version": 2, "mbox": "http://patches.dpdk.org/series/4981/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/54708/comments/", "check": "fail", "checks": "http://patches.dpdk.org/api/patches/54708/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 EE4181C5D4;\n\tTue, 11 Jun 2019 17:55:26 +0200 (CEST)", "from mga02.intel.com (mga02.intel.com [134.134.136.20])\n\tby dpdk.org (Postfix) with ESMTP id DFA311C231\n\tfor <dev@dpdk.org>; Tue, 11 Jun 2019 17:54:38 +0200 (CEST)", "from orsmga001.jf.intel.com ([10.7.209.18])\n\tby orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t11 Jun 2019 08:54:38 -0700", "from lrong-srv-03.sh.intel.com ([10.67.119.177])\n\tby orsmga001.jf.intel.com with ESMTP; 11 Jun 2019 08:54:37 -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\tPaul M Stillwell Jr <paul.m.stillwell.jr@intel.com>", "Date": "Tue, 11 Jun 2019 23:52:04 +0800", "Message-Id": "<20190611155221.2703-50-leyi.rong@intel.com>", "X-Mailer": "git-send-email 2.17.1", "In-Reply-To": "<20190611155221.2703-1-leyi.rong@intel.com>", "References": "<20190604054248.68510-1-leyi.rong@intel.com>\n\t<20190611155221.2703-1-leyi.rong@intel.com>", "Subject": "[dpdk-dev] [PATCH v2 49/66] net/ice/base: code clean up", "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": "Cleanup the useless code.\n\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_controlq.c | 62 +---------------------------\n drivers/net/ice/base/ice_fdir.h | 4 --\n drivers/net/ice/base/ice_flex_pipe.c | 7 ++--\n drivers/net/ice/base/ice_sched.c | 4 +-\n drivers/net/ice/base/ice_switch.c | 8 ----\n drivers/net/ice/base/ice_switch.h | 2 -\n drivers/net/ice/base/ice_type.h | 22 ++--------\n 7 files changed, 11 insertions(+), 98 deletions(-)", "diff": "diff --git a/drivers/net/ice/base/ice_controlq.c b/drivers/net/ice/base/ice_controlq.c\nindex 4cb6df113..3ef07e094 100644\n--- a/drivers/net/ice/base/ice_controlq.c\n+++ b/drivers/net/ice/base/ice_controlq.c\n@@ -262,7 +262,7 @@ ice_cfg_sq_regs(struct ice_hw *hw, struct ice_ctl_q_info *cq)\n * @hw: pointer to the hardware structure\n * @cq: pointer to the specific Control queue\n *\n- * Configure base address and length registers for the receive (event q)\n+ * Configure base address and length registers for the receive (event queue)\n */\n static enum ice_status\n ice_cfg_rq_regs(struct ice_hw *hw, struct ice_ctl_q_info *cq)\n@@ -772,9 +772,6 @@ static u16 ice_clean_sq(struct ice_hw *hw, struct ice_ctl_q_info *cq)\n \tstruct ice_ctl_q_ring *sq = &cq->sq;\n \tu16 ntc = sq->next_to_clean;\n \tstruct ice_sq_cd *details;\n-#if 0\n-\tstruct ice_aq_desc desc_cb;\n-#endif\n \tstruct ice_aq_desc *desc;\n \n \tdesc = ICE_CTL_Q_DESC(*sq, ntc);\n@@ -783,15 +780,6 @@ static u16 ice_clean_sq(struct ice_hw *hw, struct ice_ctl_q_info *cq)\n \twhile (rd32(hw, cq->sq.head) != ntc) {\n \t\tice_debug(hw, ICE_DBG_AQ_MSG,\n \t\t\t \"ntc %d head %d.\\n\", ntc, rd32(hw, cq->sq.head));\n-#if 0\n-\t\tif (details->callback) {\n-\t\t\tICE_CTL_Q_CALLBACK cb_func =\n-\t\t\t\t(ICE_CTL_Q_CALLBACK)details->callback;\n-\t\t\tice_memcpy(&desc_cb, desc, sizeof(desc_cb),\n-\t\t\t\t ICE_DMA_TO_DMA);\n-\t\t\tcb_func(hw, &desc_cb);\n-\t\t}\n-#endif\n \t\tice_memset(desc, 0, sizeof(*desc), ICE_DMA_MEM);\n \t\tice_memset(details, 0, sizeof(*details), ICE_NONDMA_MEM);\n \t\tntc++;\n@@ -941,38 +929,8 @@ ice_sq_send_cmd(struct ice_hw *hw, struct ice_ctl_q_info *cq,\n \tdetails = ICE_CTL_Q_DETAILS(cq->sq, cq->sq.next_to_use);\n \tif (cd)\n \t\t*details = *cd;\n-#if 0\n-\t\t/* FIXME: if/when this block gets enabled (when the #if 0\n-\t\t * is removed), add braces to both branches of the surrounding\n-\t\t * conditional expression. The braces have been removed to\n-\t\t * prevent checkpatch complaining.\n-\t\t */\n-\n-\t\t/* If the command details are defined copy the cookie. The\n-\t\t * CPU_TO_LE32 is not needed here because the data is ignored\n-\t\t * by the FW, only used by the driver\n-\t\t */\n-\t\tif (details->cookie) {\n-\t\t\tdesc->cookie_high =\n-\t\t\t\tCPU_TO_LE32(ICE_HI_DWORD(details->cookie));\n-\t\t\tdesc->cookie_low =\n-\t\t\t\tCPU_TO_LE32(ICE_LO_DWORD(details->cookie));\n-\t\t}\n-#endif\n \telse\n \t\tice_memset(details, 0, sizeof(*details), ICE_NONDMA_MEM);\n-#if 0\n-\t/* clear requested flags and then set additional flags if defined */\n-\tdesc->flags &= ~CPU_TO_LE16(details->flags_dis);\n-\tdesc->flags |= CPU_TO_LE16(details->flags_ena);\n-\n-\tif (details->postpone && !details->async) {\n-\t\tice_debug(hw, ICE_DBG_AQ_MSG,\n-\t\t\t \"Async flag not set along with postpone flag\\n\");\n-\t\tstatus = ICE_ERR_PARAM;\n-\t\tgoto sq_send_command_error;\n-\t}\n-#endif\n \n \t/* Call clean and check queue available function to reclaim the\n \t * descriptors that were processed by FW/MBX; the function returns the\n@@ -1019,20 +977,8 @@ ice_sq_send_cmd(struct ice_hw *hw, struct ice_ctl_q_info *cq,\n \t(cq->sq.next_to_use)++;\n \tif (cq->sq.next_to_use == cq->sq.count)\n \t\tcq->sq.next_to_use = 0;\n-#if 0\n-\t/* FIXME - handle this case? */\n-\tif (!details->postpone)\n-#endif\n \twr32(hw, cq->sq.tail, cq->sq.next_to_use);\n \n-#if 0\n-\t/* if command details are not defined or async flag is not set,\n-\t * we need to wait for desc write back\n-\t */\n-\tif (!details->async && !details->postpone) {\n-\t\t/* FIXME - handle this case? */\n-\t}\n-#endif\n \tdo {\n \t\tif (ice_sq_done(hw, cq))\n \t\t\tbreak;\n@@ -1087,9 +1033,6 @@ ice_sq_send_cmd(struct ice_hw *hw, struct ice_ctl_q_info *cq,\n \n \t/* update the error if time out occurred */\n \tif (!cmd_completed) {\n-#if 0\n-\t (!details->async && !details->postpone)) {\n-#endif\n \t\tice_debug(hw, ICE_DBG_AQ_MSG,\n \t\t\t \"Control Send Queue Writeback timeout.\\n\");\n \t\tstatus = ICE_ERR_AQ_TIMEOUT;\n@@ -1208,9 +1151,6 @@ ice_clean_rq_elem(struct ice_hw *hw, struct ice_ctl_q_info *cq,\n \tcq->rq.next_to_clean = ntc;\n \tcq->rq.next_to_use = ntu;\n \n-#if 0\n-\tice_nvmupd_check_wait_event(hw, LE16_TO_CPU(e->desc.opcode));\n-#endif\n clean_rq_elem_out:\n \t/* Set pending if needed, unlock and return */\n \tif (pending) {\ndiff --git a/drivers/net/ice/base/ice_fdir.h b/drivers/net/ice/base/ice_fdir.h\nindex 2ecb147f1..8490fac61 100644\n--- a/drivers/net/ice/base/ice_fdir.h\n+++ b/drivers/net/ice/base/ice_fdir.h\n@@ -163,9 +163,6 @@ struct ice_fdir_fltr {\n \n \t/* filter control */\n \tu16 q_index;\n-#ifdef ADQ_SUPPORT\n-\tu16 orig_q_index;\n-#endif /* ADQ_SUPPORT */\n \tu16 dest_vsi;\n \tu8 dest_ctl;\n \tu8 fltr_status;\n@@ -173,7 +170,6 @@ struct ice_fdir_fltr {\n \tu32 fltr_id;\n };\n \n-\n /* Dummy packet filter definition structure. */\n struct ice_fdir_base_pkt {\n \tenum ice_fltr_ptype flow;\ndiff --git a/drivers/net/ice/base/ice_flex_pipe.c b/drivers/net/ice/base/ice_flex_pipe.c\nindex fdc9eb6eb..8f19b9fef 100644\n--- a/drivers/net/ice/base/ice_flex_pipe.c\n+++ b/drivers/net/ice/base/ice_flex_pipe.c\n@@ -398,7 +398,7 @@ ice_find_boost_entry(struct ice_seg *ice_seg, u16 addr,\n * Handles enumeration of individual label entries.\n */\n static void *\n-ice_label_enum_handler(u32 __always_unused sect_type, void *section, u32 index,\n+ice_label_enum_handler(u32 __ALWAYS_UNUSED sect_type, void *section, u32 index,\n \t\t u32 *offset)\n {\n \tstruct ice_label_section *labels;\n@@ -640,7 +640,7 @@ static bool ice_bits_max_set(const u8 *mask, u16 size, u16 max)\n * @size: the size of the complete key in bytes (must be even)\n * @val: array of 8-bit values that makes up the value portion of the key\n * @upd: array of 8-bit masks that determine what key portion to update\n- * @dc: array of 8-bit masks that make up the dont' care mask\n+ * @dc: array of 8-bit masks that make up the don't care mask\n * @nm: array of 8-bit masks that make up the never match mask\n * @off: the offset of the first byte in the key to update\n * @len: the number of bytes in the key update\n@@ -897,7 +897,7 @@ ice_find_seg_in_pkg(struct ice_hw *hw, u32 seg_type,\n \tu32 i;\n \n \tice_debug(hw, ICE_DBG_TRACE, \"%s\\n\", __func__);\n-\tice_debug(hw, ICE_DBG_PKG, \"Package version: %d.%d.%d.%d\\n\",\n+\tice_debug(hw, ICE_DBG_PKG, \"Package format version: %d.%d.%d.%d\\n\",\n \t\t pkg_hdr->format_ver.major, pkg_hdr->format_ver.minor,\n \t\t pkg_hdr->format_ver.update, pkg_hdr->format_ver.draft);\n \n@@ -4544,6 +4544,7 @@ ice_move_vsi(struct ice_hw *hw, enum ice_block blk, u16 vsi, u16 vsig,\n \tstatus = ice_vsig_find_vsi(hw, blk, vsi, &orig_vsig);\n \tif (!status)\n \t\tstatus = ice_vsig_add_mv_vsi(hw, blk, vsi, vsig);\n+\n \tif (status) {\n \t\tice_free(hw, p);\n \t\treturn status;\ndiff --git a/drivers/net/ice/base/ice_sched.c b/drivers/net/ice/base/ice_sched.c\nindex a72e72982..fa3158a7b 100644\n--- a/drivers/net/ice/base/ice_sched.c\n+++ b/drivers/net/ice/base/ice_sched.c\n@@ -1233,7 +1233,7 @@ enum ice_status ice_sched_init_port(struct ice_port_info *pi)\n \t\tgoto err_init_port;\n \t}\n \n-\t/* If the last node is a leaf node then the index of the Q group\n+\t/* If the last node is a leaf node then the index of the queue group\n \t * layer is two less than the number of elements.\n \t */\n \tif (num_elems > 2 && buf[0].generic[num_elems - 1].data.elem_type ==\n@@ -3529,9 +3529,11 @@ ice_cfg_agg_vsi_priority_per_tc(struct ice_port_info *pi, u32 agg_id,\n \t\tLIST_FOR_EACH_ENTRY(agg_vsi_info, &agg_info->agg_vsi_list,\n \t\t\t\t ice_sched_agg_vsi_info, list_entry)\n \t\t\tif (agg_vsi_info->vsi_handle == vsi_handle) {\n+\t\t\t\t/* cppcheck-suppress unreadVariable */\n \t\t\t\tvsi_handle_valid = true;\n \t\t\t\tbreak;\n \t\t\t}\n+\n \t\tif (!vsi_handle_valid)\n \t\t\tgoto exit_agg_priority_per_tc;\n \ndiff --git a/drivers/net/ice/base/ice_switch.c b/drivers/net/ice/base/ice_switch.c\nindex 373acb7a6..c7fcd71a7 100644\n--- a/drivers/net/ice/base/ice_switch.c\n+++ b/drivers/net/ice/base/ice_switch.c\n@@ -2934,7 +2934,6 @@ ice_add_vlan(struct ice_hw *hw, struct LIST_HEAD_TYPE *v_list)\n \treturn ICE_SUCCESS;\n }\n \n-#ifndef NO_MACVLAN_SUPPORT\n /**\n * ice_add_mac_vlan - Add MAC and VLAN pair based filter rule\n * @hw: pointer to the hardware structure\n@@ -2969,7 +2968,6 @@ ice_add_mac_vlan(struct ice_hw *hw, struct LIST_HEAD_TYPE *mv_list)\n \t}\n \treturn ICE_SUCCESS;\n }\n-#endif\n \n /**\n * ice_add_eth_mac - Add ethertype and MAC based filter rule\n@@ -3307,7 +3305,6 @@ ice_remove_vlan(struct ice_hw *hw, struct LIST_HEAD_TYPE *v_list)\n \treturn ICE_SUCCESS;\n }\n \n-#ifndef NO_MACVLAN_SUPPORT\n /**\n * ice_remove_mac_vlan - Remove MAC VLAN based filter rule\n * @hw: pointer to the hardware structure\n@@ -3335,7 +3332,6 @@ ice_remove_mac_vlan(struct ice_hw *hw, struct LIST_HEAD_TYPE *v_list)\n \t}\n \treturn ICE_SUCCESS;\n }\n-#endif /* !NO_MACVLAN_SUPPORT */\n \n /**\n * ice_vsi_uses_fltr - Determine if given VSI uses specified filter\n@@ -3850,11 +3846,7 @@ ice_remove_vsi_lkup_fltr(struct ice_hw *hw, u16 vsi_handle,\n \t\tice_remove_promisc(hw, lkup, &remove_list_head);\n \t\tbreak;\n \tcase ICE_SW_LKUP_MAC_VLAN:\n-#ifndef NO_MACVLAN_SUPPORT\n \t\tice_remove_mac_vlan(hw, &remove_list_head);\n-#else\n-\t\tice_debug(hw, ICE_DBG_SW, \"MAC VLAN look up is not supported yet\\n\");\n-#endif /* !NO_MACVLAN_SUPPORT */\n \t\tbreak;\n \tcase ICE_SW_LKUP_ETHERTYPE:\n \tcase ICE_SW_LKUP_ETHERTYPE_MAC:\ndiff --git a/drivers/net/ice/base/ice_switch.h b/drivers/net/ice/base/ice_switch.h\nindex 05b1170c9..b788aa7ec 100644\n--- a/drivers/net/ice/base/ice_switch.h\n+++ b/drivers/net/ice/base/ice_switch.h\n@@ -373,12 +373,10 @@ enum ice_status\n ice_add_eth_mac(struct ice_hw *hw, struct LIST_HEAD_TYPE *em_list);\n enum ice_status\n ice_remove_eth_mac(struct ice_hw *hw, struct LIST_HEAD_TYPE *em_list);\n-#ifndef NO_MACVLAN_SUPPORT\n enum ice_status\n ice_add_mac_vlan(struct ice_hw *hw, struct LIST_HEAD_TYPE *m_list);\n enum ice_status\n ice_remove_mac_vlan(struct ice_hw *hw, struct LIST_HEAD_TYPE *v_list);\n-#endif /* !NO_MACVLAN_SUPPORT */\n \n enum ice_status\n ice_add_mac_with_sw_marker(struct ice_hw *hw, struct ice_fltr_info *f_info,\ndiff --git a/drivers/net/ice/base/ice_type.h b/drivers/net/ice/base/ice_type.h\nindex f4e151c55..8de5cc097 100644\n--- a/drivers/net/ice/base/ice_type.h\n+++ b/drivers/net/ice/base/ice_type.h\n@@ -22,7 +22,6 @@\n #define ICE_BYTES_PER_DWORD\t4\n #define ICE_MAX_TRAFFIC_CLASS\t8\n \n-#ifndef ROUND_UP\n /**\n * ROUND_UP - round up to next arbitrary multiple (not a power of 2)\n * @a: value to round up\n@@ -32,15 +31,10 @@\n * Note, when b is a power of 2 use ICE_ALIGN() instead.\n */\n #define ROUND_UP(a, b)\t((b) * DIVIDE_AND_ROUND_UP((a), (b)))\n-#endif\n \n-#ifndef MIN_T\n #define MIN_T(_t, _a, _b)\tmin((_t)(_a), (_t)(_b))\n-#endif\n \n-#ifndef IS_ASCII\n #define IS_ASCII(_ch)\t((_ch) < 0x80)\n-#endif\n \n #include \"ice_status.h\"\n #include \"ice_hw_autogen.h\"\n@@ -57,9 +51,7 @@ static inline bool ice_is_tc_ena(ice_bitmap_t bitmap, u8 tc)\n \treturn ice_is_bit_set(&bitmap, tc);\n }\n \n-#ifndef DIV_64BIT\n #define DIV_64BIT(n, d) ((n) / (d))\n-#endif /* DIV_64BIT */\n \n static inline u64 round_up_64bit(u64 a, u32 b)\n {\n@@ -114,6 +106,9 @@ static inline u32 ice_round_to_num(u32 N, u32 R)\n #define ICE_DBG_USER\t\tBIT_ULL(31)\n #define ICE_DBG_ALL\t\t0xFFFFFFFFFFFFFFFFULL\n \n+#ifndef __ALWAYS_UNUSED\n+#define __ALWAYS_UNUSED\n+#endif\n \n \n \n@@ -201,9 +196,6 @@ enum ice_media_type {\n enum ice_vsi_type {\n \tICE_VSI_PF = 0,\n \tICE_VSI_CTRL = 3,\t/* equates to ICE_VSI_PF with 1 queue pair */\n-#ifdef ADQ_SUPPORT\n-\tICE_VSI_CHNL = 4,\n-#endif /* ADQ_SUPPORT */\n \tICE_VSI_LB = 6,\n };\n \n@@ -279,13 +271,8 @@ enum ice_fltr_ptype {\n \tICE_FLTR_PTYPE_MAX,\n };\n \n-#ifndef ADQ_SUPPORT\n /* 2 VSI = 1 ICE_VSI_PF + 1 ICE_VSI_CTRL */\n #define ICE_MAX_FDIR_VSI_PER_FILTER\t2\n-#else\n-/* 1 ICE_VSI_PF + 1 ICE_VSI_CTRL + ICE_MAX_TRAFFIC_CLASS */\n-#define ICE_MAX_FDIR_VSI_PER_FILTER\t(2 + ICE_MAX_TRAFFIC_CLASS)\n-#endif /* !ADQ_SUPPORT */\n \n struct ice_fd_hw_prof {\n \tstruct ice_flow_seg_info *fdir_seg;\n@@ -930,9 +917,6 @@ struct ice_hw_port_stats {\n \t/* flow director stats */\n \tu32 fd_sb_status;\n \tu64 fd_sb_match;\n-#ifdef ADQ_SUPPORT\n-\tu64 ch_atr_match;\n-#endif /* ADQ_SUPPORT */\n };\n \n enum ice_sw_fwd_act_type {\n", "prefixes": [ "v2", "49/66" ] }