Commit 7ad788af authored by Johannes Berg's avatar Johannes Berg
Browse files

wifi: iwlwifi: mvm: remove STARTING state 



Now that the retry loop only happens when timeouts occur
and firmware errors are different, we no longer need the
STARTING state with all the infrastructure for it.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarMiri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://patch.msgid.link/20241227095718.c55d73436521.I08e9f6a71d56f86872bca4d4e3048faa113a7120@changeid


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 98b724d9

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

+1 −8
Original line number Diff line number Diff line
@@ -1300,14 +1300,8 @@ int iwl_mvm_mac_start(struct ieee80211_hw *hw) 


	/* we are starting the mac not in error flow, and restart is enabled */

	if (!test_bit(IWL_MVM_STATUS_HW_RESTART_REQUESTED, &mvm->status) &&

	    iwlwifi_mod_params.fw_restart) {

	    iwlwifi_mod_params.fw_restart)

		max_retry = IWL_MAX_INIT_RETRY;

		/*

		 * This will prevent mac80211 recovery flows to trigger during

		 * init failures

		 */

		set_bit(IWL_MVM_STATUS_STARTING, &mvm->status);

	}



	for (retry = 0; retry <= max_retry; retry++) {

		ret = __iwl_mvm_mac_start(mvm);
@@ -1316,7 +1310,6 @@ int iwl_mvm_mac_start(struct ieee80211_hw *hw) 


		IWL_ERR(mvm, "mac start retry %d\n", retry);

	}

	clear_bit(IWL_MVM_STATUS_STARTING, &mvm->status);



	mutex_unlock(&mvm->mutex);

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

+0 −3
Original line number Diff line number Diff line
@@ -1401,8 +1401,6 @@ DEFINE_GUARD(mvm, struct iwl_mvm *, mutex_lock(&_T->mutex), mutex_unlock(&_T->mu 
 * @IWL_MVM_STATUS_IN_D3: in D3 (or at least about to go into it)

 * @IWL_MVM_STATUS_SUPPRESS_ERROR_LOG_ONCE: suppress one error log

 *	if this is set, when intentionally triggered

 * @IWL_MVM_STATUS_STARTING: starting mac,

 *	used to disable restart flow while in STARTING state

 */

enum iwl_mvm_status {

	IWL_MVM_STATUS_HW_RFKILL,
@@ -1414,7 +1412,6 @@ enum iwl_mvm_status { 
	IWL_MVM_STATUS_FIRMWARE_RUNNING,

	IWL_MVM_STATUS_IN_D3,

	IWL_MVM_STATUS_SUPPRESS_ERROR_LOG_ONCE,

	IWL_MVM_STATUS_STARTING,

};



struct iwl_mvm_csme_conn_info {

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

+0 −3
Original line number Diff line number Diff line
@@ -2051,9 +2051,6 @@ void iwl_mvm_nic_restart(struct iwl_mvm *mvm, bool fw_error) 
	 */

	if (!mvm->fw_restart && fw_error) {

		iwl_fw_error_collect(&mvm->fwrt, false);

	} else if (test_bit(IWL_MVM_STATUS_STARTING,

			    &mvm->status)) {

		IWL_ERR(mvm, "Starting mac, retry will be triggered anyway\n");

	} else if (test_bit(IWL_MVM_STATUS_IN_HW_RESTART, &mvm->status)) {

		struct iwl_mvm_reprobe *reprobe;