|
@@ -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");
|