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

Commit d6d517b7 authored by Sara Sharon's avatar Sara Sharon Committed by Luca Coelho
Browse files

iwlwifi: add wait for tx queue empty 



Now that we have 512 queues, add a wait for single TX
queue to gen2.
This replaces gen1 wait_tx_queues_empty, which was limited
to 32 queues.

Signed-off-by: default avatarSara Sharon <sara.sharon@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent 3a07d36c

drivers/net/wireless/intel/iwlwifi/iwl-trans.c

+2 −0
Original line number Diff line number Diff line
@@ -102,6 +102,8 @@ struct iwl_trans *iwl_trans_alloc(unsigned int priv_size, 
	if (!trans->dev_cmd_pool)

		return NULL;



	WARN_ON(!ops->wait_txq_empty && !ops->wait_tx_queues_empty);



	return trans;

}

drivers/net/wireless/intel/iwlwifi/iwl-trans.h

+19 −1
Original line number Diff line number Diff line
@@ -619,7 +619,8 @@ struct iwl_tx_queue_cfg_rsp { 
 * @txq_disable: de-configure a Tx queue to send AMPDUs

 *	Must be atomic

 * @txq_set_shared_mode: change Tx queue shared/unshared marking

 * @wait_tx_queue_empty: wait until tx queues are empty. May sleep.

 * @wait_tx_queues_empty: wait until tx queues are empty. May sleep.

 * @wait_txq_empty: wait until specific tx queue is empty. May sleep.

 * @freeze_txq_timer: prevents the timer of the queue from firing until the

 *	queue is set to awake. Must be atomic.

 * @block_txq_ptrs: stop updating the write pointers of the Tx queues. Note
@@ -692,6 +693,7 @@ struct iwl_trans_ops { 
				    bool shared);



	int (*wait_tx_queues_empty)(struct iwl_trans *trans, u32 txq_bm);

	int (*wait_txq_empty)(struct iwl_trans *trans, int queue);

	void (*freeze_txq_timer)(struct iwl_trans *trans, unsigned long txqs,

				 bool freeze);

	void (*block_txq_ptrs)(struct iwl_trans *trans, bool block);
@@ -1198,6 +1200,9 @@ static inline void iwl_trans_block_txq_ptrs(struct iwl_trans *trans, 
static inline int iwl_trans_wait_tx_queues_empty(struct iwl_trans *trans,

						 u32 txqs)

{

	if (WARN_ON_ONCE(!trans->ops->wait_tx_queues_empty))

		return -ENOTSUPP;



	if (WARN_ON_ONCE(trans->state != IWL_TRANS_FW_ALIVE)) {

		IWL_ERR(trans, "%s bad state = %d\n", __func__, trans->state);

		return -EIO;
@@ -1206,6 +1211,19 @@ static inline int iwl_trans_wait_tx_queues_empty(struct iwl_trans *trans, 
	return trans->ops->wait_tx_queues_empty(trans, txqs);

}



static inline int iwl_trans_wait_txq_empty(struct iwl_trans *trans, int queue)

{

	if (WARN_ON_ONCE(!trans->ops->wait_txq_empty))

		return -ENOTSUPP;



	if (WARN_ON_ONCE(trans->state != IWL_TRANS_FW_ALIVE)) {

		IWL_ERR(trans, "%s bad state = %d\n", __func__, trans->state);

		return -EIO;

	}



	return trans->ops->wait_txq_empty(trans, queue);

}



static inline void iwl_trans_write8(struct iwl_trans *trans, u32 ofs, u8 val)

{

	trans->ops->write8(trans, ofs, val);

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

+3 −1
Original line number Diff line number Diff line
@@ -3995,6 +3995,8 @@ static void iwl_mvm_mac_flush(struct ieee80211_hw *hw, 
				IWL_ERR(mvm, "flush request fail\n");

		} else {

			msk |= mvmsta->tfd_queue_msk;

			if (iwl_mvm_has_new_tx_api(mvm))

				iwl_mvm_wait_sta_queues_empty(mvm, mvmsta);

		}

	}
@@ -4003,7 +4005,7 @@ static void iwl_mvm_mac_flush(struct ieee80211_hw *hw, 
	/* this can take a while, and we may need/want other operations

	 * to succeed while doing this, so do it without the mutex held

	 */

	if (!drop)

	if (!drop && !iwl_mvm_has_new_tx_api(mvm))

		iwl_trans_wait_tx_queues_empty(mvm->trans, msk);

}

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

+38 −3
Original line number Diff line number Diff line
@@ -1590,6 +1590,29 @@ static void iwl_mvm_disable_sta_queues(struct iwl_mvm *mvm, 
	}

}



int iwl_mvm_wait_sta_queues_empty(struct iwl_mvm *mvm,

				  struct iwl_mvm_sta *mvm_sta)

{

	int i, ret;



	for (i = 0; i < ARRAY_SIZE(mvm_sta->tid_data); i++) {

		u16 txq_id;



		spin_lock_bh(&mvm_sta->lock);

		txq_id = mvm_sta->tid_data[i].txq_id;

		spin_unlock_bh(&mvm_sta->lock);



		if (txq_id == IWL_MVM_INVALID_QUEUE)

			continue;



		ret = iwl_trans_wait_txq_empty(mvm->trans, txq_id);

		if (ret)

			break;

	}



	return ret;

}



int iwl_mvm_rm_sta(struct iwl_mvm *mvm,

		   struct ieee80211_vif *vif,

		   struct ieee80211_sta *sta)
@@ -1614,8 +1637,14 @@ int iwl_mvm_rm_sta(struct iwl_mvm *mvm, 
		ret = iwl_mvm_flush_sta(mvm, mvm_sta, false, 0);

		if (ret)

			return ret;

		if (iwl_mvm_has_new_tx_api(mvm)) {

			ret = iwl_mvm_wait_sta_queues_empty(mvm, mvm_sta);

		} else {

			u32 q_mask = mvm_sta->tfd_queue_msk;



			ret = iwl_trans_wait_tx_queues_empty(mvm->trans,

						     mvm_sta->tfd_queue_msk);

							     q_mask);

		}

		if (ret)

			return ret;

		ret = iwl_mvm_drain_sta(mvm, mvm_sta, false);
@@ -2850,7 +2879,13 @@ int iwl_mvm_sta_tx_agg_flush(struct iwl_mvm *mvm, struct ieee80211_vif *vif, 
		iwl_mvm_drain_sta(mvm, mvmsta, true);

		if (iwl_mvm_flush_tx_path(mvm, BIT(txq_id), 0))

			IWL_ERR(mvm, "Couldn't flush the AGG queue\n");



		if (iwl_mvm_has_new_tx_api(mvm))

			iwl_trans_wait_txq_empty(mvm->trans, txq_id);



		else

			iwl_trans_wait_tx_queues_empty(mvm->trans, BIT(txq_id));



		iwl_mvm_drain_sta(mvm, mvmsta, false);



		iwl_mvm_sta_tx_agg(mvm, sta, tid, txq_id, false);

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

+2 −0
Original line number Diff line number Diff line
@@ -487,6 +487,8 @@ static inline int iwl_mvm_update_sta(struct iwl_mvm *mvm, 
	return iwl_mvm_sta_send_to_fw(mvm, sta, true, 0);

}



int iwl_mvm_wait_sta_queues_empty(struct iwl_mvm *mvm,

				  struct iwl_mvm_sta *mvm_sta);

int iwl_mvm_rm_sta(struct iwl_mvm *mvm,

		   struct ieee80211_vif *vif,

		   struct ieee80211_sta *sta);