iwlwifi: mvm: let the firmware configure the scheduler

A new host command can be used to configure the scheduler
instead of accessing the scheduler's registers from the
driver. This is easier and less error prone since accessing
the hardware at certain moments can lead to races with the
firmware.
Prefer to use the host command whenever it is available.

Reviewed-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>

1 files changed, 34 insertions, 35 deletions

diff --git a/drivers/net/wireless/iwlwifi/mvm/utils.c b/drivers/net/wireless/iwlwifi/mvm/utils.c
index f0a114102c3f..85effe269a2a 100644
--- a/drivers/net/wireless/iwlwifi/mvm/utils.c
+++ b/drivers/net/wireless/iwlwifi/mvm/utils.c
@@ -533,47 +533,46 @@ void iwl_mvm_dump_nic_error_log(struct iwl_mvm *mvm)
 void iwl_mvm_enable_txq(struct iwl_mvm *mvm, int queue, u16 ssn,
                         const struct iwl_trans_txq_scd_cfg *cfg)
 {
-        if (iwl_mvm_is_dqa_supported(mvm)) {
-                struct iwl_scd_txq_cfg_cmd cmd = {
-                        .scd_queue = queue,
-                        .enable = 1,
-                        .window = cfg->frame_limit,
-                        .sta_id = cfg->sta_id,
-                        .ssn = cpu_to_le16(ssn),
-                        .tx_fifo = cfg->fifo,
-                        .aggregate = cfg->aggregate,
-                        .flags = IWL_SCD_FLAGS_DQA_ENABLED,
-                        .tid = cfg->tid,
-                        .control = IWL_SCD_CONTROL_SET_SSN,
-                };
-                int ret = iwl_mvm_send_cmd_pdu(mvm, SCD_QUEUE_CFG, 0,
-                                               sizeof(cmd), &cmd);
-                if (ret)
-                        IWL_ERR(mvm,
-                                "Failed to configure queue %d on FIFO %d\n",
-                                queue, cfg->fifo);
+        struct iwl_scd_txq_cfg_cmd cmd = {
+                .scd_queue = queue,
+                .enable = 1,
+                .window = cfg->frame_limit,
+                .sta_id = cfg->sta_id,
+                .ssn = cpu_to_le16(ssn),
+                .tx_fifo = cfg->fifo,
+                .aggregate = cfg->aggregate,
+                .tid = cfg->tid,
+        };
+
+        if (!iwl_mvm_is_scd_cfg_supported(mvm)) {
+                iwl_trans_txq_enable_cfg(mvm->trans, queue, ssn, cfg);
+                return;
         }
 
-        iwl_trans_txq_enable_cfg(mvm->trans, queue, ssn,
-                                 iwl_mvm_is_dqa_supported(mvm) ? NULL : cfg);
+        iwl_trans_txq_enable_cfg(mvm->trans, queue, ssn, NULL);
+        WARN(iwl_mvm_send_cmd_pdu(mvm, SCD_QUEUE_CFG, 0, sizeof(cmd), &cmd),
+             "Failed to configure queue %d on FIFO %d\n", queue, cfg->fifo);
 }
 
-void iwl_mvm_disable_txq(struct iwl_mvm *mvm, int queue)
+void iwl_mvm_disable_txq(struct iwl_mvm *mvm, int queue, u8 flags)
 {
-        iwl_trans_txq_disable(mvm->trans, queue,
-                              !iwl_mvm_is_dqa_supported(mvm));
-
-        if (iwl_mvm_is_dqa_supported(mvm)) {
-                struct iwl_scd_txq_cfg_cmd cmd = {
-                        .scd_queue = queue,
-                        .enable = 0,
-                };
-                int ret = iwl_mvm_send_cmd_pdu(mvm, SCD_QUEUE_CFG, CMD_ASYNC,
-                                               sizeof(cmd), &cmd);
-                if (ret)
-                        IWL_ERR(mvm, "Failed to disable queue %d (ret=%d)\n",
-                                queue, ret);
+        struct iwl_scd_txq_cfg_cmd cmd = {
+                .scd_queue = queue,
+                .enable = 0,
+        };
+        int ret;
+
+        if (!iwl_mvm_is_scd_cfg_supported(mvm)) {
+                iwl_trans_txq_disable(mvm->trans, queue, true);
+                return;
         }
+
+        iwl_trans_txq_disable(mvm->trans, queue, false);
+        ret = iwl_mvm_send_cmd_pdu(mvm, SCD_QUEUE_CFG, flags,
+                                   sizeof(cmd), &cmd);
+        if (ret)
+                IWL_ERR(mvm, "Failed to disable queue %d (ret=%d)\n",
+                        queue, ret);
 }
 
 /**