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

Commit 1f40e145 authored by Emmanuel Grumbach's avatar Emmanuel Grumbach Committed by Wey-Yi Guy
Browse files

iwlwifi: don't rely on the wr / rd pointers in DELBA flow 



In the same spirit as the previous patch. Eventually this will
allow us to remove the tid_data knowledge from 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>
parent 1ba42da4

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

+10 −11
Original line number Diff line number Diff line
@@ -599,10 +599,8 @@ int iwl_trans_pcie_tx_agg_disable(struct iwl_trans *trans, 
				  enum iwl_rxon_context_id ctx, int sta_id,

				  int tid)

{

	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);

	unsigned long flags;

	int read_ptr, write_ptr;

	struct iwl_tid_data *tid_data;

	unsigned long flags;

	int txq_id;



	spin_lock_irqsave(&trans->shrd->sta_lock, flags);
@@ -642,21 +640,22 @@ int iwl_trans_pcie_tx_agg_disable(struct iwl_trans *trans, 
		return 0;

	}



	write_ptr = trans_pcie->txq[txq_id].q.write_ptr;

	read_ptr = trans_pcie->txq[txq_id].q.read_ptr;

	tid_data->agg.ssn = SEQ_TO_SN(tid_data->seq_number);



	/* The queue is not empty */

	if (write_ptr != read_ptr) {

		IWL_DEBUG_TX_QUEUES(trans,

				    "Stopping a non empty AGG HW QUEUE\n");

	/* There are still packets for this RA / TID in the HW */

	if (tid_data->agg.ssn != tid_data->next_reclaimed) {

		IWL_DEBUG_TX_QUEUES(trans, "Can't proceed: ssn %d, "

				    "next_recl = %d",

				    tid_data->agg.ssn,

				    tid_data->next_reclaimed);

		trans->shrd->tid_data[sta_id][tid].agg.state =

			IWL_EMPTYING_HW_QUEUE_DELBA;

		tid_data->agg.ssn = SEQ_TO_SN(tid_data->seq_number);

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

		return 0;

	}



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

	IWL_DEBUG_TX_QUEUES(trans, "Can proceed: ssn = next_recl = %d",

			    tid_data->agg.ssn);

turn_off:

	trans->shrd->tid_data[sta_id][tid].agg.state = IWL_AGG_OFF;

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

+4 −6
Original line number Diff line number Diff line
@@ -1278,20 +1278,18 @@ static int iwl_trans_pcie_request_irq(struct iwl_trans *trans) 
static int iwlagn_txq_check_empty(struct iwl_trans *trans,

			   int sta_id, u8 tid, int txq_id)

{

	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);

	struct iwl_queue *q = &trans_pcie->txq[txq_id].q;

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



	lockdep_assert_held(&trans->shrd->sta_lock);



	switch (trans->shrd->tid_data[sta_id][tid].agg.state) {

	case IWL_EMPTYING_HW_QUEUE_DELBA:

		/* We are reclaiming the last packet of the */

		/* aggregated HW queue */

		/* There are no packets for this RA / TID in the HW any more */

		if ((txq_id  == tid_data->agg.txq_id) &&

		    (q->read_ptr == q->write_ptr)) {

		    (tid_data->agg.ssn == tid_data->next_reclaimed)) {

			IWL_DEBUG_TX_QUEUES(trans,

				"HW queue empty: continue DELBA flow\n");

				"Can continue DELBA flow ssn = next_recl ="

				" %d", tid_data->next_reclaimed);

			iwl_trans_pcie_txq_agg_disable(trans, txq_id);

			tid_data->agg.state = IWL_AGG_OFF;

			iwl_stop_tx_ba_trans_ready(priv(trans),