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: Liad Kaufman <liad.kaufman@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
index 7ea2baae04893be7b830e5636215d5ff0626f50a..f9019c4a5c0e1e19d715422bb525f175d7d59ebc 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
@@ -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);

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/ops.c b/drivers/net/wireless/intel/iwlwifi/mvm/ops.c
index 3760a094b932c265f338494142223ef809b2925a..e6d0adc070291d697dbe99d4c8dc07a07ed89596 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/ops.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/ops.c
@@ -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)