Patch "iwlwifi: pcie: only use d0i3 in suspend/resume if system_pm is set to d0i3" has been added to the 4.9-stable tree
Subsystems (2)
This is a note to let you know that I've just added the patch titled
iwlwifi: pcie: only use d0i3 in suspend/resume if system_pm is set to d0i3
to the 4.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
iwlwifi-pcie-only-use-d0i3-in-suspend-resume-if-system_pm-is-set-to-d0i3.patch
and it can be found in the queue-4.9 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From foo@baz Mon Apr 9 17:09:24 CEST 2018
From: Luca Coelho <[email protected]>
Date: Fri, 24 Mar 2017 11:01:45 +0200
Subject: iwlwifi: pcie: only use d0i3 in suspend/resume if system_pm is set to d0i3
From: Luca Coelho <[email protected]>
[ Upstream commit e4c49c4937951de1cdbe35572ade40c948dec1e1 ]
We only need to handle d0i3 entry and exit during suspend resume if system_pm is set to IWL_PLAT_PM_MODE_D0I3, otherwise d0i3 entry failures will cause suspend to fail.
This fixes https://bugzilla.kernel.org/show_bug.cgi?id=194791
--- drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/net/wireless/intel/iwlwifi/pcie/trans.c +4 -2
@@ -2824,7 +2824,8 @@ static struct iwl_trans_dump_data#ifdef CONFIG_PM_SLEEP static int iwl_trans_pcie_suspend (struct iwl_trans *trans) { -if (trans->runtime_pm_mode ==IWL_PLAT_PM_MODE_D0I3 ) +if (trans->runtime_pm_mode ==IWL_PLAT_PM_MODE_D0I3 && + (trans->system_pm_mode ==IWL_PLAT_PM_MODE_D0I3 ))return iwl_pci_fw_enter_d0i3 (trans);return 0 ;
@@ -2832,7 +2833,8 @@ static int iwl_trans_pcie_suspend(structstatic void iwl_trans_pcie_resume (struct iwl_trans *trans) { -if (trans->runtime_pm_mode ==IWL_PLAT_PM_MODE_D0I3 ) +if (trans->runtime_pm_mode ==IWL_PLAT_PM_MODE_D0I3 && + (trans->system_pm_mode ==IWL_PLAT_PM_MODE_D0I3 ))iwl_pci_fw_exit_d0i3 (trans); }#endif /* CONFIG_PM_SLEEP */
Patches currently in stable-queue which might be from [email protected] are
queue-4.9/iwlwifi-mvm-fix-command-queue-number-on-d0i3-flow.patch queue-4.9/iwlwifi-tt-move-ucode_loaded-check-under-mutex.patch queue-4.9/iwlwifi-fix-min-api-version-for-7265d-3168-8000-and-8265.patch queue-4.9/iwlwifi-mvm-fix-firmware-debug-restart-recording.patch queue-4.9/mac80211-bail-out-from-prep_connection-if-a-reconfig-is-ongoing.patch queue-4.9/iwlwifi-pcie-only-use-d0i3-in-suspend-resume-if-system_pm-is-set-to-d0i3.patch