Commit e4c49c49 authored by Luca Coelho's avatar Luca Coelho

iwlwifi: pcie: only use d0i3 in suspend/resume if system_pm is set to d0i3

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=194791Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent addce854
...@@ -2803,7 +2803,8 @@ static struct iwl_trans_dump_data ...@@ -2803,7 +2803,8 @@ static struct iwl_trans_dump_data
#ifdef CONFIG_PM_SLEEP #ifdef CONFIG_PM_SLEEP
static int iwl_trans_pcie_suspend(struct iwl_trans *trans) 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 iwl_pci_fw_enter_d0i3(trans);
return 0; return 0;
...@@ -2811,7 +2812,8 @@ static int iwl_trans_pcie_suspend(struct iwl_trans *trans) ...@@ -2811,7 +2812,8 @@ static int iwl_trans_pcie_suspend(struct iwl_trans *trans)
static void iwl_trans_pcie_resume(struct iwl_trans *trans) static 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); iwl_pci_fw_exit_d0i3(trans);
} }
#endif /* CONFIG_PM_SLEEP */ #endif /* CONFIG_PM_SLEEP */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment