Commit 9256c205 authored by Eliad Peller's avatar Eliad Peller Committed by Emmanuel Grumbach

iwlwifi: mvm: wait for d0i3 exit in some more ampdu actions

Some ampdu actions change queues by direct target access.

Since the bus is disabled in d0i3, make sure to exit d0i3
before handling these actions.
Signed-off-by: default avatarEliad Peller <eliadx.peller@intel.com>
Reviewed-by: default avatarArik Nemtsov <arik@wizery.com>
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent 4d075007
...@@ -539,13 +539,22 @@ static int iwl_mvm_mac_ampdu_action(struct ieee80211_hw *hw, ...@@ -539,13 +539,22 @@ static int iwl_mvm_mac_ampdu_action(struct ieee80211_hw *hw,
return -EACCES; return -EACCES;
/* return from D0i3 before starting a new Tx aggregation */ /* return from D0i3 before starting a new Tx aggregation */
if (action == IEEE80211_AMPDU_TX_START) { switch (action) {
case IEEE80211_AMPDU_TX_START:
case IEEE80211_AMPDU_TX_STOP_CONT:
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); iwl_mvm_ref(mvm, IWL_MVM_REF_TX_AGG);
tx_agg_ref = true; tx_agg_ref = true;
/* /*
* wait synchronously until D0i3 exit to get the correct * for tx start, wait synchronously until D0i3 exit to
* sequence number for the tid * get the correct sequence number for the tid.
* additionally, some other ampdu actions use direct
* target access, which is not handled automatically
* by the trans layer (unlike commands), so wait for
* d0i3 exit in these cases as well.
*/ */
if (!wait_event_timeout(mvm->d0i3_exit_waitq, if (!wait_event_timeout(mvm->d0i3_exit_waitq,
!test_bit(IWL_MVM_STATUS_IN_D0I3, &mvm->status), HZ)) { !test_bit(IWL_MVM_STATUS_IN_D0I3, &mvm->status), HZ)) {
...@@ -553,6 +562,9 @@ static int iwl_mvm_mac_ampdu_action(struct ieee80211_hw *hw, ...@@ -553,6 +562,9 @@ static int iwl_mvm_mac_ampdu_action(struct ieee80211_hw *hw,
iwl_mvm_unref(mvm, IWL_MVM_REF_TX_AGG); iwl_mvm_unref(mvm, IWL_MVM_REF_TX_AGG);
return -EIO; return -EIO;
} }
break;
default:
break;
} }
mutex_lock(&mvm->mutex); mutex_lock(&mvm->mutex);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment