Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f259fc89 authored by Shahar S Matityahu's avatar Shahar S Matityahu Committed by Luca Coelho
Browse files

iwlwifi: dbg_ini: remove debug flow TLV 



Debug flow TLV was removed from the FW. Remove the TLV from the driver
as well.

Signed-off-by: default avatarShahar S Matityahu <shahar.s.matityahu@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent 341bd290

drivers/net/wireless/intel/iwlwifi/fw/api/dbg-tlv.h

+0 −11
Original line number Diff line number Diff line
@@ -140,17 +140,6 @@ struct iwl_fw_ini_hcmd_tlv { 
	struct iwl_fw_ini_hcmd hcmd;

} __packed; /* FW_DEBUG_TLV_HCMD_API_S_VER_1 */



/**

 * struct iwl_fw_ini_debug_flow_tlv - (IWL_UCODE_TLV_TYPE_DEBUG_FLOW)

 *

 * @header: header

 * @debug_flow_cfg: &enum iwl_fw_ini_debug_flow

 */

struct iwl_fw_ini_debug_flow_tlv {

	struct iwl_fw_ini_header header;

	__le32 debug_flow_cfg;

} __packed; /* FW_DEBUG_TLV_FLOW_TLV_S_VER_1 */



#define IWL_FW_INI_MAX_REGION_ID	64

#define IWL_FW_INI_MAX_NAME		32

drivers/net/wireless/intel/iwlwifi/fw/dbg.c

+0 −2
Original line number Diff line number Diff line
@@ -2820,8 +2820,6 @@ static void _iwl_fw_dbg_apply_point(struct iwl_fw_runtime *fwrt, 
		case IWL_UCODE_TLV_TYPE_TRIGGERS:

			iwl_fw_dbg_update_triggers(fwrt, ini_tlv, ext, pnt);

			break;

		case IWL_UCODE_TLV_TYPE_DEBUG_FLOW:

			break;

		default:

			WARN_ONCE(1,

				  "WRT: ext=%d. Invalid TLV 0x%x for apply point\n",

drivers/net/wireless/intel/iwlwifi/fw/file.h

+1 −2
Original line number Diff line number Diff line
@@ -157,8 +157,7 @@ enum iwl_ucode_tlv_type { 
	IWL_UCODE_TLV_TYPE_HCMD			= IWL_UCODE_TLV_DEBUG_BASE + 2,

	IWL_UCODE_TLV_TYPE_REGIONS		= IWL_UCODE_TLV_DEBUG_BASE + 3,

	IWL_UCODE_TLV_TYPE_TRIGGERS		= IWL_UCODE_TLV_DEBUG_BASE + 4,

	IWL_UCODE_TLV_TYPE_DEBUG_FLOW		= IWL_UCODE_TLV_DEBUG_BASE + 5,

	IWL_UCODE_TLV_DEBUG_MAX = IWL_UCODE_TLV_TYPE_DEBUG_FLOW,

	IWL_UCODE_TLV_DEBUG_MAX = IWL_UCODE_TLV_TYPE_TRIGGERS,



	/* TLVs 0x1000-0x2000 are for internal driver usage */

	IWL_UCODE_TLV_FW_DBG_DUMP_LST	= 0x1000,

drivers/net/wireless/intel/iwlwifi/iwl-drv.c

+0 −1
Original line number Diff line number Diff line
@@ -1151,7 +1151,6 @@ static int iwl_parse_tlv_firmware(struct iwl_drv *drv, 
		case IWL_UCODE_TLV_TYPE_HCMD:

		case IWL_UCODE_TLV_TYPE_REGIONS:

		case IWL_UCODE_TLV_TYPE_TRIGGERS:

		case IWL_UCODE_TLV_TYPE_DEBUG_FLOW:

			if (iwlwifi_mod_params.enable_ini)

				iwl_dbg_tlv_alloc(drv->trans, tlv, false);

			break;