Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/57904/?format=api
{ "id": 57904, "url": "http://patches.dpdk.org/api/patches/57904/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20190826105105.19121-9-qi.z.zhang@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": "<20190826105105.19121-9-qi.z.zhang@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20190826105105.19121-9-qi.z.zhang@intel.com", "date": "2019-08-26T10:50:10", "name": "[08/63] net/ice/base: remove debug code", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "aff2d3a019f8c176b9e3e93330ef8bb36a33a1b1", "submitter": { "id": 504, "url": "http://patches.dpdk.org/api/people/504/?format=api", "name": "Qi Zhang", "email": "qi.z.zhang@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/20190826105105.19121-9-qi.z.zhang@intel.com/mbox/", "series": [ { "id": 6119, "url": "http://patches.dpdk.org/api/series/6119/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=6119", "date": "2019-08-26T10:50:02", "name": "net/ice/base: update base code", "version": 1, "mbox": "http://patches.dpdk.org/series/6119/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/57904/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/57904/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 D61171C011;\n\tMon, 26 Aug 2019 12:48:46 +0200 (CEST)", "from mga02.intel.com (mga02.intel.com [134.134.136.20])\n\tby dpdk.org (Postfix) with ESMTP id 8A6C11BFE5\n\tfor <dev@dpdk.org>; Mon, 26 Aug 2019 12:48:40 +0200 (CEST)", "from orsmga003.jf.intel.com ([10.7.209.27])\n\tby orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t26 Aug 2019 03:48:40 -0700", "from dpdk51.sh.intel.com ([10.67.110.245])\n\tby orsmga003.jf.intel.com with ESMTP; 26 Aug 2019 03:48:38 -0700" ], "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.64,431,1559545200\"; d=\"scan'208\";a=\"182402102\"", "From": "Qi Zhang <qi.z.zhang@intel.com>", "To": "wenzhuo.lu@intel.com,\n\tqiming.yang@intel.com", "Cc": "dev@dpdk.org, xiaolong.ye@intel.com, Qi Zhang <qi.z.zhang@intel.com>,\n\tPaul M Stillwell Jr <paul.m.stillwell.jr@intel.com>", "Date": "Mon, 26 Aug 2019 18:50:10 +0800", "Message-Id": "<20190826105105.19121-9-qi.z.zhang@intel.com>", "X-Mailer": "git-send-email 2.13.6", "In-Reply-To": "<20190826105105.19121-1-qi.z.zhang@intel.com>", "References": "<20190826105105.19121-1-qi.z.zhang@intel.com>", "Subject": "[dpdk-dev] [PATCH 08/63] net/ice/base: remove debug code", "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": "Remove firmware logging debug code.\n\nSigned-off-by: Paul M Stillwell Jr <paul.m.stillwell.jr@intel.com>\nSigned-off-by: Qi Zhang <qi.z.zhang@intel.com>\n---\n drivers/net/ice/base/ice_adminq_cmd.h | 88 --------------\n drivers/net/ice/base/ice_common.c | 223 ----------------------------------\n drivers/net/ice/base/ice_common.h | 1 -\n drivers/net/ice/base/ice_type.h | 20 ---\n 4 files changed, 332 deletions(-)", "diff": "diff --git a/drivers/net/ice/base/ice_adminq_cmd.h b/drivers/net/ice/base/ice_adminq_cmd.h\nindex b5faa5bf6..9e5853cca 100644\n--- a/drivers/net/ice/base/ice_adminq_cmd.h\n+++ b/drivers/net/ice/base/ice_adminq_cmd.h\n@@ -2176,87 +2176,6 @@ struct ice_aqc_event_lan_overflow {\n \n \n \n-/* Configure Firmware Logging Command (indirect 0xFF09)\n- * Logging Information Read Response (indirect 0xFF10)\n- * Note: The 0xFF10 command has no input parameters.\n- */\n-struct ice_aqc_fw_logging {\n-\tu8 log_ctrl;\n-#define ICE_AQC_FW_LOG_AQ_EN\t\tBIT(0)\n-#define ICE_AQC_FW_LOG_UART_EN\t\tBIT(1)\n-\tu8 rsvd0;\n-\tu8 log_ctrl_valid; /* Not used by 0xFF10 Response */\n-#define ICE_AQC_FW_LOG_AQ_VALID\t\tBIT(0)\n-#define ICE_AQC_FW_LOG_UART_VALID\tBIT(1)\n-\tu8 rsvd1[5];\n-\t__le32 addr_high;\n-\t__le32 addr_low;\n-};\n-\n-\n-enum ice_aqc_fw_logging_mod {\n-\tICE_AQC_FW_LOG_ID_GENERAL = 0,\n-\tICE_AQC_FW_LOG_ID_CTRL,\n-\tICE_AQC_FW_LOG_ID_LINK,\n-\tICE_AQC_FW_LOG_ID_LINK_TOPO,\n-\tICE_AQC_FW_LOG_ID_DNL,\n-\tICE_AQC_FW_LOG_ID_I2C,\n-\tICE_AQC_FW_LOG_ID_SDP,\n-\tICE_AQC_FW_LOG_ID_MDIO,\n-\tICE_AQC_FW_LOG_ID_ADMINQ,\n-\tICE_AQC_FW_LOG_ID_HDMA,\n-\tICE_AQC_FW_LOG_ID_LLDP,\n-\tICE_AQC_FW_LOG_ID_DCBX,\n-\tICE_AQC_FW_LOG_ID_DCB,\n-\tICE_AQC_FW_LOG_ID_NETPROXY,\n-\tICE_AQC_FW_LOG_ID_NVM,\n-\tICE_AQC_FW_LOG_ID_AUTH,\n-\tICE_AQC_FW_LOG_ID_VPD,\n-\tICE_AQC_FW_LOG_ID_IOSF,\n-\tICE_AQC_FW_LOG_ID_PARSER,\n-\tICE_AQC_FW_LOG_ID_SW,\n-\tICE_AQC_FW_LOG_ID_SCHEDULER,\n-\tICE_AQC_FW_LOG_ID_TXQ,\n-\tICE_AQC_FW_LOG_ID_RSVD,\n-\tICE_AQC_FW_LOG_ID_POST,\n-\tICE_AQC_FW_LOG_ID_WATCHDOG,\n-\tICE_AQC_FW_LOG_ID_TASK_DISPATCH,\n-\tICE_AQC_FW_LOG_ID_MNG,\n-\tICE_AQC_FW_LOG_ID_SYNCE,\n-\tICE_AQC_FW_LOG_ID_MAX,\n-};\n-\n-/* This is the buffer for both of the logging commands.\n- * The entry array size depends on the datalen parameter in the descriptor.\n- * There will be a total of datalen / 2 entries.\n- */\n-struct ice_aqc_fw_logging_data {\n-\t__le16 entry[1];\n-#define ICE_AQC_FW_LOG_ID_S\t\t0\n-#define ICE_AQC_FW_LOG_ID_M\t\t(0xFFF << ICE_AQC_FW_LOG_ID_S)\n-\n-#define ICE_AQC_FW_LOG_CONF_SUCCESS\t0\t/* Used by response */\n-#define ICE_AQC_FW_LOG_CONF_BAD_INDX\tBIT(12)\t/* Used by response */\n-\n-#define ICE_AQC_FW_LOG_EN_S\t\t12\n-#define ICE_AQC_FW_LOG_EN_M\t\t(0xF << ICE_AQC_FW_LOG_EN_S)\n-#define ICE_AQC_FW_LOG_INFO_EN\t\tBIT(12)\t/* Used by command */\n-#define ICE_AQC_FW_LOG_INIT_EN\t\tBIT(13)\t/* Used by command */\n-#define ICE_AQC_FW_LOG_FLOW_EN\t\tBIT(14)\t/* Used by command */\n-#define ICE_AQC_FW_LOG_ERR_EN\t\tBIT(15)\t/* Used by command */\n-};\n-\n-\n-/* Get/Clear FW Log (indirect 0xFF11) */\n-struct ice_aqc_get_clear_fw_log {\n-\tu8 flags;\n-#define ICE_AQC_FW_LOG_CLEAR\t\tBIT(0)\n-#define ICE_AQC_FW_LOG_MORE_DATA_AVAIL\tBIT(1)\n-\tu8 rsvd1[7];\n-\t__le32 addr_high;\n-\t__le32 addr_low;\n-};\n-\n \n /**\n * struct ice_aq_desc - Admin Queue (AQ) descriptor\n@@ -2337,8 +2256,6 @@ struct ice_aq_desc {\n \t\tstruct ice_aqc_get_vsi_resp get_vsi_resp;\n \t\tstruct ice_aqc_download_pkg download_pkg;\n \t\tstruct ice_aqc_get_pkg_info_list get_pkg_info_list;\n-\t\tstruct ice_aqc_fw_logging fw_logging;\n-\t\tstruct ice_aqc_get_clear_fw_log get_clear_fw_log;\n \t\tstruct ice_aqc_set_mac_lb set_mac_lb;\n \t\tstruct ice_aqc_alloc_free_res_cmd sw_res_ctrl;\n \t\tstruct ice_aqc_get_res_alloc get_res;\n@@ -2558,11 +2475,6 @@ enum ice_adminq_opc {\n \n \t/* Standalone Commands/Events */\n \tice_aqc_opc_event_lan_overflow\t\t\t= 0x1001,\n-\n-\t/* debug commands */\n-\tice_aqc_opc_fw_logging\t\t\t\t= 0xFF09,\n-\tice_aqc_opc_fw_logging_info\t\t\t= 0xFF10,\n-\tice_aqc_opc_get_clear_fw_log\t\t\t= 0xFF11\n };\n \n #endif /* _ICE_ADMINQ_CMD_H_ */\ndiff --git a/drivers/net/ice/base/ice_common.c b/drivers/net/ice/base/ice_common.c\nindex b4f0b964d..43c06948f 100644\n--- a/drivers/net/ice/base/ice_common.c\n+++ b/drivers/net/ice/base/ice_common.c\n@@ -653,223 +653,6 @@ static void ice_cleanup_fltr_mgmt_struct(struct ice_hw *hw)\n \tice_free(hw, sw);\n }\n \n-#define ICE_FW_LOG_DESC_SIZE(n)\t(sizeof(struct ice_aqc_fw_logging_data) + \\\n-\t(((n) - 1) * sizeof(((struct ice_aqc_fw_logging_data *)0)->entry)))\n-#define ICE_FW_LOG_DESC_SIZE_MAX\t\\\n-\tICE_FW_LOG_DESC_SIZE(ICE_AQC_FW_LOG_ID_MAX)\n-\n-/**\n- * ice_get_fw_log_cfg - get FW logging configuration\n- * @hw: pointer to the HW struct\n- */\n-static enum ice_status ice_get_fw_log_cfg(struct ice_hw *hw)\n-{\n-\tstruct ice_aqc_fw_logging_data *config;\n-\tstruct ice_aq_desc desc;\n-\tenum ice_status status;\n-\tu16 size;\n-\n-\tsize = ICE_FW_LOG_DESC_SIZE_MAX;\n-\tconfig = (struct ice_aqc_fw_logging_data *)ice_malloc(hw, size);\n-\tif (!config)\n-\t\treturn ICE_ERR_NO_MEMORY;\n-\n-\tice_fill_dflt_direct_cmd_desc(&desc, ice_aqc_opc_fw_logging_info);\n-\n-\tdesc.flags |= CPU_TO_LE16(ICE_AQ_FLAG_BUF);\n-\tdesc.flags |= CPU_TO_LE16(ICE_AQ_FLAG_RD);\n-\n-\tstatus = ice_aq_send_cmd(hw, &desc, config, size, NULL);\n-\tif (!status) {\n-\t\tu16 i;\n-\n-\t\t/* Save fw logging information into the HW structure */\n-\t\tfor (i = 0; i < ICE_AQC_FW_LOG_ID_MAX; i++) {\n-\t\t\tu16 v, m, flgs;\n-\n-\t\t\tv = LE16_TO_CPU(config->entry[i]);\n-\t\t\tm = (v & ICE_AQC_FW_LOG_ID_M) >> ICE_AQC_FW_LOG_ID_S;\n-\t\t\tflgs = (v & ICE_AQC_FW_LOG_EN_M) >> ICE_AQC_FW_LOG_EN_S;\n-\n-\t\t\tif (m < ICE_AQC_FW_LOG_ID_MAX)\n-\t\t\t\thw->fw_log.evnts[m].cur = flgs;\n-\t\t}\n-\t}\n-\n-\tice_free(hw, config);\n-\n-\treturn status;\n-}\n-\n-/**\n- * ice_cfg_fw_log - configure FW logging\n- * @hw: pointer to the HW struct\n- * @enable: enable certain FW logging events if true, disable all if false\n- *\n- * This function enables/disables the FW logging via Rx CQ events and a UART\n- * port based on predetermined configurations. FW logging via the Rx CQ can be\n- * enabled/disabled for individual PF's. However, FW logging via the UART can\n- * only be enabled/disabled for all PFs on the same device.\n- *\n- * To enable overall FW logging, the \"cq_en\" and \"uart_en\" enable bits in\n- * hw->fw_log need to be set accordingly, e.g. based on user-provided input,\n- * before initializing the device.\n- *\n- * When re/configuring FW logging, callers need to update the \"cfg\" elements of\n- * the hw->fw_log.evnts array with the desired logging event configurations for\n- * modules of interest. When disabling FW logging completely, the callers can\n- * just pass false in the \"enable\" parameter. On completion, the function will\n- * update the \"cur\" element of the hw->fw_log.evnts array with the resulting\n- * logging event configurations of the modules that are being re/configured. FW\n- * logging modules that are not part of a reconfiguration operation retain their\n- * previous states.\n- *\n- * Before resetting the device, it is recommended that the driver disables FW\n- * logging before shutting down the control queue. When disabling FW logging\n- * (\"enable\" = false), the latest configurations of FW logging events stored in\n- * hw->fw_log.evnts[] are not overridden to allow them to be reconfigured after\n- * a device reset.\n- *\n- * When enabling FW logging to emit log messages via the Rx CQ during the\n- * device's initialization phase, a mechanism alternative to interrupt handlers\n- * needs to be used to extract FW log messages from the Rx CQ periodically and\n- * to prevent the Rx CQ from being full and stalling other types of control\n- * messages from FW to SW. Interrupts are typically disabled during the device's\n- * initialization phase.\n- */\n-static enum ice_status ice_cfg_fw_log(struct ice_hw *hw, bool enable)\n-{\n-\tstruct ice_aqc_fw_logging_data *data = NULL;\n-\tstruct ice_aqc_fw_logging *cmd;\n-\tenum ice_status status = ICE_SUCCESS;\n-\tu16 i, chgs = 0, len = 0;\n-\tstruct ice_aq_desc desc;\n-\tu8 actv_evnts = 0;\n-\tvoid *buf = NULL;\n-\n-\tif (!hw->fw_log.cq_en && !hw->fw_log.uart_en)\n-\t\treturn ICE_SUCCESS;\n-\n-\t/* Disable FW logging only when the control queue is still responsive */\n-\tif (!enable &&\n-\t (!hw->fw_log.actv_evnts || !ice_check_sq_alive(hw, &hw->adminq)))\n-\t\treturn ICE_SUCCESS;\n-\n-\t/* Get current FW log settings */\n-\tstatus = ice_get_fw_log_cfg(hw);\n-\tif (status)\n-\t\treturn status;\n-\n-\tice_fill_dflt_direct_cmd_desc(&desc, ice_aqc_opc_fw_logging);\n-\tcmd = &desc.params.fw_logging;\n-\n-\t/* Indicate which controls are valid */\n-\tif (hw->fw_log.cq_en)\n-\t\tcmd->log_ctrl_valid |= ICE_AQC_FW_LOG_AQ_VALID;\n-\n-\tif (hw->fw_log.uart_en)\n-\t\tcmd->log_ctrl_valid |= ICE_AQC_FW_LOG_UART_VALID;\n-\n-\tif (enable) {\n-\t\t/* Fill in an array of entries with FW logging modules and\n-\t\t * logging events being reconfigured.\n-\t\t */\n-\t\tfor (i = 0; i < ICE_AQC_FW_LOG_ID_MAX; i++) {\n-\t\t\tu16 val;\n-\n-\t\t\t/* Keep track of enabled event types */\n-\t\t\tactv_evnts |= hw->fw_log.evnts[i].cfg;\n-\n-\t\t\tif (hw->fw_log.evnts[i].cfg == hw->fw_log.evnts[i].cur)\n-\t\t\t\tcontinue;\n-\n-\t\t\tif (!data) {\n-\t\t\t\tdata = (struct ice_aqc_fw_logging_data *)\n-\t\t\t\t\tice_malloc(hw,\n-\t\t\t\t\t\t ICE_FW_LOG_DESC_SIZE_MAX);\n-\t\t\t\tif (!data)\n-\t\t\t\t\treturn ICE_ERR_NO_MEMORY;\n-\t\t\t}\n-\n-\t\t\tval = i << ICE_AQC_FW_LOG_ID_S;\n-\t\t\tval |= hw->fw_log.evnts[i].cfg << ICE_AQC_FW_LOG_EN_S;\n-\t\t\tdata->entry[chgs++] = CPU_TO_LE16(val);\n-\t\t}\n-\n-\t\t/* Only enable FW logging if at least one module is specified.\n-\t\t * If FW logging is currently enabled but all modules are not\n-\t\t * enabled to emit log messages, disable FW logging altogether.\n-\t\t */\n-\t\tif (actv_evnts) {\n-\t\t\t/* Leave if there is effectively no change */\n-\t\t\tif (!chgs)\n-\t\t\t\tgoto out;\n-\n-\t\t\tif (hw->fw_log.cq_en)\n-\t\t\t\tcmd->log_ctrl |= ICE_AQC_FW_LOG_AQ_EN;\n-\n-\t\t\tif (hw->fw_log.uart_en)\n-\t\t\t\tcmd->log_ctrl |= ICE_AQC_FW_LOG_UART_EN;\n-\n-\t\t\tbuf = data;\n-\t\t\tlen = ICE_FW_LOG_DESC_SIZE(chgs);\n-\t\t\tdesc.flags |= CPU_TO_LE16(ICE_AQ_FLAG_RD);\n-\t\t}\n-\t}\n-\n-\tstatus = ice_aq_send_cmd(hw, &desc, buf, len, NULL);\n-\tif (!status) {\n-\t\t/* Update the current configuration to reflect events enabled.\n-\t\t * hw->fw_log.cq_en and hw->fw_log.uart_en indicate if the FW\n-\t\t * logging mode is enabled for the device. They do not reflect\n-\t\t * actual modules being enabled to emit log messages. So, their\n-\t\t * values remain unchanged even when all modules are disabled.\n-\t\t */\n-\t\tu16 cnt = enable ? chgs : (u16)ICE_AQC_FW_LOG_ID_MAX;\n-\n-\t\thw->fw_log.actv_evnts = actv_evnts;\n-\t\tfor (i = 0; i < cnt; i++) {\n-\t\t\tu16 v, m;\n-\n-\t\t\tif (!enable) {\n-\t\t\t\t/* When disabling all FW logging events as part\n-\t\t\t\t * of device's de-initialization, the original\n-\t\t\t\t * configurations are retained, and can be used\n-\t\t\t\t * to reconfigure FW logging later if the device\n-\t\t\t\t * is re-initialized.\n-\t\t\t\t */\n-\t\t\t\thw->fw_log.evnts[i].cur = 0;\n-\t\t\t\tcontinue;\n-\t\t\t}\n-\n-\t\t\tv = LE16_TO_CPU(data->entry[i]);\n-\t\t\tm = (v & ICE_AQC_FW_LOG_ID_M) >> ICE_AQC_FW_LOG_ID_S;\n-\t\t\thw->fw_log.evnts[m].cur = hw->fw_log.evnts[m].cfg;\n-\t\t}\n-\t}\n-\n-out:\n-\tif (data)\n-\t\tice_free(hw, data);\n-\n-\treturn status;\n-}\n-\n-/**\n- * ice_output_fw_log\n- * @hw: pointer to the HW struct\n- * @desc: pointer to the AQ message descriptor\n- * @buf: pointer to the buffer accompanying the AQ message\n- *\n- * Formats a FW Log message and outputs it via the standard driver logs.\n- */\n-void ice_output_fw_log(struct ice_hw *hw, struct ice_aq_desc *desc, void *buf)\n-{\n-\tice_debug(hw, ICE_DBG_FW_LOG, \"[ FW Log Msg Start ]\\n\");\n-\tice_debug_array(hw, ICE_DBG_FW_LOG, 16, 1, (u8 *)buf,\n-\t\t\tLE16_TO_CPU(desc->datalen));\n-\tice_debug(hw, ICE_DBG_FW_LOG, \"[ FW Log Msg End ]\\n\");\n-}\n \n /**\n * ice_get_itr_intrl_gran - determine int/intrl granularity\n@@ -979,10 +762,6 @@ enum ice_status ice_init_hw(struct ice_hw *hw)\n \tif (ice_get_fw_mode(hw) == ICE_FW_MODE_ROLLBACK)\n \t\tice_print_rollback_msg(hw);\n \n-\t/* Enable FW logging. Not fatal if this fails. */\n-\tstatus = ice_cfg_fw_log(hw, true);\n-\tif (status)\n-\t\tice_debug(hw, ICE_DBG_INIT, \"Failed to enable FW logging.\\n\");\n \n \tstatus = ice_clear_pf_cfg(hw);\n \tif (status)\n@@ -1136,8 +915,6 @@ void ice_deinit_hw(struct ice_hw *hw)\n \t\thw->port_info = NULL;\n \t}\n \n-\t/* Attempt to disable FW logging before shutting down control queues */\n-\tice_cfg_fw_log(hw, false);\n \tice_destroy_all_ctrlq(hw);\n \n \t/* Clear VSI contexts if not already cleared */\ndiff --git a/drivers/net/ice/base/ice_common.h b/drivers/net/ice/base/ice_common.h\nindex 4ecfa6b9b..4e44c2f13 100644\n--- a/drivers/net/ice/base/ice_common.h\n+++ b/drivers/net/ice/base/ice_common.h\n@@ -194,7 +194,6 @@ enum ice_status\n ice_cfg_tc_node_bw_alloc(struct ice_port_info *pi, u8 tc,\n \t\t\t enum ice_rl_type rl_type, u8 bw_alloc);\n enum ice_status ice_cfg_rl_burst_size(struct ice_hw *hw, u32 bytes);\n-void ice_output_fw_log(struct ice_hw *hw, struct ice_aq_desc *desc, void *buf);\n void\n ice_stat_update40(struct ice_hw *hw, u32 reg, bool prev_stat_loaded,\n \t\t u64 *prev_stat, u64 *cur_stat);\ndiff --git a/drivers/net/ice/base/ice_type.h b/drivers/net/ice/base/ice_type.h\nindex d8cb8eecd..7194cb9ec 100644\n--- a/drivers/net/ice/base/ice_type.h\n+++ b/drivers/net/ice/base/ice_type.h\n@@ -690,25 +690,6 @@ struct ice_switch_info {\n \tstruct ice_sw_recipe *recp_list;\n };\n \n-/* FW logging configuration */\n-struct ice_fw_log_evnt {\n-\tu8 cfg : 4;\t/* New event enables to configure */\n-\tu8 cur : 4;\t/* Current/active event enables */\n-};\n-\n-struct ice_fw_log_cfg {\n-\tu8 cq_en : 1; /* FW logging is enabled via the control queue */\n-\tu8 uart_en : 1; /* FW logging is enabled via UART for all PFs */\n-\tu8 actv_evnts; /* Cumulation of currently enabled log events */\n-\n-#define ICE_FW_LOG_EVNT_INFO\t(ICE_AQC_FW_LOG_INFO_EN >> ICE_AQC_FW_LOG_EN_S)\n-#define ICE_FW_LOG_EVNT_INIT\t(ICE_AQC_FW_LOG_INIT_EN >> ICE_AQC_FW_LOG_EN_S)\n-#define ICE_FW_LOG_EVNT_FLOW\t(ICE_AQC_FW_LOG_FLOW_EN >> ICE_AQC_FW_LOG_EN_S)\n-#define ICE_FW_LOG_EVNT_ERR\t(ICE_AQC_FW_LOG_ERR_EN >> ICE_AQC_FW_LOG_EN_S)\n-#define ICE_FW_LOG_EVNT_ALL\t(ICE_FW_LOG_EVNT_INFO | ICE_FW_LOG_EVNT_INIT | \\\n-\t\t\t\t ICE_FW_LOG_EVNT_FLOW | ICE_FW_LOG_EVNT_ERR)\n-\tstruct ice_fw_log_evnt evnts[ICE_AQC_FW_LOG_ID_MAX];\n-};\n \n /* Port hardware description */\n struct ice_hw {\n@@ -767,7 +748,6 @@ struct ice_hw {\n \tu8 fw_patch;\t\t/* firmware patch version */\n \tu32 fw_build;\t\t/* firmware build number */\n \n-\tstruct ice_fw_log_cfg fw_log;\n \n /* Device max aggregate bandwidths corresponding to the GL_PWR_MODE_CTL\n * register. Used for determining the itr/intrl granularity during\n", "prefixes": [ "08/63" ] }