p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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: Sara Sharon <sara.sharon@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
This commit is contained in:
Sara Sharon 2017-03-05 11:38:58 +02:00 committed by Luca Coelho
parent e982bc2ca8
commit a1a5787730
6 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/wireless/intel/iwlwifi/dvm/lib.c
View File

@ -180,7 +180,7 @@ void iwlagn_dev_txfifo_flush(struct iwl_priv *priv)
goto done; goto done;
} }
IWL_DEBUG_INFO(priv, "wait transmit/flush all frames\n"); 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: done:
ieee80211_wake_queues(priv->hw); ieee80211_wake_queues(priv->hw);
mutex_unlock(&priv->mutex); mutex_unlock(&priv->mutex);

2
drivers/net/wireless/intel/iwlwifi/dvm/mac80211.c
View File

@ -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_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: done:
mutex_unlock(&priv->mutex); mutex_unlock(&priv->mutex);
IWL_DEBUG_MAC80211(priv, "leave\n"); IWL_DEBUG_MAC80211(priv, "leave\n");

8
drivers/net/wireless/intel/iwlwifi/iwl-trans.h
View File

@ -691,7 +691,7 @@ struct iwl_trans_ops {
void (*txq_set_shared_mode)(struct iwl_trans *trans, u32 txq_id, void (*txq_set_shared_mode)(struct iwl_trans *trans, u32 txq_id,
bool shared); 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, void (*freeze_txq_timer)(struct iwl_trans *trans, unsigned long txqs,
bool freeze); bool freeze);
void (*block_txq_ptrs)(struct iwl_trans *trans, bool block); void (*block_txq_ptrs)(struct iwl_trans *trans, bool block);
@ -1195,15 +1195,15 @@ static inline void iwl_trans_block_txq_ptrs(struct iwl_trans *trans,
trans->ops->block_txq_ptrs(trans, block); 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) u32 txqs)
{ {
if (WARN_ON_ONCE(trans->state != IWL_TRANS_FW_ALIVE)) { if (WARN_ON_ONCE(trans->state != IWL_TRANS_FW_ALIVE)) {
IWL_ERR(trans, "%s bad state = %d\n", __func__, trans->state); IWL_ERR(trans, "%s bad state = %d\n", __func__, trans->state);
return -EIO; 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) static inline void iwl_trans_write8(struct iwl_trans *trans, u32 ofs, u8 val)

4
drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
View File

@ -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 * already marked as draining, so to complete the draining, we
* just need to wait until the transport is empty. * 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) { 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 /* this can take a while, and we may need/want other operations
* to succeed while doing this, so do it without the mutex held * 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);
} }
} }

14
drivers/net/wireless/intel/iwlwifi/mvm/sta.c
View File

@ -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 */ /* Stop MAC queues and wait for this queue to empty */
iwl_mvm_stop_mac_queues(mvm, mq); 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) { if (ret) {
IWL_ERR(mvm, "Error draining queue %d before reconfig\n", IWL_ERR(mvm, "Error draining queue %d before reconfig\n",
queue); queue);
@ -1614,8 +1614,8 @@ int iwl_mvm_rm_sta(struct iwl_mvm *mvm,
ret = iwl_mvm_flush_tx_path(mvm, mvm_sta->tfd_queue_msk, 0); ret = iwl_mvm_flush_tx_path(mvm, mvm_sta->tfd_queue_msk, 0);
if (ret) if (ret)
return 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); mvm_sta->tfd_queue_msk);
if (ret) if (ret)
return ret; return ret;
ret = iwl_mvm_drain_sta(mvm, mvm_sta, false); ret = iwl_mvm_drain_sta(mvm, mvm_sta, false);
@ -2659,8 +2659,8 @@ int iwl_mvm_sta_tx_agg_oper(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
* If reconfiguring an existing queue, it first must be * If reconfiguring an existing queue, it first must be
* drained * drained
*/ */
ret = iwl_trans_wait_tx_queue_empty(mvm->trans, ret = iwl_trans_wait_tx_queues_empty(mvm->trans,
BIT(queue)); BIT(queue));
if (ret) { if (ret) {
IWL_ERR(mvm, IWL_ERR(mvm,
"Error draining queue before reconfig\n"); "Error draining queue before reconfig\n");
@ -2846,8 +2846,8 @@ int iwl_mvm_sta_tx_agg_flush(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
iwl_mvm_drain_sta(mvm, mvmsta, true); iwl_mvm_drain_sta(mvm, mvmsta, true);
if (iwl_mvm_flush_tx_path(mvm, BIT(txq_id), 0)) if (iwl_mvm_flush_tx_path(mvm, BIT(txq_id), 0))
IWL_ERR(mvm, "Couldn't flush the AGG queue\n"); 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); mvmsta->tfd_queue_msk);
iwl_mvm_drain_sta(mvm, mvmsta, false); iwl_mvm_drain_sta(mvm, mvmsta, false);
iwl_mvm_sta_tx_agg(mvm, sta, tid, txq_id, false); iwl_mvm_sta_tx_agg(mvm, sta, tid, txq_id, false);

2
drivers/net/wireless/intel/iwlwifi/pcie/trans.c
View File

@ -2833,7 +2833,7 @@ static void iwl_trans_pcie_resume(struct iwl_trans *trans)
.ref = iwl_trans_pcie_ref, \ .ref = iwl_trans_pcie_ref, \
.unref = iwl_trans_pcie_unref, \ .unref = iwl_trans_pcie_unref, \
.dump_data = iwl_trans_pcie_dump_data, \ .dump_data = iwl_trans_pcie_dump_data, \
.wait_tx_queue_empty = iwl_trans_pcie_wait_txq_empty, \ .wait_tx_queues_empty = iwl_trans_pcie_wait_txq_empty, \
.d3_suspend = iwl_trans_pcie_d3_suspend, \ .d3_suspend = iwl_trans_pcie_d3_suspend, \
.d3_resume = iwl_trans_pcie_d3_resume .d3_resume = iwl_trans_pcie_d3_resume