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

Commit edbe961c authored by Liad Kaufman's avatar Liad Kaufman Committed by Luca Coelho
Browse files

iwlwifi: mvm: keep track of tid associated with each queue 



When sending the SCD_QUEUE_CONFIG command, the queue is
associated to a specific TID. If later there is a need to
use this TID on a different queue instead, it first needs to
be unassociated from the first queue.

Keep track for every queue what TID is associated with it.

Signed-off-by: default avatarLiad Kaufman <liad.kaufman@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent 9f9af3d7

drivers/net/wireless/intel/iwlwifi/mvm/mvm.h

+1 −0
Original line number Diff line number Diff line
@@ -772,6 +772,7 @@ struct iwl_mvm { 
		u8 ra_sta_id; /* The RA this queue is mapped to, if exists */

		bool reserved; /* Is this the TXQ reserved for a STA */

		u8 mac80211_ac; /* The mac80211 AC this queue is mapped to */

		u8 txq_tid; /* The TID "owner" of this queue*/

		u16 tid_bitmap; /* Bitmap of the TIDs mapped to this queue */

		/* Timestamp for inactivation per TID of this queue */

		unsigned long last_frame_time[IWL_MAX_TID_COUNT + 1];

drivers/net/wireless/intel/iwlwifi/mvm/sta.c

+7 −0
Original line number Diff line number Diff line
@@ -562,6 +562,7 @@ int iwl_mvm_scd_queue_redirect(struct iwl_mvm *mvm, int queue, int tid, 


	cmd.sta_id = mvm->queue_info[queue].ra_sta_id;

	cmd.tx_fifo = iwl_mvm_ac_to_tx_fifo[mvm->queue_info[queue].mac80211_ac];

	cmd.tid = mvm->queue_info[queue].txq_tid;

	mq = mvm->queue_info[queue].hw_queue_to_mac80211;

	shared_queue = (mvm->queue_info[queue].hw_queue_refcount > 1);

	spin_unlock_bh(&mvm->queue_info_lock);
@@ -591,6 +592,11 @@ int iwl_mvm_scd_queue_redirect(struct iwl_mvm *mvm, int queue, int tid, 
			     cmd.sta_id, tid, LINK_QUAL_AGG_FRAME_LIMIT_DEF,

			     ssn, wdg_timeout);



	/* Update the TID "owner" of the queue */

	spin_lock_bh(&mvm->queue_info_lock);

	mvm->queue_info[queue].txq_tid = tid;

	spin_unlock_bh(&mvm->queue_info_lock);



	/* TODO: Work-around SCD bug when moving back by multiples of 0x40 */



	/* Redirect to lower AC */
@@ -749,6 +755,7 @@ static int iwl_mvm_sta_alloc_queue(struct iwl_mvm *mvm, 
		ac = mvm->queue_info[queue].mac80211_ac;

		cmd.sta_id = mvm->queue_info[queue].ra_sta_id;

		cmd.tx_fifo = iwl_mvm_ac_to_tx_fifo[ac];

		cmd.tid = mvm->queue_info[queue].txq_tid;

		spin_unlock_bh(&mvm->queue_info_lock);



		/* Disable the queue */

drivers/net/wireless/intel/iwlwifi/mvm/utils.c

+3 −0
Original line number Diff line number Diff line
@@ -669,6 +669,8 @@ void iwl_mvm_enable_txq(struct iwl_mvm *mvm, int queue, int mac80211_queue, 
				tid_to_mac80211_ac[cfg->tid];

		else

			mvm->queue_info[queue].mac80211_ac = IEEE80211_AC_VO;



		mvm->queue_info[queue].txq_tid = cfg->tid;

	}



	IWL_DEBUG_TX_QUEUES(mvm,
@@ -761,6 +763,7 @@ void iwl_mvm_disable_txq(struct iwl_mvm *mvm, int queue, int mac80211_queue, 
	}



	cmd.sta_id = mvm->queue_info[queue].ra_sta_id;

	cmd.tid = mvm->queue_info[queue].txq_tid;



	/* Make sure queue info is correct even though we overwrite it */

	WARN(mvm->queue_info[queue].hw_queue_refcount ||