[PATCH] swsusp: Fix SNAPSHOT_S2RAM ioctl

[PATCH] swsusp: Fix SNAPSHOT_S2RAM ioctl

[Rafael J. Wysocki]

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

The SNAPSHOT_S2RAM ioctl does not disable the nonboot CPUs before entering
the suspend, although it should do this.

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
---
 kernel/power/user.c |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

Index: linux-2.6.21-rc4/kernel/power/user.c
===================================================================
--- linux-2.6.21-rc4.orig/kernel/power/user.c
+++ linux-2.6.21-rc4/kernel/power/user.c
@@ -374,9 +374,12 @@ static int snapshot_ioctl(struct inode *
 		if (error) {
 			printk(KERN_ERR "Failed to suspend some devices.\n");
 		} else {
-			/* Enter S3, system is already frozen */
-			suspend_enter(PM_SUSPEND_MEM);
-
+			error = disable_nonboot_cpus();
+			if (!error) {
+				/* Enter S3, system is already frozen */
+				suspend_enter(PM_SUSPEND_MEM);
+				enable_nonboot_cpus();
+			}
 			/* Wake up devices */
 			device_resume();
 		}

Re: [PATCH] swsusp: Fix SNAPSHOT_S2RAM ioctl

[Pavel Machek]

Hi!

> From: Rafael J. Wysocki <rjw@sisk.pl>
> 
> The SNAPSHOT_S2RAM ioctl does not disable the nonboot CPUs before entering
> the suspend, although it should do this.
> 
>  		} else {
> -			/* Enter S3, system is already frozen */
> -			suspend_enter(PM_SUSPEND_MEM);
> -
> +			error = disable_nonboot_cpus();
> +			if (!error) {
> +				/* Enter S3, system is already frozen */
> +				suspend_enter(PM_SUSPEND_MEM);
> +				enable_nonboot_cpus();
> +			}
>  			/* Wake up devices */
>  			device_resume();
>  		}

Looks ok to me. ACK.
									Pavel
-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

Re: [PATCH] swsusp: Fix SNAPSHOT_S2RAM ioctl

[Andrew Morton]

On Tue, 20 Mar 2007 22:48:08 +0100 "Rafael J. Wysocki" <rjw@sisk.pl> wrote:

> From: Rafael J. Wysocki <rjw@sisk.pl>
> 
> The SNAPSHOT_S2RAM ioctl does not disable the nonboot CPUs before entering
> the suspend, although it should do this.
> 
> Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
> ---
>  kernel/power/user.c |    9 ++++++---
>  1 file changed, 6 insertions(+), 3 deletions(-)
> 
> Index: linux-2.6.21-rc4/kernel/power/user.c
> ===================================================================
> --- linux-2.6.21-rc4.orig/kernel/power/user.c
> +++ linux-2.6.21-rc4/kernel/power/user.c
> @@ -374,9 +374,12 @@ static int snapshot_ioctl(struct inode *
>  		if (error) {
>  			printk(KERN_ERR "Failed to suspend some devices.\n");
>  		} else {
> -			/* Enter S3, system is already frozen */
> -			suspend_enter(PM_SUSPEND_MEM);
> -
> +			error = disable_nonboot_cpus();
> +			if (!error) {
> +				/* Enter S3, system is already frozen */
> +				suspend_enter(PM_SUSPEND_MEM);
> +				enable_nonboot_cpus();
> +			}
>  			/* Wake up devices */
>  			device_resume();
>  		}

Do you consider this appropriate to 2.6.21?

Re: [PATCH] swsusp: Fix SNAPSHOT_S2RAM ioctl

[Pavel Machek]

Hi!

> > From: Rafael J. Wysocki <rjw@sisk.pl>
> > 
> > The SNAPSHOT_S2RAM ioctl does not disable the nonboot CPUs before entering
> > the suspend, although it should do this.
> > 
> > --- linux-2.6.21-rc4.orig/kernel/power/user.c
> > +++ linux-2.6.21-rc4/kernel/power/user.c
> > @@ -374,9 +374,12 @@ static int snapshot_ioctl(struct inode *
> >  		if (error) {
> >  			printk(KERN_ERR "Failed to suspend some devices.\n");
> >  		} else {
> > -			/* Enter S3, system is already frozen */
> > -			suspend_enter(PM_SUSPEND_MEM);
> > -
> > +			error = disable_nonboot_cpus();
> > +			if (!error) {
> > +				/* Enter S3, system is already frozen */
> > +				suspend_enter(PM_SUSPEND_MEM);
> > +				enable_nonboot_cpus();
> > +			}
> >  			/* Wake up devices */
> >  			device_resume();
> >  		}
> 
> Do you consider this appropriate to 2.6.21?

Yes, this one is.
									Pavel
-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html