Commit 808e0d88 authored by Mario Limonciello's avatar Mario Limonciello Committed by Tony Nguyen

e1000e: Only run S0ix flows if shutdown succeeded

If the shutdown failed, the part will be thawed and running
S0ix flows will put it into an undefined state.
Reported-by: default avatarAlexander Duyck <alexander.duyck@gmail.com>
Reviewed-by: default avatarAlexander Duyck <alexander.duyck@gmail.com>
Signed-off-by: default avatarMario Limonciello <mario.limonciello@dell.com>
Tested-by: default avatarYijun Shen <Yijun.shen@dell.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent 1f45dc22
...@@ -6970,13 +6970,14 @@ static __maybe_unused int e1000e_pm_suspend(struct device *dev) ...@@ -6970,13 +6970,14 @@ static __maybe_unused int e1000e_pm_suspend(struct device *dev)
e1000e_pm_freeze(dev); e1000e_pm_freeze(dev);
rc = __e1000_shutdown(pdev, false); rc = __e1000_shutdown(pdev, false);
if (rc) if (rc) {
e1000e_pm_thaw(dev); e1000e_pm_thaw(dev);
} else {
/* Introduce S0ix implementation */ /* Introduce S0ix implementation */
if (hw->mac.type >= e1000_pch_cnp && if (hw->mac.type >= e1000_pch_cnp &&
!e1000e_check_me(hw->adapter->pdev->device)) !e1000e_check_me(hw->adapter->pdev->device))
e1000e_s0ix_entry_flow(adapter); e1000e_s0ix_entry_flow(adapter);
}
return rc; return rc;
} }
......
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