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

Commit 74374223 authored by Sara Sharon's avatar Sara Sharon Committed by Luca Coelho
Browse files

iwlwifi: dbg: disable triggers for ini 



When ini is loaded, disable all legacy trigger
configuration.

Signed-off-by: default avatarSara Sharon <sara.sharon@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent 68f6f492

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

+3 −0
Original line number Diff line number Diff line
@@ -1117,6 +1117,9 @@ int iwl_fw_dbg_collect_trig(struct iwl_fw_runtime *fwrt, 
	int ret, len = 0;

	char buf[64];



	if (fwrt->trans->ini_valid)

		return 0;



	if (fmt) {

		va_list ap;

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

+3 −0
Original line number Diff line number Diff line
@@ -192,6 +192,9 @@ _iwl_fw_dbg_trigger_on(struct iwl_fw_runtime *fwrt, 
{

	struct iwl_fw_dbg_trigger_tlv *trig;



	if (fwrt->trans->ini_valid)

		return NULL;



	if (!iwl_fw_dbg_trigger_enabled(fwrt->fw, id))

		return NULL;

drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c

+2 −0
Original line number Diff line number Diff line
@@ -149,6 +149,8 @@ void iwl_alloc_dbg_tlv(struct iwl_trans *trans, size_t len, const u8 *data, 
			trans->apply_points[i].data = mem;

			trans->apply_points[i].size = size[i];

		}



		trans->ini_valid = true;

	}

}

drivers/net/wireless/intel/iwlwifi/iwl-trans.h

+1 −0
Original line number Diff line number Diff line
@@ -779,6 +779,7 @@ struct iwl_trans { 
	struct iwl_apply_point_data apply_points_ext[IWL_FW_INI_APPLY_NUM];



	bool external_ini_loaded;

	bool ini_valid;



	const struct iwl_fw_dbg_dest_tlv_v1 *dbg_dest_tlv;

	const struct iwl_fw_dbg_conf_tlv *dbg_conf_tlv[FW_DBG_CONF_MAX];