lkml.org 
[lkml]   [2018]   [Mar]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL for 4.9 206/281] iwlwifi: pcie: only use d0i3 in suspend/resume if system_pm is set to d0i3
    Date
    From: Luca Coelho <luciano.coelho@intel.com>

    [ 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: Luca Coelho <luciano.coelho@intel.com>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    ---
    drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 6 ++++--
    1 file changed, 4 insertions(+), 2 deletions(-)

    diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
    index 10ef44e8ecd5..fe32de252e6b 100644
    --- a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
    +++ b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
    @@ -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 */
    --
    2.14.1
    \
     
     \ /
      Last update: 2018-03-19 19:00    [W:2.334 / U:0.464 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site