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

Commit b4f7a9d1 authored by Liad Kaufman's avatar Liad Kaufman Committed by Emmanuel Grumbach
Browse files

iwlwifi: mvm: support sw queue start/stop from mvm 



Add a wrapper function to allow stopping SW queues from MVM
as well.

Signed-off-by: default avatarLiad Kaufman <liad.kaufman@intel.com>
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent e27deb45

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

+4 −0
Original line number Diff line number Diff line
@@ -1556,6 +1556,10 @@ static inline void iwl_mvm_stop_device(struct iwl_mvm *mvm) 
	iwl_trans_stop_device(mvm->trans);

}



/* Stop/start all mac queues in a given bitmap */

void iwl_mvm_start_mac_queues(struct iwl_mvm *mvm, unsigned long mq);

void iwl_mvm_stop_mac_queues(struct iwl_mvm *mvm, unsigned long mq);



/* Thermal management and CT-kill */

void iwl_mvm_tt_tx_backoff(struct iwl_mvm *mvm, u32 backoff);

void iwl_mvm_tt_temp_changed(struct iwl_mvm *mvm, u32 temp);

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

+24 −14
Original line number Diff line number Diff line
@@ -897,24 +897,17 @@ static void iwl_mvm_rx_mq(struct iwl_op_mode *op_mode, 
		iwl_mvm_rx_common(mvm, rxb, pkt);

}



static void iwl_mvm_stop_sw_queue(struct iwl_op_mode *op_mode, int queue)

void iwl_mvm_stop_mac_queues(struct iwl_mvm *mvm, unsigned long mq)

{

	struct iwl_mvm *mvm = IWL_OP_MODE_GET_MVM(op_mode);

	unsigned long mq;

	int q;



	spin_lock_bh(&mvm->queue_info_lock);

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

	spin_unlock_bh(&mvm->queue_info_lock);



	if (WARN_ON_ONCE(!mq))

		return;



	for_each_set_bit(q, &mq, IEEE80211_MAX_QUEUES) {

		if (atomic_inc_return(&mvm->mac80211_queue_stop_count[q]) > 1) {

			IWL_DEBUG_TX_QUEUES(mvm,

					    "queue %d (mac80211 %d) already stopped\n",

					    queue, q);

					    "mac80211 %d already stopped\n", q);

			continue;

		}
@@ -934,24 +927,29 @@ static void iwl_mvm_async_cb(struct iwl_op_mode *op_mode, 
	iwl_trans_block_txq_ptrs(mvm->trans, false);

}



static void iwl_mvm_wake_sw_queue(struct iwl_op_mode *op_mode, int queue)

static void iwl_mvm_stop_sw_queue(struct iwl_op_mode *op_mode, int hw_queue)

{

	struct iwl_mvm *mvm = IWL_OP_MODE_GET_MVM(op_mode);

	unsigned long mq;

	int q;



	spin_lock_bh(&mvm->queue_info_lock);

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

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

	spin_unlock_bh(&mvm->queue_info_lock);



	iwl_mvm_stop_mac_queues(mvm, mq);

}



void iwl_mvm_start_mac_queues(struct iwl_mvm *mvm, unsigned long mq)

{

	int q;



	if (WARN_ON_ONCE(!mq))

		return;



	for_each_set_bit(q, &mq, IEEE80211_MAX_QUEUES) {

		if (atomic_dec_return(&mvm->mac80211_queue_stop_count[q]) > 0) {

			IWL_DEBUG_TX_QUEUES(mvm,

					    "queue %d (mac80211 %d) still stopped\n",

					    queue, q);

					    "mac80211 %d still stopped\n", q);

			continue;

		}
@@ -959,6 +957,18 @@ static void iwl_mvm_wake_sw_queue(struct iwl_op_mode *op_mode, int queue) 
	}

}



static void iwl_mvm_wake_sw_queue(struct iwl_op_mode *op_mode, int hw_queue)

{

	struct iwl_mvm *mvm = IWL_OP_MODE_GET_MVM(op_mode);

	unsigned long mq;



	spin_lock_bh(&mvm->queue_info_lock);

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

	spin_unlock_bh(&mvm->queue_info_lock);



	iwl_mvm_start_mac_queues(mvm, mq);

}



void iwl_mvm_set_hw_ctkill_state(struct iwl_mvm *mvm, bool state)

{

	if (state)