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

iwlwifi: rename wait_for_tx_queues_empty 



Rename current wait_tx_queue_empty to wait_tx_queues_empty since
it waits for multiple queues (up to 32).
Next patch will add a wait for single TX queue which is needed for
gen2 to be scalable for 512.

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

drivers/net/wireless/intel/iwlwifi/dvm/lib.c

+1 −1
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ void iwlagn_dev_txfifo_flush(struct iwl_priv *priv) 
		goto done;

	}

	IWL_DEBUG_INFO(priv, "wait transmit/flush all frames\n");

	iwl_trans_wait_tx_queue_empty(priv->trans, 0xffffffff);

	iwl_trans_wait_tx_queues_empty(priv->trans, 0xffffffff);

done:

	ieee80211_wake_queues(priv->hw);

	mutex_unlock(&priv->mutex);

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

+1 −1
Original line number Diff line number Diff line
@@ -1143,7 +1143,7 @@ static void iwlagn_mac_flush(struct ieee80211_hw *hw, struct ieee80211_vif *vif, 
	}



	IWL_DEBUG_TX_QUEUES(priv, "wait transmit/flush all frames\n");

	iwl_trans_wait_tx_queue_empty(priv->trans, scd_queues);

	iwl_trans_wait_tx_queues_empty(priv->trans, scd_queues);

done:

	mutex_unlock(&priv->mutex);

	IWL_DEBUG_MAC80211(priv, "leave\n");

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

+4 −4
Original line number Diff line number Diff line
@@ -691,7 +691,7 @@ struct iwl_trans_ops { 
	void (*txq_set_shared_mode)(struct iwl_trans *trans, u32 txq_id,

				    bool shared);



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

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

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

				 bool freeze);

	void (*block_txq_ptrs)(struct iwl_trans *trans, bool block);
@@ -1195,7 +1195,7 @@ static inline void iwl_trans_block_txq_ptrs(struct iwl_trans *trans, 
		trans->ops->block_txq_ptrs(trans, block);

}



static inline int iwl_trans_wait_tx_queue_empty(struct iwl_trans *trans,

static inline int iwl_trans_wait_tx_queues_empty(struct iwl_trans *trans,

						 u32 txqs)

{

	if (WARN_ON_ONCE(trans->state != IWL_TRANS_FW_ALIVE)) {
@@ -1203,7 +1203,7 @@ static inline int iwl_trans_wait_tx_queue_empty(struct iwl_trans *trans, 
		return -EIO;

	}



	return trans->ops->wait_tx_queue_empty(trans, txqs);

	return trans->ops->wait_tx_queues_empty(trans, txqs);

}



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

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

+2 −2
Original line number Diff line number Diff line
@@ -1478,7 +1478,7 @@ static void iwl_mvm_prepare_mac_removal(struct iwl_mvm *mvm, 
		 * already marked as draining, so to complete the draining, we

		 * just need to wait until the transport is empty.

		 */

		iwl_trans_wait_tx_queue_empty(mvm->trans, tfd_msk);

		iwl_trans_wait_tx_queues_empty(mvm->trans, tfd_msk);

	}



	if (vif->type == NL80211_IFTYPE_P2P_DEVICE) {
@@ -4000,7 +4000,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

		 */

		iwl_trans_wait_tx_queue_empty(mvm->trans, msk);

		iwl_trans_wait_tx_queues_empty(mvm->trans, msk);

	}

}

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

+7 −7
Original line number Diff line number Diff line
@@ -658,7 +658,7 @@ int iwl_mvm_scd_queue_redirect(struct iwl_mvm *mvm, int queue, int tid, 


	/* Stop MAC queues and wait for this queue to empty */

	iwl_mvm_stop_mac_queues(mvm, mq);

	ret = iwl_trans_wait_tx_queue_empty(mvm->trans, BIT(queue));

	ret = iwl_trans_wait_tx_queues_empty(mvm->trans, BIT(queue));

	if (ret) {

		IWL_ERR(mvm, "Error draining queue %d before reconfig\n",

			queue);
@@ -1614,7 +1614,7 @@ int iwl_mvm_rm_sta(struct iwl_mvm *mvm, 
		ret = iwl_mvm_flush_tx_path(mvm, mvm_sta->tfd_queue_msk, 0);

		if (ret)

			return ret;

		ret = iwl_trans_wait_tx_queue_empty(mvm->trans,

		ret = iwl_trans_wait_tx_queues_empty(mvm->trans,

						     mvm_sta->tfd_queue_msk);

		if (ret)

			return ret;
@@ -2659,7 +2659,7 @@ int iwl_mvm_sta_tx_agg_oper(struct iwl_mvm *mvm, struct ieee80211_vif *vif, 
			 * If reconfiguring an existing queue, it first must be

			 * drained

			 */

			ret = iwl_trans_wait_tx_queue_empty(mvm->trans,

			ret = iwl_trans_wait_tx_queues_empty(mvm->trans,

							     BIT(queue));

			if (ret) {

				IWL_ERR(mvm,
@@ -2846,7 +2846,7 @@ 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");

		iwl_trans_wait_tx_queue_empty(mvm->trans,

		iwl_trans_wait_tx_queues_empty(mvm->trans,

					       mvmsta->tfd_queue_msk);

		iwl_mvm_drain_sta(mvm, mvmsta, false);

CRA Git | Maintained and supported by SUSTech CRA and CCSE