lkml.org 
[lkml]   [2019]   [Jul]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 7/8] PM: sleep: Integrate suspend-to-idle with generig suspend flow
Date
From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

After previous changes the suspend-to-idle code flow can be
integrated more tightly with the generic system suspend code flow
by making suspend_enter() call s2idle_loop() later and removing
the direct invocations of dpm_noirq_begin(),
dpm_noirq_suspend_devices(), dpm_noirq_end(), and
dpm_noirq_resume_devices() from the latter, so do that.

This change is not expected to alter functionality.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---
kernel/power/suspend.c | 21 +++++----------------
1 file changed, 5 insertions(+), 16 deletions(-)

Index: linux-pm/kernel/power/suspend.c
===================================================================
--- linux-pm.orig/kernel/power/suspend.c
+++ linux-pm/kernel/power/suspend.c
@@ -119,13 +119,6 @@ static void s2idle_enter(void)

static void s2idle_loop(void)
{
- int error;
-
- dpm_noirq_begin();
- error = dpm_noirq_suspend_devices(PMSG_SUSPEND);
- if (error)
- goto resume;
-
pm_pr_dbg("suspend-to-idle\n");

/*
@@ -150,10 +143,6 @@ static void s2idle_loop(void)
}

pm_pr_dbg("resume from suspend-to-idle\n");
-
-resume:
- dpm_noirq_resume_devices(PMSG_RESUME);
- dpm_noirq_end();
}

void s2idle_wake(void)
@@ -408,11 +397,6 @@ static int suspend_enter(suspend_state_t
if (error)
goto Devices_early_resume;

- if (state == PM_SUSPEND_TO_IDLE && pm_test_level != TEST_PLATFORM) {
- s2idle_loop();
- goto Platform_early_resume;
- }
-
error = dpm_suspend_noirq(PMSG_SUSPEND);
if (error) {
pr_err("noirq suspend of devices failed\n");
@@ -425,6 +409,11 @@ static int suspend_enter(suspend_state_t
if (suspend_test(TEST_PLATFORM))
goto Platform_wake;

+ if (state == PM_SUSPEND_TO_IDLE) {
+ s2idle_loop();
+ goto Platform_wake;
+ }
+
error = suspend_disable_secondary_cpus();
if (error || suspend_test(TEST_CPUS))
goto Enable_cpus;


\
 
 \ /
  Last update: 2019-07-16 18:31    [W:0.068 / U:2.280 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site