iwlwifi: mvm: reset the temperature when temperature test is disabled

Since we can't read the actual temperature when the firmware is
running, just set the temperature to 0 when the test is disabled and
disable CT Kill if it was enabled.

Additionally, since we rely on iwl_mvm_tt_handler() to exit CT kill
when in test mode, call iwl_mvm_exit_ctkill() in that function if the
temperature is low again.  Also make the iwl_mvm_enter_ctkill() and
iwl_mvm_exit_ctkill() return if called when not necessary anymore
(e.g. when iwl_mvm_exit_ctkill() is called when we're not in CT-kill).

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

2 files changed, 22 insertions, 0 deletions

diff --git a/drivers/net/wireless/iwlwifi/mvm/debugfs.c b/drivers/net/wireless/iwlwifi/mvm/debugfs.c
index f7e44889182a..83e562b95a8e 100644
--- a/drivers/net/wireless/iwlwifi/mvm/debugfs.c
+++ b/drivers/net/wireless/iwlwifi/mvm/debugfs.c
@@ -296,7 +296,15 @@ static ssize_t iwl_dbgfs_set_nic_temperature_write(struct iwl_mvm *mvm,
 
         mutex_lock(&mvm->mutex);
         if (temperature == IWL_MVM_DEBUG_SET_TEMPERATURE_DISABLE) {
+                if (!mvm->temperature_test)
+                        goto out;
+
                 mvm->temperature_test = false;
+                /* Since we can't read the temp while awake, just set
+                 * it to zero until we get the next RX stats from the
+                 * firmware.
+                 */
+                mvm->temperature = 0;
         } else {
                 mvm->temperature_test = true;
                 mvm->temperature = temperature;
@@ -306,6 +314,8 @@ static ssize_t iwl_dbgfs_set_nic_temperature_write(struct iwl_mvm *mvm,
                        mvm->temperature);
         /* handle the temperature change */
         iwl_mvm_tt_handler(mvm);
+
+out:
         mutex_unlock(&mvm->mutex);
 
         return count;
diff --git a/drivers/net/wireless/iwlwifi/mvm/tt.c b/drivers/net/wireless/iwlwifi/mvm/tt.c
index 0464599c111e..d31603cbb17d 100644
--- a/drivers/net/wireless/iwlwifi/mvm/tt.c
+++ b/drivers/net/wireless/iwlwifi/mvm/tt.c
@@ -314,6 +314,9 @@ static void iwl_mvm_enter_ctkill(struct iwl_mvm *mvm)
 {
         u32 duration = mvm->thermal_throttle.params->ct_kill_duration;
 
+        if (test_bit(IWL_MVM_STATUS_HW_CTKILL, &mvm->status))
+                return;
+
         IWL_ERR(mvm, "Enter CT Kill\n");
         iwl_mvm_set_hw_ctkill_state(mvm, true);
         schedule_delayed_work(&mvm->thermal_throttle.ct_kill_exit,
@@ -322,6 +325,9 @@ static void iwl_mvm_enter_ctkill(struct iwl_mvm *mvm)
 
 static void iwl_mvm_exit_ctkill(struct iwl_mvm *mvm)
 {
+        if (!test_bit(IWL_MVM_STATUS_HW_CTKILL, &mvm->status))
+                return;
+
         IWL_ERR(mvm, "Exit CT Kill\n");
         iwl_mvm_set_hw_ctkill_state(mvm, false);
 }
@@ -444,6 +450,12 @@ void iwl_mvm_tt_handler(struct iwl_mvm *mvm)
                 return;
         }
 
+        if (params->support_ct_kill &&
+            temperature <= tt->params->ct_kill_exit) {
+                iwl_mvm_exit_ctkill(mvm);
+                return;
+        }
+
         if (params->support_dynamic_smps) {
                 if (!tt->dynamic_smps &&
                     temperature >= params->dynamic_smps_entry) {