mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git
synced 2026-05-02 18:17:50 -04:00
PM: suspend: Do not pause cpuidle in the suspend-to-idle path
It is pointless to pause cpuidle in the suspend-to-idle path, because it is going to be resumed in the same path later and pausing it does not serve any particular purpose in that case. Rework the code to avoid doing that. Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org> Tested-by: Ulf Hansson <ulf.hansson@linaro.org>
This commit is contained in:
@@ -747,8 +747,6 @@ void dpm_resume_noirq(pm_message_t state)
|
||||
|
||||
resume_device_irqs();
|
||||
device_wakeup_disarm_wake_irqs();
|
||||
|
||||
cpuidle_resume();
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -881,6 +879,7 @@ void dpm_resume_early(pm_message_t state)
|
||||
void dpm_resume_start(pm_message_t state)
|
||||
{
|
||||
dpm_resume_noirq(state);
|
||||
cpuidle_resume();
|
||||
dpm_resume_early(state);
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(dpm_resume_start);
|
||||
@@ -1337,8 +1336,6 @@ int dpm_suspend_noirq(pm_message_t state)
|
||||
{
|
||||
int ret;
|
||||
|
||||
cpuidle_pause();
|
||||
|
||||
device_wakeup_arm_wake_irqs();
|
||||
suspend_device_irqs();
|
||||
|
||||
@@ -1522,9 +1519,13 @@ int dpm_suspend_end(pm_message_t state)
|
||||
if (error)
|
||||
goto out;
|
||||
|
||||
cpuidle_pause();
|
||||
|
||||
error = dpm_suspend_noirq(state);
|
||||
if (error)
|
||||
if (error) {
|
||||
cpuidle_resume();
|
||||
dpm_resume_early(resume_event(state));
|
||||
}
|
||||
|
||||
out:
|
||||
dpm_show_time(starttime, state, error, "end");
|
||||
|
||||
Reference in New Issue
Block a user