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

Commit ff116373 authored by Eytan Lifshitz's avatar Eytan Lifshitz Committed by Johannes Berg
Browse files

iwlwifi: mvm: change the name of init_ucode_run flag 



In RF KILL the init ucode is running, but don't complete
all its tasks, so we need to run the init ucode again.
Change the flag name to init_ucode_complete, to be more appropriate.

Signed-off-by: default avatarEytan Lifshitz <eytan.lifshitz@intel.com>
Reviewed-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent f7fc5989

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

+8 −4
Original line number Diff line number Diff line
@@ -243,7 +243,7 @@ int iwl_run_init_mvm_ucode(struct iwl_mvm *mvm, bool read_nvm) 


	lockdep_assert_held(&mvm->mutex);



	if (mvm->init_ucode_run)

	if (mvm->init_ucode_complete)

		return 0;



	iwl_init_notification_wait(&mvm->notif_wait,
@@ -310,7 +310,7 @@ int iwl_run_init_mvm_ucode(struct iwl_mvm *mvm, bool read_nvm) 
	ret = iwl_wait_notification(&mvm->notif_wait, &calib_wait,

			MVM_UCODE_CALIB_TIMEOUT);

	if (!ret)

		mvm->init_ucode_run = true;

		mvm->init_ucode_complete = true;

	goto out;



error:
@@ -353,8 +353,12 @@ int iwl_mvm_up(struct iwl_mvm *mvm) 
	if (ret)

		return ret;



	/* If we were in RFKILL during module loading, load init ucode now */

	if (!mvm->init_ucode_run) {

	/*

	 * If we haven't completed the run of the init ucode during

	 * module loading, load init ucode now

	 * (for example, if we were in RFKILL)

	 */

	if (!mvm->init_ucode_complete) {

		ret = iwl_run_init_mvm_ucode(mvm, false);

		if (ret && !iwlmvm_mod_params.init_dbg) {

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

drivers/net/wireless/iwlwifi/mvm/mvm.h

+1 −1
Original line number Diff line number Diff line
@@ -441,7 +441,7 @@ struct iwl_mvm { 


	enum iwl_ucode_type cur_ucode;

	bool ucode_loaded;

	bool init_ucode_run;

	bool init_ucode_complete;

	u32 error_event_table;

	u32 log_event_table;