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

Commit d40fc489 authored by Gregory Greenman's avatar Gregory Greenman Committed by Emmanuel Grumbach
Browse files

iwlwifi: mvm: wait for d0i3 exit in add interface flow 



This patch makes sure there're no target accesses in the add
interface flow before d0i3 exit completes.

Signed-off-by: default avatarGregory Greenman <gregory.greenman@intel.com>
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent 5bfe6f53

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

+31 −9
Original line number Diff line number Diff line
@@ -243,6 +243,21 @@ iwl_mvm_unref_all_except(struct iwl_mvm *mvm, enum iwl_mvm_ref_type ref) 
	}

}



static int iwl_mvm_ref_sync(struct iwl_mvm *mvm, enum iwl_mvm_ref_type ref_type)

{

	iwl_mvm_ref(mvm, ref_type);



	if (!wait_event_timeout(mvm->d0i3_exit_waitq,

				!test_bit(IWL_MVM_STATUS_IN_D0I3, &mvm->status),

				HZ)) {

		WARN_ON_ONCE(1);

		iwl_mvm_unref(mvm, ref_type);

		return -EIO;

	}



	return 0;

}



static void iwl_mvm_reset_phy_ctxts(struct iwl_mvm *mvm)

{

	int i;
@@ -559,9 +574,6 @@ static int iwl_mvm_mac_ampdu_action(struct ieee80211_hw *hw, 
	case IEEE80211_AMPDU_TX_STOP_FLUSH:

	case IEEE80211_AMPDU_TX_STOP_FLUSH_CONT:

	case IEEE80211_AMPDU_TX_OPERATIONAL:

		iwl_mvm_ref(mvm, IWL_MVM_REF_TX_AGG);

		tx_agg_ref = true;



		/*

		 * for tx start, wait synchronously until D0i3 exit to

		 * get the correct sequence number for the tid.
@@ -570,12 +582,11 @@ static int iwl_mvm_mac_ampdu_action(struct ieee80211_hw *hw, 
		 * by the trans layer (unlike commands), so wait for

		 * d0i3 exit in these cases as well.

		 */

		if (!wait_event_timeout(mvm->d0i3_exit_waitq,

			  !test_bit(IWL_MVM_STATUS_IN_D0I3, &mvm->status), HZ)) {

			WARN_ON_ONCE(1);

			iwl_mvm_unref(mvm, IWL_MVM_REF_TX_AGG);

			return -EIO;

		}

		ret = iwl_mvm_ref_sync(mvm, IWL_MVM_REF_TX_AGG);

		if (ret)

			return ret;



		tx_agg_ref = true;

		break;

	default:

		break;
@@ -903,6 +914,15 @@ static int iwl_mvm_mac_add_interface(struct ieee80211_hw *hw, 
	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);

	int ret;



	/*

	 * make sure D0i3 exit is completed, otherwise a target access

	 * during tx queue configuration could be done when still in

	 * D0i3 state.

	 */

	ret = iwl_mvm_ref_sync(mvm, IWL_MVM_REF_ADD_IF);

	if (ret)

		return ret;



	/*

	 * Not much to do here. The stack will not allow interface

	 * types or combinations that we didn't advertise, so we
@@ -1017,6 +1037,8 @@ static int iwl_mvm_mac_add_interface(struct ieee80211_hw *hw, 
 out_unlock:

	mutex_unlock(&mvm->mutex);



	iwl_mvm_unref(mvm, IWL_MVM_REF_ADD_IF);



	return ret;

}

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

+1 −0
Original line number Diff line number Diff line
@@ -230,6 +230,7 @@ enum iwl_mvm_ref_type { 
	IWL_MVM_REF_USER,

	IWL_MVM_REF_TX,

	IWL_MVM_REF_TX_AGG,

	IWL_MVM_REF_ADD_IF,

	IWL_MVM_REF_EXIT_WORK,



	IWL_MVM_REF_COUNT,