iwlwifi: mvm: prepare for scheduler config command

The scheduler is a HW sub-block that directs the work of the Flow
Handler by issuing requests for frame transfers, specifying source
and destination. Its primary function is to allocate flows into the
TX FIFOs based upon a pre-determined mapping.

The driver has some responsibilities to the scheduler, namely
initialising and maintaining the hardware registers. This is
currently done by directly accessing them, which can cause races
with the firmware also accessing the registers.

To address this problem, change the driver to no longer directly
access the registers but go through the firmware for this if the
firmware has support for DQA and thus the new command.

Signed-off-by: Avri Altman <avri.altman@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>

1 files changed, 46 insertions, 0 deletions

diff --git a/drivers/net/wireless/iwlwifi/mvm/utils.c b/drivers/net/wireless/iwlwifi/mvm/utils.c
index 1958f298ac8b..8021f6eec27f 100644
--- a/drivers/net/wireless/iwlwifi/mvm/utils.c
+++ b/drivers/net/wireless/iwlwifi/mvm/utils.c
@@ -530,6 +530,52 @@ void iwl_mvm_dump_nic_error_log(struct iwl_mvm *mvm)
                 iwl_mvm_dump_umac_error_log(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);
+        }
+
+        iwl_trans_txq_enable_cfg(mvm->trans, queue, ssn,
+                                 iwl_mvm_is_dqa_supported(mvm) ? NULL : cfg);
+}
+
+void iwl_mvm_disable_txq(struct iwl_mvm *mvm, int queue)
+{
+        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);
+        }
+}
+
 /**
  * iwl_mvm_send_lq_cmd() - Send link quality command
  * @init: This command is sent as part of station initialization right