iwlwifi: mvm: support dqa-mode agg on non-shared queue

In non-shared queues, DQA requires re-configuring existing
queues to become aggregated rather than allocating a new
one. It also requires "un-aggregating" an existing queue
when aggregations are turned off.

Support this requirement for non-shared queues.

Signed-off-by: Liad Kaufman <liad.kaufman@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>

1 files changed, 36 insertions, 1 deletions

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/utils.c b/drivers/net/wireless/intel/iwlwifi/mvm/utils.c
index eb41d3bd8059..161b99efd63d 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/utils.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/utils.c
@@ -587,12 +587,45 @@ int iwl_mvm_find_free_queue(struct iwl_mvm *mvm, u8 minq, u8 maxq)
 
         for (i = minq; i <= maxq; i++)
                 if (mvm->queue_info[i].hw_queue_refcount == 0 &&
-                    !mvm->queue_info[i].setup_reserved)
+                    mvm->queue_info[i].status == IWL_MVM_QUEUE_FREE)
                         return i;
 
         return -ENOSPC;
 }
 
+int iwl_mvm_reconfig_scd(struct iwl_mvm *mvm, int queue, int fifo, int sta_id,
+                         int tid, int frame_limit, u16 ssn)
+{
+        struct iwl_scd_txq_cfg_cmd cmd = {
+                .scd_queue = queue,
+                .enable = 1,
+                .window = frame_limit,
+                .sta_id = sta_id,
+                .ssn = cpu_to_le16(ssn),
+                .tx_fifo = fifo,
+                .aggregate = (queue >= IWL_MVM_DQA_MIN_DATA_QUEUE ||
+                              queue == IWL_MVM_DQA_BSS_CLIENT_QUEUE),
+                .tid = tid,
+        };
+        int ret;
+
+        spin_lock_bh(&mvm->queue_info_lock);
+        if (WARN(mvm->queue_info[queue].hw_queue_refcount == 0,
+                 "Trying to reconfig unallocated queue %d\n", queue)) {
+                spin_unlock_bh(&mvm->queue_info_lock);
+                return -ENXIO;
+        }
+        spin_unlock_bh(&mvm->queue_info_lock);
+
+        IWL_DEBUG_TX_QUEUES(mvm, "Reconfig SCD for TXQ #%d\n", queue);
+
+        ret = iwl_mvm_send_cmd_pdu(mvm, SCD_QUEUE_CFG, 0, sizeof(cmd), &cmd);
+        WARN_ONCE(ret, "Failed to re-configure queue %d on FIFO %d, ret=%d\n",
+                  queue, fifo, ret);
+
+        return ret;
+}
+
 void iwl_mvm_enable_txq(struct iwl_mvm *mvm, int queue, int mac80211_queue,
                         u16 ssn, const struct iwl_trans_txq_scd_cfg *cfg,
                         unsigned int wdg_timeout)
@@ -688,6 +721,8 @@ void iwl_mvm_disable_txq(struct iwl_mvm *mvm, int queue, int mac80211_queue,
         mvm->queue_info[queue].hw_queue_refcount--;
 
         cmd.enable = mvm->queue_info[queue].hw_queue_refcount ? 1 : 0;
+        if (!cmd.enable)
+                mvm->queue_info[queue].status = IWL_MVM_QUEUE_FREE;
 
         IWL_DEBUG_TX_QUEUES(mvm,
                             "Disabling TXQ #%d refcount=%d (mac80211 map:0x%x)\n",