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

Commit 088070a2 authored by Eliad Peller's avatar Eliad Peller Committed by Emmanuel Grumbach
Browse files

iwlwifi: mvm: move deferred d0i3 exit to resume_complete op 



The deferred d0i3 exit is currently implemented in the
resume op, which is called when mac80211 starts its
resume process.

However, mac80211 still doesn't handle frames at this stage,
which results in frames being dropped.

Move the deferred d0i3 handling to the reconfig_complete
callback, in order to make sure mac80211 is fully available
at this point.

Signed-off-by: default avatarEliad Peller <eliadx.peller@intel.com>
Reviewed-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent 9b5452fd

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

+1 −11
Original line number Diff line number Diff line
@@ -1659,18 +1659,8 @@ int iwl_mvm_resume(struct ieee80211_hw *hw) 
{

	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);



	if (iwl_mvm_is_d0i3_supported(mvm)) {

		bool exit_now;



		mutex_lock(&mvm->d0i3_suspend_mutex);

		__clear_bit(D0I3_DEFER_WAKEUP, &mvm->d0i3_suspend_flags);

		exit_now = __test_and_clear_bit(D0I3_PENDING_WAKEUP,

						&mvm->d0i3_suspend_flags);

		mutex_unlock(&mvm->d0i3_suspend_mutex);

		if (exit_now)

			_iwl_mvm_exit_d0i3(mvm);

	if (iwl_mvm_is_d0i3_supported(mvm))

		return 0;

	}



	return __iwl_mvm_resume(mvm, false);

}

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

+20 −0
Original line number Diff line number Diff line
@@ -941,6 +941,25 @@ static void iwl_mvm_restart_complete(struct iwl_mvm *mvm) 
	mutex_unlock(&mvm->mutex);

}



static void iwl_mvm_resume_complete(struct iwl_mvm *mvm)

{

	bool exit_now;



	if (!iwl_mvm_is_d0i3_supported(mvm))

		return;



	mutex_lock(&mvm->d0i3_suspend_mutex);

	__clear_bit(D0I3_DEFER_WAKEUP, &mvm->d0i3_suspend_flags);

	exit_now = __test_and_clear_bit(D0I3_PENDING_WAKEUP,

					&mvm->d0i3_suspend_flags);

	mutex_unlock(&mvm->d0i3_suspend_mutex);



	if (exit_now) {

		IWL_DEBUG_RPM(mvm, "Run deferred d0i3 exit\n");

		_iwl_mvm_exit_d0i3(mvm);

	}

}



static void

iwl_mvm_mac_reconfig_complete(struct ieee80211_hw *hw,

			      enum ieee80211_reconfig_type reconfig_type)
@@ -952,6 +971,7 @@ iwl_mvm_mac_reconfig_complete(struct ieee80211_hw *hw, 
		iwl_mvm_restart_complete(mvm);

		break;

	case IEEE80211_RECONFIG_TYPE_SUSPEND:

		iwl_mvm_resume_complete(mvm);

		break;

	}

}