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

Commit 17b88929 authored by Tomas Winkler's avatar Tomas Winkler Committed by John W. Linville
Browse files

iwlwifi: move tx reclaim flow into iwl-tx 



This patch
1. moves TX reclaim flow into iwl-tx
2. separates command queue and tx queue reclaim flow

Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent a5e8b505

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

+3 −3
Original line number Diff line number Diff line
@@ -3132,7 +3132,7 @@ static void iwl4965_rx_reply_compressed_ba(struct iwl_priv *priv, 
		/* calculate mac80211 ampdu sw queue to wake */

		int ampdu_q =

		   scd_flow - IWL_BACK_QUEUE_FIRST_ID + priv->hw->queues;

		int freed = iwl4965_tx_queue_reclaim(priv, scd_flow, index);

		int freed = iwl_tx_queue_reclaim(priv, scd_flow, index);

		priv->stations[ba_resp->sta_id].

			tid[ba_resp->tid].tfds_in_queue -= freed;

		if (iwl_queue_space(&txq->q) > txq->q.low_mark &&
@@ -3673,7 +3673,7 @@ static void iwl4965_rx_reply_tx(struct iwl_priv *priv, 
			index = iwl_queue_dec_wrap(scd_ssn & 0xff, txq->q.n_bd);

			IWL_DEBUG_TX_REPLY("Retry scheduler reclaim scd_ssn "

					   "%d index %d\n", scd_ssn , index);

			freed = iwl4965_tx_queue_reclaim(priv, txq_id, index);

			freed = iwl_tx_queue_reclaim(priv, txq_id, index);

			priv->stations[sta_id].tid[tid].tfds_in_queue -= freed;



			if (iwl_queue_space(&txq->q) > txq->q.low_mark &&
@@ -3705,7 +3705,7 @@ static void iwl4965_rx_reply_tx(struct iwl_priv *priv, 
	IWL_DEBUG_TX_REPLY("Tx queue reclaim %d\n", index);

#ifdef CONFIG_IWL4965_HT

	if (index != -1) {

		int freed = iwl4965_tx_queue_reclaim(priv, txq_id, index);

		int freed = iwl_tx_queue_reclaim(priv, txq_id, index);

		if (tid != MAX_TID_COUNT)

			priv->stations[sta_id].tid[tid].tfds_in_queue -= freed;

		if (iwl_queue_space(&txq->q) > txq->q.low_mark &&

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

+2 −2
Original line number Diff line number Diff line
@@ -1159,7 +1159,7 @@ static void iwl5000_rx_reply_tx(struct iwl_priv *priv, 
			index = iwl_queue_dec_wrap(scd_ssn & 0xff, txq->q.n_bd);

			IWL_DEBUG_TX_REPLY("Retry scheduler reclaim scd_ssn "

					   "%d index %d\n", scd_ssn , index);

			freed = iwl4965_tx_queue_reclaim(priv, txq_id, index);

			freed = iwl_tx_queue_reclaim(priv, txq_id, index);

			priv->stations[sta_id].tid[tid].tfds_in_queue -= freed;



			if (iwl_queue_space(&txq->q) > txq->q.low_mark &&
@@ -1191,7 +1191,7 @@ static void iwl5000_rx_reply_tx(struct iwl_priv *priv, 
	IWL_DEBUG_TX_REPLY("Tx queue reclaim %d\n", index);

#ifdef CONFIG_IWL4965_HT

	if (index != -1) {

		int freed = iwl4965_tx_queue_reclaim(priv, txq_id, index);

		int freed = iwl_tx_queue_reclaim(priv, txq_id, index);

		if (tid != MAX_TID_COUNT)

			priv->stations[sta_id].tid[tid].tfds_in_queue -= freed;

		if (iwl_queue_space(&txq->q) > txq->q.low_mark &&

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

+2 −0
Original line number Diff line number Diff line
@@ -205,6 +205,8 @@ int iwl_rx_init(struct iwl_priv *priv, struct iwl_rx_queue *rxq); 
int iwl_rx_queue_restock(struct iwl_priv *priv);

int iwl_rx_queue_space(const struct iwl_rx_queue *q);

void iwl_rx_allocate(struct iwl_priv *priv);

void iwl_tx_cmd_complete(struct iwl_priv *priv, struct iwl_rx_mem_buffer *rxb);

int iwl_tx_queue_reclaim(struct iwl_priv *priv, int txq_id, int index);

/* Handlers */

void iwl_rx_missed_beacon_notif(struct iwl_priv *priv,

			       struct iwl_rx_mem_buffer *rxb);

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

+0 −1
Original line number Diff line number Diff line
@@ -714,7 +714,6 @@ extern int iwl4965_get_temperature(const struct iwl_priv *priv); 
extern u8 iwl_find_station(struct iwl_priv *priv, const u8 *bssid);



extern int iwl4965_hw_channel_switch(struct iwl_priv *priv, u16 channel);

extern int iwl4965_tx_queue_reclaim(struct iwl_priv *priv, int txq_id, int index);

extern int iwl_queue_space(const struct iwl_queue *q);

static inline int iwl_queue_used(const struct iwl_queue *q, int i)

{

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

+108 −0
Original line number Diff line number Diff line
@@ -1060,6 +1060,114 @@ int iwl_enqueue_hcmd(struct iwl_priv *priv, struct iwl_host_cmd *cmd) 
	return ret ? ret : idx;

}



int iwl_tx_queue_reclaim(struct iwl_priv *priv, int txq_id, int index)

{

	struct iwl_tx_queue *txq = &priv->txq[txq_id];

	struct iwl_queue *q = &txq->q;

	struct iwl_tx_info *tx_info;

	int nfreed = 0;



	if ((index >= q->n_bd) || (iwl_queue_used(q, index) == 0)) {

		IWL_ERROR("Read index for DMA queue txq id (%d), index %d, "

			  "is out of range [0-%d] %d %d.\n", txq_id,

			  index, q->n_bd, q->write_ptr, q->read_ptr);

		return 0;

	}



	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)) {



		tx_info = &txq->txb[txq->q.read_ptr];

		ieee80211_tx_status_irqsafe(priv->hw, tx_info->skb[0]);

		tx_info->skb[0] = NULL;

		iwl_hw_txq_free_tfd(priv, txq);



		nfreed++;

	}

	return nfreed;

}

EXPORT_SYMBOL(iwl_tx_queue_reclaim);





/**

 * iwl_hcmd_queue_reclaim - Reclaim TX command queue entries already Tx'd

 *

 * When FW advances 'R' index, all entries between old and new 'R' index

 * need to be reclaimed. As result, some free space forms.  If there is

 * enough free space (> low mark), wake the stack that feeds us.

 */

static void iwl_hcmd_queue_reclaim(struct iwl_priv *priv, int txq_id, int index)

{

	struct iwl_tx_queue *txq = &priv->txq[txq_id];

	struct iwl_queue *q = &txq->q;

	int nfreed = 0;



	if ((index >= q->n_bd) || (iwl_queue_used(q, index) == 0)) {

		IWL_ERROR("Read index for DMA queue txq id (%d), index %d, "

			  "is out of range [0-%d] %d %d.\n", txq_id,

			  index, q->n_bd, q->write_ptr, q->read_ptr);

		return;

	}



	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)) {



		if (nfreed > 1) {

			IWL_ERROR("HCMD skipped: index (%d) %d %d\n", index,

					q->write_ptr, q->read_ptr);

			queue_work(priv->workqueue, &priv->restart);

		}

		nfreed++;

	}

}



/**

 * iwl_tx_cmd_complete - Pull unused buffers off the queue and reclaim them

 * @rxb: Rx buffer to reclaim

 *

 * If an Rx buffer has an async callback associated with it the callback

 * will be executed.  The attached skb (if present) will only be freed

 * if the callback returns 1

 */

void iwl_tx_cmd_complete(struct iwl_priv *priv, struct iwl_rx_mem_buffer *rxb)

{

	struct iwl_rx_packet *pkt = (struct iwl_rx_packet *)rxb->skb->data;

	u16 sequence = le16_to_cpu(pkt->hdr.sequence);

	int txq_id = SEQ_TO_QUEUE(sequence);

	int index = SEQ_TO_INDEX(sequence);

	int huge = sequence & SEQ_HUGE_FRAME;

	int cmd_index;

	struct iwl_cmd *cmd;



	/* If a Tx command is being handled and it isn't in the actual

	 * command queue then there a command routing bug has been introduced

	 * in the queue management code. */

	if (txq_id != IWL_CMD_QUEUE_NUM)

		IWL_ERROR("Error wrong command queue %d command id 0x%X\n",

			  txq_id, pkt->hdr.cmd);

	BUG_ON(txq_id != IWL_CMD_QUEUE_NUM);



	cmd_index = get_cmd_index(&priv->txq[IWL_CMD_QUEUE_NUM].q, index, huge);

	cmd = &priv->txq[IWL_CMD_QUEUE_NUM].cmd[cmd_index];



	/* Input error checking is done when commands are added to queue. */

	if (cmd->meta.flags & CMD_WANT_SKB) {

		cmd->meta.source->u.skb = rxb->skb;

		rxb->skb = NULL;

	} else if (cmd->meta.u.callback &&

		   !cmd->meta.u.callback(priv, cmd, rxb->skb))

		rxb->skb = NULL;



	iwl_hcmd_queue_reclaim(priv, txq_id, index);



	if (!(cmd->meta.flags & CMD_ASYNC)) {

		clear_bit(STATUS_HCMD_ACTIVE, &priv->status);

		wake_up_interruptible(&priv->wait_command_queue);

	}

}

EXPORT_SYMBOL(iwl_tx_cmd_complete);





#ifdef CONFIG_IWLWIF_DEBUG

#define TX_STATUS_ENTRY(x) case TX_STATUS_FAIL_ ## x: return #x