Commit 72d3c7bb authored by Johannes Berg's avatar Johannes Berg Committed by Luca Coelho
Browse files

iwlwifi: mvm: don't attempt debug collection in rfkill 



If we fail to initialize because rfkill is enabled, then trying
to do debug collection currently just fails. Prevent that in the
high-level code, although we should probably also fix the lower
level code to do things more carefully.

It's not 100% clear that it fixes this commit, as the original
dump code at the time might've been more careful. In any case,
we don't really need to dump anything in this expected scenario.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Fixes: 71256480 ("iwlwifi: add fw dump upon RT ucode start failure")
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent 1c6bca6d

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

+3 −1
Original line number Diff line number Diff line
@@ -1121,7 +1121,9 @@ int iwl_mvm_up(struct iwl_mvm *mvm) 
	ret = iwl_mvm_load_rt_fw(mvm);

	if (ret) {

		IWL_ERR(mvm, "Failed to start RT ucode: %d\n", ret);

		iwl_fw_dbg_error_collect(&mvm->fwrt, FW_DBG_TRIGGER_DRIVER);

		if (ret != -ERFKILL)

			iwl_fw_dbg_error_collect(&mvm->fwrt,

						 FW_DBG_TRIGGER_DRIVER);

		goto error;

	}

drivers/net/wireless/intel/iwlwifi/mvm/ops.c

+1 −1
Original line number Diff line number Diff line
@@ -834,7 +834,7 @@ iwl_op_mode_mvm_start(struct iwl_trans *trans, const struct iwl_cfg *cfg, 
	mutex_lock(&mvm->mutex);

	iwl_mvm_ref(mvm, IWL_MVM_REF_INIT_UCODE);

	err = iwl_run_init_mvm_ucode(mvm, true);

	if (err)

	if (err && err != -ERFKILL)

		iwl_fw_dbg_error_collect(&mvm->fwrt, FW_DBG_TRIGGER_DRIVER);

	if (!iwlmvm_mod_params.init_dbg || !err)

		iwl_mvm_stop_device(mvm);