LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: "Rafael J. Wysocki" <rjw@sisk.pl>
To: Len Brown <lenb@kernel.org>
Cc: LKML <linux-kernel@vger.kernel.org>,
	ACPI Devel Mailing List <linux-acpi@vger.kernel.org>,
	Linux PM mailing list <linux-pm@lists.linux-foundation.org>,
	Ingo Molnar <mingo@elte.hu>
Subject: [PATCH 4/6] ACPI / PM: Call acpi_save_state_mem() right before low-level suspend
Date: Mon, 7 Feb 2011 23:20:53 +0100	[thread overview]
Message-ID: <201102072320.53799.rjw@sisk.pl> (raw)
In-Reply-To: <201102072316.41270.rjw@sisk.pl>

From: Rafael J. Wysocki <rjw@sisk.pl>

Since acpi_save_state_mem() is only called by acpi_suspend_enter()
if the target sleep state is S3, it's better to call it under the
switch (acpi_state), right before do_suspend_lowlevel().

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
---
 drivers/acpi/sleep.c |   12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

Index: linux-2.6/drivers/acpi/sleep.c
===================================================================
--- linux-2.6.orig/drivers/acpi/sleep.c
+++ linux-2.6/drivers/acpi/sleep.c
@@ -244,17 +244,10 @@ static int acpi_suspend_enter(suspend_st
 {
 	acpi_status status = AE_OK;
 	u32 acpi_state = acpi_target_sleep_state;
+	int error;
 
 	ACPI_FLUSH_CPU_CACHE();
 
-	/* Do arch specific saving of state. */
-	if (acpi_state == ACPI_STATE_S3) {
-		int error = acpi_save_state_mem();
-
-		if (error)
-			return error;
-	}
-
 	switch (acpi_state) {
 	case ACPI_STATE_S1:
 		barrier();
@@ -262,6 +255,9 @@ static int acpi_suspend_enter(suspend_st
 		break;
 
 	case ACPI_STATE_S3:
+		error = acpi_save_state_mem();
+		if (error)
+			return error;
 		do_suspend_lowlevel();
 		pr_info(PREFIX "Low-level resume complete\n");
 		break;


  parent reply	other threads:[~2011-02-07 22:23 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-02-07 22:16 [PATCH 0/6] ACPI / PM: Simplifications of core suspend and hibernate code Rafael J. Wysocki
2011-02-07 22:18 ` [PATCH 1/6] ACPI / PM: Drop acpi_restore_state_mem() Rafael J. Wysocki
2011-03-04 15:35   ` Pavel Machek
2011-02-07 22:19 ` [PATCH 2/6] ACPI / PM: Do not switch interrupts off/on in acpi_suspend_enter() Rafael J. Wysocki
2011-03-04 15:37   ` Pavel Machek
2011-02-07 22:19 ` [PATCH 3/6] ACPI / PM: Modify the "low-level resume finished" message Rafael J. Wysocki
2011-03-04 15:38   ` Pavel Machek
2011-03-04 20:53     ` Rafael J. Wysocki
2011-02-07 22:20 ` Rafael J. Wysocki [this message]
2011-03-04 15:38   ` [PATCH 4/6] ACPI / PM: Call acpi_save_state_mem() right before low-level suspend Pavel Machek
2011-02-07 22:21 ` [PATCH 5/6] ACPI / PM: Merge do_suspend_lowlevel() into acpi_save_state_mem() Rafael J. Wysocki
2011-03-04 15:38   ` Pavel Machek
2011-02-07 22:22 ` [PATCH 6/6] ACPI / PM: Do not switch interrupts off/on in acpi_hibernation_enter() Rafael J. Wysocki
2011-03-04 15:39   ` Pavel Machek

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=201102072320.53799.rjw@sisk.pl \
    --to=rjw@sisk.pl \
    --cc=lenb@kernel.org \
    --cc=linux-acpi@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pm@lists.linux-foundation.org \
    --cc=mingo@elte.hu \
    --subject='Re: [PATCH 4/6] ACPI / PM: Call acpi_save_state_mem() right before low-level suspend' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).