iwlwifi: avoid d0i3 commands when no/init ucode is loaded

d0i3 commands are not supported in the init image, so take
a reference to ensure we don't enter d0i3 during init image,
and additional checks to prevent d0i3 commands when no
fw image is loaded.

Add a few WARN_ON_ONCE to the d0i3 enter/exit commands
to ensure we send d0i3 commands only when the normal
ucode is loaded.

Signed-off-by: Eliad Peller <eliadx.peller@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c b/drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c
index 7e2a8149411c35c67680abb3a64ed381749586e8..9ce7587e329df506f5ea4e231bf20e588d0b9923 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c
@@ -1316,6 +1316,7 @@ static ssize_t iwl_dbgfs_d0i3_refs_read(struct file *file,
        PRINT_MVM_REF(IWL_MVM_REF_EXIT_WORK);
        PRINT_MVM_REF(IWL_MVM_REF_PROTECT_CSA);
        PRINT_MVM_REF(IWL_MVM_REF_FW_DBG_COLLECT);
+       PRINT_MVM_REF(IWL_MVM_REF_INIT_UCODE);
 
        return simple_read_from_buffer(user_buf, count, ppos, buf, pos);
 }

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
index 612799a889dbcd207c47ab6019de9d1d5de576f3..3f0db29d5d56133a78c060a8afb38c447ade6ef7 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
@@ -294,6 +294,7 @@ enum iwl_mvm_ref_type {
        IWL_MVM_REF_EXIT_WORK,
        IWL_MVM_REF_PROTECT_CSA,
        IWL_MVM_REF_FW_DBG_COLLECT,
+       IWL_MVM_REF_INIT_UCODE,
 
        /* update debugfs.c when changing this */
 

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/ops.c b/drivers/net/wireless/intel/iwlwifi/mvm/ops.c
index 958984cc4d2e2bb0667374cdcec11037b86afc0f..31c16a1850014e88becf3a323ae8ca6f08faf96e 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/ops.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/ops.c
@@ -603,9 +603,11 @@ iwl_op_mode_mvm_start(struct iwl_trans *trans, const struct iwl_cfg *cfg,
                        goto out_free;
 
                mutex_lock(&mvm->mutex);
+               iwl_mvm_ref(mvm, IWL_MVM_REF_INIT_UCODE);
                err = iwl_run_init_mvm_ucode(mvm, true);
                if (!err || !iwlmvm_mod_params.init_dbg)
                        iwl_trans_stop_device(trans);
+               iwl_mvm_unref(mvm, IWL_MVM_REF_INIT_UCODE);
                mutex_unlock(&mvm->mutex);
                /* returns 0 if successful, 1 if success but in rfkill */
                if (err < 0 && !iwlmvm_mod_params.init_dbg) {
@@ -1213,6 +1215,9 @@ int iwl_mvm_enter_d0i3(struct iwl_op_mode *op_mode)
 
        IWL_DEBUG_RPM(mvm, "MVM entering D0i3\n");
 
+       if (WARN_ON_ONCE(mvm->cur_ucode != IWL_UCODE_REGULAR))
+               return -EINVAL;
+
        set_bit(IWL_MVM_STATUS_IN_D0I3, &mvm->status);
 
        /*
@@ -1420,6 +1425,9 @@ int _iwl_mvm_exit_d0i3(struct iwl_mvm *mvm)
 
        IWL_DEBUG_RPM(mvm, "MVM exiting D0i3\n");
 
+       if (WARN_ON_ONCE(mvm->cur_ucode != IWL_UCODE_REGULAR))
+               return -EINVAL;
+
        mutex_lock(&mvm->d0i3_suspend_mutex);
        if (test_bit(D0I3_DEFER_WAKEUP, &mvm->d0i3_suspend_flags)) {
                IWL_DEBUG_RPM(mvm, "Deferring d0i3 exit until resume\n");