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

Commit 4beaf6c2 authored by Emmanuel Grumbach's avatar Emmanuel Grumbach Committed by Johannes Berg
Browse files

iwlwifi: s/txq_setup/txq_enable 



We need to be able to enable / disable Tx queues in HW
dynamically. So this function is no longer related to AGG
only. It can do the job for any queue, even AC ones. Change
the name to better reflect its role.

Also use the new function to configure the AC / CMD queues
in tx_start.

Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent d0624be6

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

+1 −1
Original line number Diff line number Diff line
@@ -665,7 +665,7 @@ static int iwlagn_mac_ampdu_action(struct ieee80211_hw *hw, 
		ret = iwl_sta_rx_agg_stop(priv, sta, tid);

		break;

	case IEEE80211_AMPDU_TX_START:

		if (!priv->trans->ops->tx_agg_setup)

		if (!priv->trans->ops->txq_enable)

			break;

		if (iwlwifi_mod_params.disable_11n & IWL_DISABLE_HT_TXAGG)

			break;

drivers/net/wireless/iwlwifi/dvm/tx.c

+2 −3
Original line number Diff line number Diff line
@@ -688,8 +688,7 @@ int iwlagn_tx_agg_oper(struct iwl_priv *priv, struct ieee80211_vif *vif, 


	fifo = ctx->ac_to_fifo[tid_to_ac[tid]];



	iwl_trans_tx_agg_setup(priv->trans, q, fifo,

			       sta_priv->sta_id, tid,

	iwl_trans_txq_enable(priv->trans, q, fifo, sta_priv->sta_id, tid,

			     buf_size, ssn);



	/*

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

+7 −7
Original line number Diff line number Diff line
@@ -355,7 +355,7 @@ struct iwl_trans; 
 *	Must be atomic

 * @reclaim: free packet until ssn. Returns a list of freed packets.

 *	Must be atomic

 * @tx_agg_setup: setup a tx queue for AMPDU - will be called once the HW is

 * @txq_enable: setup a tx queue for AMPDU - will be called once the HW is

 *	ready and a successful ADDBA response has been received.

 *	May sleep

 * @txq_disable: de-configure a Tx queue to send AMPDUs
@@ -391,7 +391,7 @@ struct iwl_trans_ops { 
	void (*reclaim)(struct iwl_trans *trans, int queue, int ssn,

			struct sk_buff_head *skbs);



	void (*tx_agg_setup)(struct iwl_trans *trans, int queue, int fifo,

	void (*txq_enable)(struct iwl_trans *trans, int queue, int fifo,

			   int sta_id, int tid, int frame_limit, u16 ssn);

	void (*txq_disable)(struct iwl_trans *trans, int queue);
@@ -551,7 +551,7 @@ static inline void iwl_trans_txq_disable(struct iwl_trans *trans, int queue) 
	trans->ops->txq_disable(trans, queue);

}



static inline void iwl_trans_tx_agg_setup(struct iwl_trans *trans, int queue,

static inline void iwl_trans_txq_enable(struct iwl_trans *trans, int queue,

					int fifo, int sta_id, int tid,

					int frame_limit, u16 ssn)

{
@@ -560,7 +560,7 @@ static inline void iwl_trans_tx_agg_setup(struct iwl_trans *trans, int queue, 
	WARN_ONCE(trans->state != IWL_TRANS_FW_ALIVE,

		  "%s bad state = %d", __func__, trans->state);



	trans->ops->tx_agg_setup(trans, queue, fifo, sta_id, tid,

	trans->ops->txq_enable(trans, queue, fifo, sta_id, tid,

				 frame_limit, ssn);

}

drivers/net/wireless/iwlwifi/pcie/internal.h

+5 −2
Original line number Diff line number Diff line
@@ -344,7 +344,10 @@ void iwl_trans_set_wr_ptrs(struct iwl_trans *trans, int txq_id, u32 index); 
void iwl_trans_tx_queue_set_status(struct iwl_trans *trans,

				   struct iwl_tx_queue *txq,

				   int tx_fifo_id, bool active);

void iwl_trans_pcie_tx_agg_setup(struct iwl_trans *trans, int queue, int fifo,

void __iwl_trans_pcie_txq_enable(struct iwl_trans *trans, int txq_id,

					int fifo, int sta_id, int tid,

					int frame_limit, u16 ssn);

void iwl_trans_pcie_txq_enable(struct iwl_trans *trans, int txq_id, int fifo,

			       int sta_id, int tid, int frame_limit, u16 ssn);

void iwl_txq_free_tfd(struct iwl_trans *trans, struct iwl_tx_queue *txq,

		      enum dma_data_direction dma_dir);

drivers/net/wireless/iwlwifi/pcie/trans.c

+4 −25
Original line number Diff line number Diff line
@@ -1054,33 +1054,12 @@ static void iwl_tx_start(struct iwl_trans *trans) 
	iwl_write_prph(trans, SCD_DRAM_BASE_ADDR,

		       trans_pcie->scd_bc_tbls.dma >> 10);



	iwl_write_prph(trans, SCD_QUEUECHAIN_SEL,

		       SCD_QUEUECHAIN_SEL_ALL(trans, trans_pcie));

	iwl_write_prph(trans, SCD_AGGR_SEL, 0);



	/* initiate the queues */

	for (i = 0; i < trans->cfg->base_params->num_of_queues; i++) {

		iwl_trans_set_wr_ptrs(trans, i, 0);

		iwl_write_targ_mem(trans, trans_pcie->scd_base_addr +

				SCD_CONTEXT_QUEUE_OFFSET(i), 0);

		iwl_write_targ_mem(trans, trans_pcie->scd_base_addr +

				SCD_CONTEXT_QUEUE_OFFSET(i) +

				sizeof(u32),

				((SCD_WIN_SIZE <<

				SCD_QUEUE_CTX_REG2_WIN_SIZE_POS) &

				SCD_QUEUE_CTX_REG2_WIN_SIZE_MSK) |

				((SCD_FRAME_LIMIT <<

				SCD_QUEUE_CTX_REG2_FRAME_LIMIT_POS) &

				SCD_QUEUE_CTX_REG2_FRAME_LIMIT_MSK));

	}



	for (i = 0; i < trans_pcie->n_q_to_fifo; i++) {

		int fifo = trans_pcie->setup_q_to_fifo[i];



		set_bit(i, trans_pcie->queue_used);



		iwl_trans_tx_queue_set_status(trans, &trans_pcie->txq[i],

					      fifo, true);

		__iwl_trans_pcie_txq_enable(trans, i, fifo, IWL_INVALID_STATION,

					    IWL_TID_NON_QOS,

					    SCD_FRAME_LIMIT, 0);

	}



	/* Activate all Tx DMA/FIFO channels */
@@ -2040,7 +2019,7 @@ static const struct iwl_trans_ops trans_ops_pcie = { 
	.reclaim = iwl_trans_pcie_reclaim,



	.txq_disable = iwl_trans_pcie_txq_disable,

	.tx_agg_setup = iwl_trans_pcie_tx_agg_setup,

	.txq_enable = iwl_trans_pcie_txq_enable,



	.dbgfs_register = iwl_trans_pcie_dbgfs_register,