Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9345b988 authored by Luca Coelho's avatar Luca Coelho Committed by Greg Kroah-Hartman
Browse files

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


[ 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



Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Signed-off-by: default avatarSasha Levin <alexander.levin@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 87a9c569

drivers/net/wireless/intel/iwlwifi/pcie/trans.c

+4 −2
Original line number Diff line number Diff line
@@ -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(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);

}

#endif /* CONFIG_PM_SLEEP */