Commit 2f629a77 authored by Johannes Berg's avatar Johannes Berg Committed by Kalle Valo
Browse files

iwlwifi: mvm: reset PM state on unsuccessful resume 



If resume fails for some reason, we need to set the PM state
back to normal so we're able to send commands during firmware
reset, rather than failing all of them because we're in D3.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Fixes: 708a39aa ("iwlwifi: mvm: don't send commands during suspend\resume transition")
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/iwlwifi.20211016114029.7ceb9eaca9f6.If0cbef38c6d07ec1ddce125878a4bdadcb35d2c9@changeid
parent 8347c806

drivers/net/wireless/intel/iwlwifi/mvm/d3.c

+4 −1
Original line number Diff line number Diff line
@@ -2336,7 +2336,6 @@ static int __iwl_mvm_resume(struct iwl_mvm *mvm, bool test) 
		iwl_fw_dbg_collect_desc(&mvm->fwrt, &iwl_dump_desc_assert,

					false, 0);

		ret = 1;

		mvm->trans->system_pm_mode = IWL_PLAT_PM_MODE_DISABLED;

		goto err;

	}
@@ -2385,6 +2384,7 @@ static int __iwl_mvm_resume(struct iwl_mvm *mvm, bool test) 
		}

	}



	/* after the successful handshake, we're out of D3 */

	mvm->trans->system_pm_mode = IWL_PLAT_PM_MODE_DISABLED;



	/*
@@ -2455,6 +2455,9 @@ static int __iwl_mvm_resume(struct iwl_mvm *mvm, bool test) 
	 */

	set_bit(IWL_MVM_STATUS_HW_RESTART_REQUESTED, &mvm->status);



	/* regardless of what happened, we're now out of D3 */

	mvm->trans->system_pm_mode = IWL_PLAT_PM_MODE_DISABLED;



	return 1;

}