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

Commit 13bb9483 authored by Johannes Berg's avatar Johannes Berg Committed by Wey-Yi Guy
Browse files

iwlwifi: prepare for PAN queue/fifo assignment 



PAN ucode will require a different queue assignment,
in particular queue 9 instead of 4 should be used for
commands.

This is required because the ucode will stop/start
queues 4 and 8 depending on the PAN state, since
queue 8 will be used for PAN multicast (after DTIM).

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
parent 246ed355

drivers/net/wireless/iwlwifi/iwl-3945-hw.h

+1 −0
Original line number Diff line number Diff line
@@ -226,6 +226,7 @@ struct iwl3945_eeprom { 


/* 4 DATA + 1 CMD. There are 2 HCCA queues that are not used. */

#define IWL39_NUM_QUEUES        5

#define IWL39_CMD_QUEUE_NUM	4



#define IWL_DEFAULT_TX_RETRY  15

drivers/net/wireless/iwlwifi/iwl-3945.c

+5 −5
Original line number Diff line number Diff line
@@ -273,7 +273,7 @@ static void iwl3945_tx_queue_reclaim(struct iwl_priv *priv, 
	struct iwl_queue *q = &txq->q;

	struct iwl_tx_info *tx_info;



	BUG_ON(txq_id == IWL_CMD_QUEUE_NUM);

	BUG_ON(txq_id == IWL39_CMD_QUEUE_NUM);



	for (index = iwl_queue_inc_wrap(index, q->n_bd); q->read_ptr != index;

		q->read_ptr = iwl_queue_inc_wrap(q->read_ptr, q->n_bd)) {
@@ -285,7 +285,7 @@ static void iwl3945_tx_queue_reclaim(struct iwl_priv *priv, 
	}



	if (iwl_queue_space(q) > q->low_mark && (txq_id >= 0) &&

			(txq_id != IWL_CMD_QUEUE_NUM) &&

			(txq_id != IWL39_CMD_QUEUE_NUM) &&

			priv->mac80211_registered)

		iwl_wake_queue(priv, txq_id);

}
@@ -760,7 +760,7 @@ void iwl3945_hw_build_tx_cmd_rate(struct iwl_priv *priv, 
		data_retry_limit = IWL_DEFAULT_TX_RETRY;

	tx_cmd->data_retry_limit = data_retry_limit;



	if (tx_id >= IWL_CMD_QUEUE_NUM)

	if (tx_id >= IWL39_CMD_QUEUE_NUM)

		rts_retry_limit = 3;

	else

		rts_retry_limit = 7;
@@ -909,7 +909,7 @@ static int iwl3945_txq_ctx_reset(struct iwl_priv *priv) 


	/* Tx queue(s) */

	for (txq_id = 0; txq_id < priv->hw_params.max_txq_num; txq_id++) {

		slots_num = (txq_id == IWL_CMD_QUEUE_NUM) ?

		slots_num = (txq_id == IWL39_CMD_QUEUE_NUM) ?

				TFD_CMD_SLOTS : TFD_TX_CMD_SLOTS;

		rc = iwl_tx_queue_init(priv, &priv->txq[txq_id], slots_num,

				       txq_id);
@@ -1072,7 +1072,7 @@ void iwl3945_hw_txq_ctx_free(struct iwl_priv *priv) 
	if (priv->txq)

		for (txq_id = 0; txq_id < priv->hw_params.max_txq_num;

		     txq_id++)

			if (txq_id == IWL_CMD_QUEUE_NUM)

			if (txq_id == IWL39_CMD_QUEUE_NUM)

				iwl_cmd_queue_free(priv);

			else

				iwl_tx_queue_free(priv, txq_id);

drivers/net/wireless/iwlwifi/iwl-4965.c

+2 −1
Original line number Diff line number Diff line
@@ -576,7 +576,7 @@ static int iwl4965_alive_notify(struct iwl_priv *priv) 
	/* Activate all Tx DMA/FIFO channels */

	priv->cfg->ops->lib->txq_set_sched(priv, IWL_MASK(0, 6));



	iwl4965_set_wr_ptrs(priv, IWL_CMD_QUEUE_NUM, 0);

	iwl4965_set_wr_ptrs(priv, IWL_DEFAULT_CMD_QUEUE_NUM, 0);



	/* make sure all queue are not stopped */

	memset(&priv->queue_stopped[0], 0, sizeof(priv->queue_stopped));
@@ -587,6 +587,7 @@ static int iwl4965_alive_notify(struct iwl_priv *priv) 
	priv->txq_ctx_active_msk = 0;

	/* Map each Tx/cmd queue to its corresponding fifo */

	BUILD_BUG_ON(ARRAY_SIZE(default_queue_to_tx_fifo) != 7);



	for (i = 0; i < ARRAY_SIZE(default_queue_to_tx_fifo); i++) {

		int ac = default_queue_to_tx_fifo[i];

drivers/net/wireless/iwlwifi/iwl-agn-lib.c

+1 −1
Original line number Diff line number Diff line
@@ -1479,7 +1479,7 @@ int iwlagn_wait_tx_queue_empty(struct iwl_priv *priv) 


	/* waiting for all the tx frames complete might take a while */

	for (cnt = 0; cnt < priv->hw_params.max_txq_num; cnt++) {

		if (cnt == IWL_CMD_QUEUE_NUM)

		if (cnt == priv->cmd_queue)

			continue;

		txq = &priv->txq[cnt];

		q = &txq->q;

drivers/net/wireless/iwlwifi/iwl-agn-tx.c

+6 −6
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ void iwlagn_txq_update_byte_cnt_tbl(struct iwl_priv *priv, 


	WARN_ON(len > 0xFFF || write_ptr >= TFD_QUEUE_SIZE_MAX);



	if (txq_id != IWL_CMD_QUEUE_NUM) {

	if (txq_id != priv->cmd_queue) {

		sta_id = txq->cmd[txq->q.write_ptr]->cmd.tx.sta_id;

		sec_ctl = txq->cmd[txq->q.write_ptr]->cmd.tx.sec_ctl;
@@ -155,7 +155,7 @@ void iwlagn_txq_inval_byte_cnt_tbl(struct iwl_priv *priv, 


	WARN_ON(read_ptr >= TFD_QUEUE_SIZE_MAX);



	if (txq_id != IWL_CMD_QUEUE_NUM)

	if (txq_id != priv->cmd_queue)

		sta_id = txq->cmd[read_ptr]->cmd.tx.sta_id;



	bc_ent = cpu_to_le16(1 | (sta_id << 12));
@@ -825,7 +825,7 @@ void iwlagn_hw_txq_ctx_free(struct iwl_priv *priv) 
	/* Tx queues */

	if (priv->txq) {

		for (txq_id = 0; txq_id < priv->hw_params.max_txq_num; txq_id++)

			if (txq_id == IWL_CMD_QUEUE_NUM)

			if (txq_id == priv->cmd_queue)

				iwl_cmd_queue_free(priv);

			else

				iwl_tx_queue_free(priv, txq_id);
@@ -882,9 +882,9 @@ int iwlagn_txq_ctx_alloc(struct iwl_priv *priv) 


	spin_unlock_irqrestore(&priv->lock, flags);



	/* Alloc and init all Tx queues, including the command queue (#4) */

	/* Alloc and init all Tx queues, including the command queue (#4/#9) */

	for (txq_id = 0; txq_id < priv->hw_params.max_txq_num; txq_id++) {

		slots_num = (txq_id == IWL_CMD_QUEUE_NUM) ?

		slots_num = (txq_id == priv->cmd_queue) ?

					TFD_CMD_SLOTS : TFD_TX_CMD_SLOTS;

		ret = iwl_tx_queue_init(priv, &priv->txq[txq_id], slots_num,

				       txq_id);
@@ -922,7 +922,7 @@ void iwlagn_txq_ctx_reset(struct iwl_priv *priv) 


	/* Alloc and init all Tx queues, including the command queue (#4) */

	for (txq_id = 0; txq_id < priv->hw_params.max_txq_num; txq_id++) {

		slots_num = txq_id == IWL_CMD_QUEUE_NUM ?

		slots_num = txq_id == priv->cmd_queue ?

			    TFD_CMD_SLOTS : TFD_TX_CMD_SLOTS;

		iwl_tx_queue_reset(priv, &priv->txq[txq_id], slots_num, txq_id);

	}