Re: suspend to RAM failure on t61p

["Rafael J. Wysocki" <rjw@sisk.pl>]

On Monday, 10 of December 2007, Andrew Morton wrote:
> On Sun, 09 Dec 2007 13:40:07 +0100 Tomas Carnecky <tom@dbservice.com> wrote:
> 
> > Andrew Morton wrote:
> > > 2.6.24-rc4 on a Lenovo t61p, using FC8 config.
> > > 
> > > echo mem > /sys/power/state while running X.
> > > 
> > > It appears to suspend OK but then it instantly resumes and runs
> > > OK except the display is blank.
> > 
> > http://bugzilla.kernel.org/show_bug.cgi?id=9258
> > 
> > I have a X61 tablet, and the screen is blank after resume, too, but
> > pressing ctrl+alt+F1/F7 usually fixes it. It seems a problem with the X
> > video driver. I'm not sure though.
> > 
> 
> This machine doesn't bring the display back after resume-from-RAM under
> 2.6.23 either.
> 
> The post-2.6.23 regresison here is that the suspend itself fails.  Under
> 2.6.23 the machine suspends and requires a keystrike to start resuming. 
> Under 2.6.24-rc4 it just instantly resumes all by itself.

Please see if the appended patch helps (it will probably break the RTC wakeup
again, but well ...).


---
 kernel/power/disk.c |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

Index: linux-2.6/kernel/power/disk.c
===================================================================
--- linux-2.6.orig/kernel/power/disk.c
+++ linux-2.6/kernel/power/disk.c
@@ -378,9 +378,12 @@ int hibernation_platform_enter(void)
 		return error;
 
 	suspend_console();
-	error = device_suspend(PMSG_SUSPEND);
-	if (error)
-		goto Resume_console;
+	/*
+	 * FIXME: device_suspend(PMSG_SUSPEND) should be called here, but
+	 * some EHCI controllers make boxes reboot instead of going into the
+	 * S4 sleep state in that case.
+	 */
+	device_shutdown();
 
 	error = hibernation_ops->prepare();
 	if (error)