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

Commit 288712a6 authored by Emmanuel Grumbach's avatar Emmanuel Grumbach Committed by John W. Linville
Browse files

iwlagn: allocate resources for TX BA session in transport 



The queues and all the related logic suits to the transport layer.

Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent e13c0c59

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

+5 −72
Original line number Diff line number Diff line
@@ -42,33 +42,6 @@ 
#include "iwl-agn.h"

#include "iwl-trans.h"



static inline int get_ac_from_tid(u16 tid)

{

	if (likely(tid < ARRAY_SIZE(tid_to_ac)))

		return tid_to_ac[tid];



	/* no support for TIDs 8-15 yet */

	return -EINVAL;

}



static int iwlagn_txq_agg_enable(struct iwl_priv *priv, int txq_id, int sta_id,

				int tid)

{

	if ((IWLAGN_FIRST_AMPDU_QUEUE > txq_id) ||

	    (IWLAGN_FIRST_AMPDU_QUEUE +

		hw_params(priv).num_ampdu_queues <= txq_id)) {

		IWL_WARN(priv,

			"queue number out of range: %d, must be %d to %d\n",

			txq_id, IWLAGN_FIRST_AMPDU_QUEUE,

			IWLAGN_FIRST_AMPDU_QUEUE +

			hw_params(priv).num_ampdu_queues - 1);

		return -EINVAL;

	}



	/* Modify device's station table to Tx this TID */

	return iwl_sta_tx_modify_enable_tid(priv, sta_id, tid);

}



static void iwlagn_tx_cmd_protection(struct iwl_priv *priv,

				     struct ieee80211_tx_info *info,

				     __le16 fc, __le32 *tx_flags)
@@ -399,30 +372,12 @@ int iwlagn_tx_skb(struct iwl_priv *priv, struct sk_buff *skb) 
	return -1;

}



/*

 * Find first available (lowest unused) Tx Queue, mark it "active".

 * Called only when finding queue for aggregation.

 * Should never return anything < 7, because they should already

 * be in use as EDCA AC (0-3), Command (4), reserved (5, 6)

 */

static int iwlagn_txq_ctx_activate_free(struct iwl_priv *priv)

{

	int txq_id;



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

		if (!test_and_set_bit(txq_id, &priv->txq_ctx_active_msk))

			return txq_id;

	return -1;

}



int iwlagn_tx_agg_start(struct iwl_priv *priv, struct ieee80211_vif *vif,

			struct ieee80211_sta *sta, u16 tid, u16 *ssn)

{

	struct iwl_vif_priv *vif_priv = (void *)vif->drv_priv;

	int sta_id;

	int txq_id;

	int ret;

	unsigned long flags;

	struct iwl_tid_data *tid_data;



	IWL_DEBUG_HT(priv, "TX AGG request on ra = %pM tid = %d\n",

		     sta->addr, tid);
@@ -440,35 +395,13 @@ int iwlagn_tx_agg_start(struct iwl_priv *priv, struct ieee80211_vif *vif, 
		return -ENXIO;

	}



	txq_id = iwlagn_txq_ctx_activate_free(priv);

	if (txq_id == -1) {

		IWL_ERR(priv, "No free aggregation queue available\n");

		return -ENXIO;

	}



	spin_lock_irqsave(&priv->shrd->sta_lock, flags);

	tid_data = &priv->shrd->tid_data[sta_id][tid];

	*ssn = SEQ_TO_SN(tid_data->seq_number);

	tid_data->agg.txq_id = txq_id;

	iwl_set_swq_id(&priv->txq[txq_id], get_ac_from_tid(tid), txq_id);

	spin_unlock_irqrestore(&priv->shrd->sta_lock, flags);



	ret = iwlagn_txq_agg_enable(priv, txq_id, sta_id, tid);

	ret = iwl_sta_tx_modify_enable_tid(priv, sta_id, tid);

	if (ret)

		return ret;



	spin_lock_irqsave(&priv->shrd->sta_lock, flags);

	tid_data = &priv->shrd->tid_data[sta_id][tid];

	if (tid_data->tfds_in_queue == 0) {

		IWL_DEBUG_HT(priv, "HW queue is empty\n");

		tid_data->agg.state = IWL_AGG_ON;

		ieee80211_start_tx_ba_cb_irqsafe(vif, sta->addr, tid);

	} else {

		IWL_DEBUG_HT(priv, "HW queue is NOT empty: %d packets in HW queue\n",

			     tid_data->tfds_in_queue);

		tid_data->agg.state = IWL_EMPTYING_HW_QUEUE_ADDBA;

	}

	spin_unlock_irqrestore(&priv->shrd->sta_lock, flags);

	ret = iwl_trans_tx_agg_alloc(trans(priv), vif_priv->ctx->ctxid, sta_id,

				     tid, ssn);



	return ret;

}

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

+8 −0
Original line number Diff line number Diff line
@@ -1858,3 +1858,11 @@ __le32 iwl_add_beacon_time(struct iwl_priv *priv, u32 base, 
	return cpu_to_le32(res);

}



void iwl_start_tx_ba_trans_ready(struct iwl_priv *priv, u8 ctx,

				 u8 sta_id, u8 tid)

{

	struct ieee80211_vif *vif = priv->contexts[ctx].vif;

	u8 *addr = priv->stations[sta_id].sta.sta.addr;



	ieee80211_start_tx_ba_cb_irqsafe(vif, addr, tid);

}

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

+12 −0
Original line number Diff line number Diff line
@@ -321,6 +321,15 @@ static const u8 tid_to_ac[] = { 
	IEEE80211_AC_VO

};



static inline int get_ac_from_tid(u16 tid)

{

	if (likely(tid < ARRAY_SIZE(tid_to_ac)))

		return tid_to_ac[tid];



	/* no support for TIDs 8-15 yet */

	return -EINVAL;

}



enum iwl_rxon_context_id {

	IWL_RXON_CTX_BSS,

	IWL_RXON_CTX_PAN,
@@ -337,6 +346,9 @@ int iwl_probe(struct iwl_bus *bus, const struct iwl_trans_ops *trans_ops, 
		struct iwl_cfg *cfg);

void __devexit iwl_remove(struct iwl_priv * priv);



void iwl_start_tx_ba_trans_ready(struct iwl_priv *priv, u8 ctx,

				 u8 sta_id, u8 tid);



/*****************************************************

* DRIVER STATUS FUNCTIONS

******************************************************/

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

+3 −0
Original line number Diff line number Diff line
@@ -194,6 +194,9 @@ void iwl_trans_set_wr_ptrs(struct iwl_trans *trans, int txq_id, u32 index); 
void iwl_trans_tx_queue_set_status(struct iwl_priv *priv,

			     struct iwl_tx_queue *txq,

			     int tx_fifo_id, int scd_retry);

int iwl_trans_pcie_tx_agg_alloc(struct iwl_trans *trans,

				enum iwl_rxon_context_id ctx, int sta_id,

				int tid, u16 *ssn);

void iwl_trans_pcie_txq_agg_setup(struct iwl_priv *priv,

					enum iwl_rxon_context_id ctx,

					int sta_id, int tid, int frame_limit);

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

+52 −1
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ 
#include <linux/etherdevice.h>

#include <linux/slab.h>

#include <linux/sched.h>

#include <net/mac80211.h>



#include "iwl-agn.h"

#include "iwl-dev.h"
@@ -509,6 +508,58 @@ void iwl_trans_pcie_txq_agg_setup(struct iwl_priv *priv, 
	spin_unlock_irqrestore(&priv->shrd->lock, flags);

}



/*

 * Find first available (lowest unused) Tx Queue, mark it "active".

 * Called only when finding queue for aggregation.

 * Should never return anything < 7, because they should already

 * be in use as EDCA AC (0-3), Command (4), reserved (5, 6)

 */

static int iwlagn_txq_ctx_activate_free(struct iwl_trans *trans)

{

	int txq_id;



	for (txq_id = 0; txq_id < hw_params(trans).max_txq_num; txq_id++)

		if (!test_and_set_bit(txq_id,

					&priv(trans)->txq_ctx_active_msk))

			return txq_id;

	return -1;

}



int iwl_trans_pcie_tx_agg_alloc(struct iwl_trans *trans,

				enum iwl_rxon_context_id ctx, int sta_id,

				int tid, u16 *ssn)

{

	struct iwl_tid_data *tid_data;

	unsigned long flags;

	u16 txq_id;

	struct iwl_priv *priv = priv(trans);



	txq_id = iwlagn_txq_ctx_activate_free(trans);

	if (txq_id == -1) {

		IWL_ERR(trans, "No free aggregation queue available\n");

		return -ENXIO;

	}



	spin_lock_irqsave(&trans->shrd->sta_lock, flags);

	tid_data = &trans->shrd->tid_data[sta_id][tid];

	*ssn = SEQ_TO_SN(tid_data->seq_number);

	tid_data->agg.txq_id = txq_id;

	iwl_set_swq_id(&priv->txq[txq_id], get_ac_from_tid(tid), txq_id);



	tid_data = &trans->shrd->tid_data[sta_id][tid];

	if (tid_data->tfds_in_queue == 0) {

		IWL_DEBUG_HT(trans, "HW queue is empty\n");

		tid_data->agg.state = IWL_AGG_ON;

		iwl_start_tx_ba_trans_ready(priv(trans), ctx, sta_id, tid);

	} else {

		IWL_DEBUG_HT(trans, "HW queue is NOT empty: %d packets in HW"

			     "queue\n", tid_data->tfds_in_queue);

		tid_data->agg.state = IWL_EMPTYING_HW_QUEUE_ADDBA;

	}

	spin_unlock_irqrestore(&priv->shrd->sta_lock, flags);



	return 0;

}

int iwl_trans_pcie_txq_agg_disable(struct iwl_priv *priv, u16 txq_id)

{

	struct iwl_trans *trans = trans(priv);