From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756426AbXD2MMx (ORCPT ); Sun, 29 Apr 2007 08:12:53 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756427AbXD2MMx (ORCPT ); Sun, 29 Apr 2007 08:12:53 -0400 Received: from ogre.sisk.pl ([217.79.144.158]:37112 "EHLO ogre.sisk.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756418AbXD2MMv (ORCPT ); Sun, 29 Apr 2007 08:12:51 -0400 From: "Rafael J. Wysocki" To: Matt Mackall Subject: Re: [GIT PATCH] ACPI patches for 2.6.22 Date: Sun, 29 Apr 2007 14:17:01 +0200 User-Agent: KMail/1.9.5 Cc: Andrew Morton , Len Brown , Linus Torvalds , linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, Miles Lane , lollul@wp.pl, Helge Hafting References: <200704290102.33533.lenb@kernel.org> <20070429010104.68c51d1a.akpm@linux-foundation.org> <20070429115244.GE11115@waste.org> In-Reply-To: <20070429115244.GE11115@waste.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200704291417.02362.rjw@sisk.pl> Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org On Sunday, 29 April 2007 13:52, Matt Mackall wrote: > On Sun, Apr 29, 2007 at 01:01:04AM -0700, Andrew Morton wrote: > > On Sun, 29 Apr 2007 01:02:33 -0400 Len Brown wrote: > > > > > please pull from: > > > > > > git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6.git release > > > > > > This batch mostly updates the platform-specific drivers that use ACPI. > > > The EC and sbs changes are primarily cleanups. > > > There are no changes to the ACPICA core, except a single bugfix > > > that was related to a 2.6.21 boot regression on some older machines. > > > And then the usual mix of random tweaks. > > > > There might still be a few regressions in this lot: > > > > - Miles Lane's "2.6.21-rc7-mm2 -- gnome-power-manager always shows the > > power as coming from AC" > > > > - "battery caching introduces a lock up" > > http://bugzilla.kernel.org/show_bug.cgi?id=8351 > > > > These are older and might have been fixed: > > > > - Mat Mackall's "Thinkpads not waking up on lid open with -rc6-mm1" > > This seems to be related to suspend to disk. After the first suspend > to disk/resume, suspend to ram stops resuming from lid open and needs > me to hit the power button. As I just started using suspend to disk in > the past couple weeks, this may be a long-standing bug. > > I think it's still present in -rc7-mm1 but I don't have my laptop > handy to double-check. Can you please check if the appended debug patch helps? Rafael --- kernel/power/disk.c | 4 ++-- kernel/power/user.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) Index: linux-2.6.21-rc7/kernel/power/disk.c =================================================================== --- linux-2.6.21-rc7.orig/kernel/power/disk.c +++ linux-2.6.21-rc7/kernel/power/disk.c @@ -170,9 +170,9 @@ int pm_suspend_disk(void) if (in_suspend) { enable_nonboot_cpus(); - platform_finish(); device_resume(); resume_console(); + platform_finish(); pr_debug("PM: writing image.\n"); error = swsusp_write(); if (!error) @@ -189,9 +189,9 @@ int pm_suspend_disk(void) Enable_cpus: enable_nonboot_cpus(); Resume_devices: - platform_finish(); device_resume(); resume_console(); + platform_finish(); Thaw: unprepare_processes(); Finish: Index: linux-2.6.21-rc7/kernel/power/user.c =================================================================== --- linux-2.6.21-rc7.orig/kernel/power/user.c +++ linux-2.6.21-rc7/kernel/power/user.c @@ -170,11 +170,11 @@ static inline int snapshot_suspend(int p } enable_nonboot_cpus(); Resume_devices: + device_resume(); + resume_console(); if (platform_suspend) platform_finish(); - device_resume(); - resume_console(); Finish: mutex_unlock(&pm_mutex); return error; @@ -202,11 +202,11 @@ static inline int snapshot_restore(int p enable_nonboot_cpus(); Resume_devices: + device_resume(); + resume_console(); if (platform_suspend) platform_finish(); - device_resume(); - resume_console(); Finish: pm_restore_console(); mutex_unlock(&pm_mutex);