2.6.29-rc1: thinkpad problems during resume

2.6.29-rc1: thinkpad problems during resume

[Pavel Machek]

Hi!

Just when I thought long merge window means less problems...

...suspend seemed to work until last tuesday or so. Now it hanged two
times; once so hard that power button powercycle did not result in
booting machine. (thinkpad x60)

I'll do some more tests...
									Pavel
-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

Re: 2.6.29-rc1: thinkpad problems during resume

[Rafael J. Wysocki]

On Tuesday 13 January 2009, Pavel Machek wrote:
> Hi!
> 
> Just when I thought long merge window means less problems...
> 
> ...suspend seemed to work until last tuesday or so. Now it hanged two
> times; once so hard that power button powercycle did not result in
> booting machine. (thinkpad x60)
> 
> I'll do some more tests...

There are a couple of things you may want to revert, like
7503bfbae89eba07b46441a5d1594647f6b8ab7d and
a0d4922da2e4ccb0973095d8d29f36f6b1b5f703 .

Please let me know if that helped.

Thanks,
Rafael

Re: 2.6.29-rc1: thinkpad problems during resume

[Christian Borntraeger]

Am Dienstag 13 Januar 2009 schrieb Rafael J. Wysocki:
> On Tuesday 13 January 2009, Pavel Machek wrote:
> > Hi!
> > 
> > Just when I thought long merge window means less problems...
> > 
> > ...suspend seemed to work until last tuesday or so. Now it hanged two
> > times; once so hard that power button powercycle did not result in
> > booting machine. (thinkpad x60)
> > 
> > I'll do some more tests...
> 
> There are a couple of things you may want to revert, like
> 7503bfbae89eba07b46441a5d1594647f6b8ab7d and
> a0d4922da2e4ccb0973095d8d29f36f6b1b5f703 .
> 
> Please let me know if that helped.

I tested rc1+ these two reverts yesterday on my T61p. Doesnt work. There must 
be at least one more patch that broke S2R on my thinkpad. In fact, it is cpu 
hotplug that is broken (unplug works).

I will try to bisect that as well, but currently I am busy trying to find a 
virtio regression....

Christian

AW: 2.6.29-rc1: thinkpad problems during resume

[Morten P.D. Stevens]

Hi,

i´ve got the same problem with 2.6.29-rc1 and a thinkpad T61p. But there is something very strange with 2.6.29-rc1-git3 it works perfectly.

-----Ursprüngliche Nachricht-----
Von: linux-kernel-owner@vger.kernel.org [mailto:linux-kernel-owner@vger.kernel.org] Im Auftrag von Christian Borntraeger
Gesendet: Dienstag, 13. Januar 2009 13:43
An: Rafael J. Wysocki
Cc: Pavel Machek; kernel list
Betreff: Re: 2.6.29-rc1: thinkpad problems during resume

Am Dienstag 13 Januar 2009 schrieb Rafael J. Wysocki:
> On Tuesday 13 January 2009, Pavel Machek wrote:
> > Hi!
> > 
> > Just when I thought long merge window means less problems...
> > 
> > ...suspend seemed to work until last tuesday or so. Now it hanged two
> > times; once so hard that power button powercycle did not result in
> > booting machine. (thinkpad x60)
> > 
> > I'll do some more tests...
> 
> There are a couple of things you may want to revert, like
> 7503bfbae89eba07b46441a5d1594647f6b8ab7d and
> a0d4922da2e4ccb0973095d8d29f36f6b1b5f703 .
> 
> Please let me know if that helped.

I tested rc1+ these two reverts yesterday on my T61p. Doesnt work. There must 
be at least one more patch that broke S2R on my thinkpad. In fact, it is cpu 
hotplug that is broken (unplug works).

I will try to bisect that as well, but currently I am busy trying to find a 
virtio regression....

Christian
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: 2.6.29-rc1: thinkpad problems during resume

[Pavel Machek]

> On Tuesday 13 January 2009, Pavel Machek wrote:
> > Hi!
> > 
> > Just when I thought long merge window means less problems...
> > 
> > ...suspend seemed to work until last tuesday or so. Now it hanged two
> > times; once so hard that power button powercycle did not result in
> > booting machine. (thinkpad x60)
> > 
> > I'll do some more tests...
> 
> There are a couple of things you may want to revert, like
> 7503bfbae89eba07b46441a5d1594647f6b8ab7d and
> a0d4922da2e4ccb0973095d8d29f36f6b1b5f703 .
> 
> Please let me know if that helped.

Harwey told me they are already reverted in latest -git, so I tried
that but no luck. I'll try disabling CONFIG_SMP now.

Actually, in one case I seen some oopses scroll by... looked
timekeeping related, but certainly went too fast.
									Pavel
-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

Re: 2.6.29-rc1: thinkpad problems during resume

[Pavel Machek]

> Am Dienstag 13 Januar 2009 schrieb Rafael J. Wysocki:
> > On Tuesday 13 January 2009, Pavel Machek wrote:
> > > Hi!
> > > 
> > > Just when I thought long merge window means less problems...
> > > 
> > > ...suspend seemed to work until last tuesday or so. Now it hanged two
> > > times; once so hard that power button powercycle did not result in
> > > booting machine. (thinkpad x60)
> > > 
> > > I'll do some more tests...
> > 
> > There are a couple of things you may want to revert, like
> > 7503bfbae89eba07b46441a5d1594647f6b8ab7d and
> > a0d4922da2e4ccb0973095d8d29f36f6b1b5f703 .
> > 
> > Please let me know if that helped.
> 
> I tested rc1+ these two reverts yesterday on my T61p. Doesnt work. There must 
> be at least one more patch that broke S2R on my thinkpad. In fact, it is cpu 
> hotplug that is broken (unplug works).

I reproduced that: echo 0 > online works, echo 1 > online hangs. Will
compile SMP-less kernel to verify that there are no more problems...
									Pavel
-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

Re: 2.6.29-rc1: thinkpad problems during resume

[Jeff Chua]

On Tue, Jan 13, 2009 at 9:28 PM, Pavel Machek <pavel@suse.cz> wrote:
>> Am Dienstag 13 Januar 2009 schrieb Rafael J. Wysocki:
>> > On Tuesday 13 January 2009, Pavel Machek wrote:
>> > > Hi!
>> > >
>> > > Just when I thought long merge window means less problems...
>> > >
>> > > ...suspend seemed to work until last tuesday or so. Now it hanged two
>> > > times; once so hard that power button powercycle did not result in
>> > > booting machine. (thinkpad x60)
>> > >
>> > > I'll do some more tests...
>> >
>> > There are a couple of things you may want to revert, like
>> > 7503bfbae89eba07b46441a5d1594647f6b8ab7d and
>> > a0d4922da2e4ccb0973095d8d29f36f6b1b5f703 .
>> >
>> > Please let me know if that helped.
>>
>> I tested rc1+ these two reverts yesterday on my T61p. Doesnt work. There must
>> be at least one more patch that broke S2R on my thinkpad. In fact, it is cpu
>> hotplug that is broken (unplug works).
>
> I reproduced that: echo 0 > online works, echo 1 > online hangs. Will
> compile SMP-less kernel to verify that there are no more problems...
>                                                                        Pavel
> --
> (english) http://www.livejournal.com/~pavelmachek
> (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/

I've a X61 running 32-bit and it's able to suspend-to-ram.

Please see "[Bug #12422] 2.6.28-git can't resume from str" if it's
fixes your problem. Try to pull Linus' latest tree first and you need
apply only Rafael's latest patch.

Thanks,
Jeff.

Re: 2.6.29-rc1: thinkpad problems during resume

[Rafael J. Wysocki]

On Tuesday 13 January 2009, Pavel Machek wrote:
> 
> > On Tuesday 13 January 2009, Pavel Machek wrote:
> > > Hi!
> > > 
> > > Just when I thought long merge window means less problems...
> > > 
> > > ...suspend seemed to work until last tuesday or so. Now it hanged two
> > > times; once so hard that power button powercycle did not result in
> > > booting machine. (thinkpad x60)
> > > 
> > > I'll do some more tests...
> > 
> > There are a couple of things you may want to revert, like
> > 7503bfbae89eba07b46441a5d1594647f6b8ab7d and
> > a0d4922da2e4ccb0973095d8d29f36f6b1b5f703 .
> > 
> > Please let me know if that helped.
> 
> Harwey told me they are already reverted in latest -git, so I tried
> that but no luck. I'll try disabling CONFIG_SMP now.
> 
> Actually, in one case I seen some oopses scroll by... looked
> timekeeping related, but certainly went too fast.

Hm, I'm unable to reproduce this on my test boxes.

What hardware is there in your machine?

Rafael

Re: 2.6.29-rc1: thinkpad problems during resume

[Pavel Machek]

On Tue 2009-01-13 15:06:01, Rafael J. Wysocki wrote:
> On Tuesday 13 January 2009, Pavel Machek wrote:
> > 
> > > On Tuesday 13 January 2009, Pavel Machek wrote:
> > > > Hi!
> > > > 
> > > > Just when I thought long merge window means less problems...
> > > > 
> > > > ...suspend seemed to work until last tuesday or so. Now it hanged two
> > > > times; once so hard that power button powercycle did not result in
> > > > booting machine. (thinkpad x60)
> > > > 
> > > > I'll do some more tests...
> > > 
> > > There are a couple of things you may want to revert, like
> > > 7503bfbae89eba07b46441a5d1594647f6b8ab7d and
> > > a0d4922da2e4ccb0973095d8d29f36f6b1b5f703 .
> > > 
> > > Please let me know if that helped.
> > 
> > Harwey told me they are already reverted in latest -git, so I tried
> > that but no luck. I'll try disabling CONFIG_SMP now.
> > 
> > Actually, in one case I seen some oopses scroll by... looked
> > timekeeping related, but certainly went too fast.
> 
> Hm, I'm unable to reproduce this on my test boxes.
> 
> What hardware is there in your machine?

Thinkpad x60... pretty standard intel machine.
									Pavelp
-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

Re: 2.6.29-rc1: thinkpad problems during resume

[Pavel Machek]

On Tue 2009-01-13 09:13:16, Pavel Machek wrote:
> Hi!
> 
> Just when I thought long merge window means less problems...
> 
> ...suspend seemed to work until last tuesday or so. Now it hanged two
> times; once so hard that power button powercycle did not result in
> booting machine. (thinkpad x60)
> 
> I'll do some more tests...

It resumes fine with CONFIG_SMP unset.
									Pavel
-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

Re: 2.6.29-rc1: thinkpad problems during resume

[Jeff Chua]

On Tue, Jan 13, 2009 at 10:36 PM, Pavel Machek <pavel@suse.cz> wrote:
> resumes fine with CONFIG_SMP unset.

On my X60s, I had problem with s2ram, and I switch to the following ...

echo mem > /sys/power/state

Try and see if it works for you.

Thanks,
Jeff.

Re: 2.6.29-rc1: thinkpad problems during resume

[Pavel Machek]

Hi!

> >> > Please let me know if that helped.
> >>
> >> I tested rc1+ these two reverts yesterday on my T61p. Doesnt work. There must
> >> be at least one more patch that broke S2R on my thinkpad. In fact, it is cpu
> >> hotplug that is broken (unplug works).
> >
> > I reproduced that: echo 0 > online works, echo 1 > online hangs. Will
> > compile SMP-less kernel to verify that there are no more problems...
> >                                                                        Pavel
> > --
> > (english) http://www.livejournal.com/~pavelmachek
> > (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
> > --
> > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> > the body of a message to majordomo@vger.kernel.org
> > More majordomo info at  http://vger.kernel.org/majordomo-info.html
> > Please read the FAQ at  http://www.tux.org/lkml/
> 
> I've a X61 running 32-bit and it's able to suspend-to-ram.
> 
> Please see "[Bug #12422] 2.6.28-git can't resume from str" if it's
> fixes your problem. Try to pull Linus' latest tree first and you need
> apply only Rafael's latest patch.

Which patch? 

Anyway, it is CPU hotplug vs. cpufreq interaction:

bash          D c024ed50     0  1780      1
 f71ae6b8 00000082 00000004 c024ed50 f71ae6b8 00000001 00000000
00000000
 c2010db4 f71ae6b8 f71166b8 f71ae910 c201b500 00000001 c0ab4500
f5d04dd0
 ffff8659 00000000 f71aeb68 00000000 00000046 00000000 c077b5c9
c2010da4
Call Trace:
 [<c024ed50>] __lock_acquire+0x240/0xac0
 [<c077b5c9>] rwsem_down_failed_common+0x29/0x170
 [<c077b615>] rwsem_down_failed_common+0x75/0x170
 [<c077b72a>] rwsem_down_write_failed+0x1a/0x30
 [<c077b7a2>] call_rwsem_down_write_failed+0x6/0x8
 [<c077abd5>] down_write+0x45/0x50
 [<c05c0f7c>] lock_policy_rwsem_write+0x2c/0x60
 [<c05c0f7c>] lock_policy_rwsem_write+0x2c/0x60
 [<c05c12ea>] cpufreq_add_dev+0x1ca/0x4f0
 [<c05c0988>] cpufreq_cpu_get+0xa8/0xb0
 [<c05c0fdf>] cpufreq_update_policy+0x2f/0xf0
 [<c0778b54>] coretemp_device_add+0xb4/0xd0
 [<c0778c9f>] cpufreq_cpu_callback+0x6f/0x80
 [<c02455ec>] notifier_call_chain+0x3c/0x80
 [<c0245677>] raw_notifier_call_chain+0x17/0x20
 [<c0776e8a>] _cpu_up+0x10a/0x110
 [<c0776edb>] cpu_up+0x4b/0x70
 [<c074b629>] store_online+0x59/0x80
 [<c074b5d0>] store_online+0x0/0x80
 [<c04220ad>] sysdev_store+0x2d/0x40
 [<c02cc6d6>] sysfs_write_file+0xa6/0x100
 [<c028a913>] vfs_write+0xa3/0x140
 [<c02cc630>] sysfs_write_file+0x0/0x100
 [<c028af61>] sys_write+0x41/0x70
 [<c020323e>] syscall_call+0x7/0xb




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

Re: 2.6.29-rc1: thinkpad problems during resume

[Jeff Chua]

[-- Attachment #1: Type: text/plain, Size: 119 bytes --]

On Fri, Jan 16, 2009 at 6:44 PM, Pavel Machek <pavel@suse.cz> wrote:

> Which patch?

Try this patch attached.


Jeff.

[-- Attachment #2: patch-fix-resume2 --]
[-- Type: application/octet-stream, Size: 10913 bytes --]

                                                                                                                                                                                                                                                               
Delivered-To: jeff.chua.linux@gmail.com
Received: by 10.114.57.7 with SMTP id f7cs1416675waa;
        Tue, 13 Jan 2009 03:33:08 -0800 (PST)
Received: by 10.223.105.139 with SMTP id t11mr11030338fao.11.1231846387562;
        Tue, 13 Jan 2009 03:33:07 -0800 (PST)
Return-Path: <rjw@sisk.pl>
Received: from ogre.sisk.pl (ogre.sisk.pl [217.79.144.158])
        by mx.google.com with ESMTP id b17si27535852fka.35.2009.01.13.03.33.06;
        Tue, 13 Jan 2009 03:33:07 -0800 (PST)
Received-SPF: pass (google.com: best guess record for domain of rjw@sisk.pl designates 217.79.144.158 as permitted sender) client-ip=217.79.144.158;
Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of rjw@sisk.pl designates 217.79.144.158 as permitted sender) smtp.mail=rjw@sisk.pl
Received: from localhost (localhost.localdomain [127.0.0.1])
	by ogre.sisk.pl (Postfix) with ESMTP id AE39211497C;
	Tue, 13 Jan 2009 10:15:45 +0100 (CET)
Received: from ogre.sisk.pl ([127.0.0.1])
 by localhost (ogre.sisk.pl [127.0.0.1]) (amavisd-new, port 10024) with ESMTP
 id 19937-05; Tue, 13 Jan 2009 10:15:38 +0100 (CET)
Received: from tosh.localnet (iftwlan0.fuw.edu.pl [193.0.83.199])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by ogre.sisk.pl (Postfix) with ESMTP id 0D3E911C8C5;
	Tue, 13 Jan 2009 10:15:38 +0100 (CET)
From: "Rafael J. Wysocki" <rjw@sisk.pl>
To: "Jeff Chua" <jeff.chua.linux@gmail.com>
Subject: Re: [Bug #12422] 2.6.28-git can't resume from str
Date: Tue, 13 Jan 2009 12:32:17 +0100
User-Agent: KMail/1.10.3 (Linux/2.6.29-rc1-rjw; KDE/4.1.3; x86_64; ; )
Cc: "Linus Torvalds" <torvalds@linux-foundation.org>,
 "Ingo Molnar" <mingo@elte.hu>,
 "Christian Borntraeger" <borntraeger@de.ibm.com>,
 "Daniel Drake" <dsd@gentoo.org>,
 "Linux Kernel Mailing List" <linux-kernel@vger.kernel.org>,
 "Kernel Testers List" <kernel-testers@vger.kernel.org>,
 "Phil Dibowitz" <phil@ipom.com>,
 Alan Stern <stern@rowland.harvard.edu>
References: <XU-8icArWLM.A.UpG.8GfaJB@chimera> <b6a2187b0901122028w3f85fc9aj41d7c8ac44adb2ed@mail.gmail.com> <b6a2187b0901122147o45890cd4lfb6ba7b2908e6ae7@mail.gmail.com>
In-Reply-To: <b6a2187b0901122147o45890cd4lfb6ba7b2908e6ae7@mail.gmail.com>
MIME-Version: 1.0
Content-Type: text/plain;
  charset="iso-8859-1"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
Message-Id: <200901131232.17941.rjw@sisk.pl>
X-Virus-Scanned: amavisd-new at ogre.sisk.pl using MkS_Vir for Linux

On Tuesday 13 January 2009, Jeff Chua wrote:
> On Sun, Jan 11, 2009 at 7:16 PM, Rafael J. Wysocki <rjw@sisk.pl> wrote:
> 
> > The following bug entry is on the current list of known regressions
> > from 2.6.28.  Please verify if it still should be listed and let me know
> > Bug-Entry       : http://bugzilla.kernel.org/show_bug.cgi?id=12422
> > Subject         : 2.6.28-git can't resume from str
> > Submitter       : Jeff Chua <jeff.chua.linux@gmail.com>
> > Date            : 2009-01-10 1:39 (2 days old)
> > References      : http://marc.info/?l=linux-kernel&m=123155157909282&w=4
> 
> Fixed by reverting a0d4922da2e4ccb0973095d8d29f36f6b1b5f703.
> 7503bfbae89eba07b46441a5d1594647f6b8ab7d has already been reverted in
> the Linus's latest git tree.

Can you please check if the issue goes away when you apply the appended patch
instead of reverting commit a0d4922da2e4ccb0973095d8d29f36f6b1b5f703 ?

Rafael

---
 drivers/usb/core/hcd-pci.c  |  116 ++++++++++----------------------------------
 drivers/usb/core/hcd.h      |    1 
 drivers/usb/host/ehci-pci.c |    1 
 drivers/usb/host/ohci-pci.c |    1 
 drivers/usb/host/uhci-hcd.c |    1 
 5 files changed, 27 insertions(+), 93 deletions(-)

Index: linux-2.6/drivers/usb/core/hcd-pci.c
===================================================================
--- linux-2.6.orig/drivers/usb/core/hcd-pci.c
+++ linux-2.6/drivers/usb/core/hcd-pci.c
@@ -201,6 +201,7 @@ int usb_hcd_pci_suspend(struct pci_dev *
 	struct usb_hcd		*hcd = pci_get_drvdata(dev);
 	int			retval = 0;
 	int			wake, w;
+	int			has_pci_pm;
 
 	/* Root hub suspend should have stopped all downstream traffic,
 	 * and all bus master traffic.  And done so for both the interface
@@ -230,6 +231,15 @@ int usb_hcd_pci_suspend(struct pci_dev *
 
 	synchronize_irq(dev->irq);
 
+	/* Downstream ports from this root hub should already be quiesced, so
+	 * there will be no DMA activity.  Now we can shut down the upstream
+	 * link (except maybe for PME# resume signaling) and enter some PCI
+	 * low power state, if the hardware allows.
+	 */
+	pci_disable_device(dev);
+
+	pci_save_state(dev);
+
 	/* Don't fail on error to enable wakeup.  We rely on pci code
 	 * to reject requests the hardware can't implement, rather
 	 * than coding the same thing.
@@ -241,35 +251,6 @@ int usb_hcd_pci_suspend(struct pci_dev *
 		wake = w;
 	dev_dbg(&dev->dev, "wakeup: %d\n", wake);
 
-	/* Downstream ports from this root hub should already be quiesced, so
-	 * there will be no DMA activity.  Now we can shut down the upstream
-	 * link (except maybe for PME# resume signaling) and enter some PCI
-	 * low power state, if the hardware allows.
-	 */
-	pci_disable_device(dev);
- done:
-	return retval;
-}
-EXPORT_SYMBOL_GPL(usb_hcd_pci_suspend);
-
-/**
- * usb_hcd_pci_suspend_late - suspend a PCI-based HCD after IRQs are disabled
- * @dev: USB Host Controller being suspended
- * @message: Power Management message describing this state transition
- *
- * Store this function in the HCD's struct pci_driver as .suspend_late.
- */
-int usb_hcd_pci_suspend_late(struct pci_dev *dev, pm_message_t message)
-{
-	int			retval = 0;
-	int			has_pci_pm;
-
-	/* We might already be suspended (runtime PM -- not yet written) */
-	if (dev->current_state != PCI_D0)
-		goto done;
-
-	pci_save_state(dev);
-
 	/* Don't change state if we don't need to */
 	if (message.event == PM_EVENT_FREEZE ||
 			message.event == PM_EVENT_PRETHAW) {
@@ -315,7 +296,7 @@ int usb_hcd_pci_suspend_late(struct pci_
  done:
 	return retval;
 }
-EXPORT_SYMBOL_GPL(usb_hcd_pci_suspend_late);
+EXPORT_SYMBOL_GPL(usb_hcd_pci_suspend);
 
 /**
  * usb_hcd_pci_resume_early - resume a PCI-based HCD before IRQs are enabled
@@ -325,65 +306,8 @@ EXPORT_SYMBOL_GPL(usb_hcd_pci_suspend_la
  */
 int usb_hcd_pci_resume_early(struct pci_dev *dev)
 {
-	int		retval = 0;
-	pci_power_t	state = dev->current_state;
-
-#ifdef CONFIG_PPC_PMAC
-	/* Reenable ASIC clocks for USB */
-	if (machine_is(powermac)) {
-		struct device_node *of_node;
-
-		of_node = pci_device_to_OF_node(dev);
-		if (of_node)
-			pmac_call_feature(PMAC_FTR_USB_ENABLE,
-						of_node, 0, 1);
-	}
-#endif
-
-	/* NOTE:  chip docs cover clean "real suspend" cases (what Linux
-	 * calls "standby", "suspend to RAM", and so on).  There are also
-	 * dirty cases when swsusp fakes a suspend in "shutdown" mode.
-	 */
-	if (state != PCI_D0) {
-#ifdef	DEBUG
-		int	pci_pm;
-		u16	pmcr;
-
-		pci_pm = pci_find_capability(dev, PCI_CAP_ID_PM);
-		pci_read_config_word(dev, pci_pm + PCI_PM_CTRL, &pmcr);
-		pmcr &= PCI_PM_CTRL_STATE_MASK;
-		if (pmcr) {
-			/* Clean case:  power to USB and to HC registers was
-			 * maintained; remote wakeup is easy.
-			 */
-			dev_dbg(&dev->dev, "resume from PCI D%d\n", pmcr);
-		} else {
-			/* Clean:  HC lost Vcc power, D0 uninitialized
-			 *   + Vaux may have preserved port and transceiver
-			 *     state ... for remote wakeup from D3cold
-			 *   + or not; HCD must reinit + re-enumerate
-			 *
-			 * Dirty: D0 semi-initialized cases with swsusp
-			 *   + after BIOS init
-			 *   + after Linux init (HCD statically linked)
-			 */
-			dev_dbg(&dev->dev, "resume from previous PCI D%d\n",
-					state);
-		}
-#endif
-
-		retval = pci_set_power_state(dev, PCI_D0);
-	} else {
-		/* Same basic cases: clean (powered/not), dirty */
-		dev_dbg(&dev->dev, "PCI legacy resume\n");
-	}
-
-	if (retval < 0)
-		dev_err(&dev->dev, "can't resume: %d\n", retval);
-	else
-		pci_restore_state(dev);
-
-	return retval;
+	pci_restore_state(dev);
+	return 0;
 }
 EXPORT_SYMBOL_GPL(usb_hcd_pci_resume_early);
 
@@ -398,6 +322,18 @@ int usb_hcd_pci_resume(struct pci_dev *d
 	struct usb_hcd		*hcd;
 	int			retval;
 
+#ifdef CONFIG_PPC_PMAC
+	/* Reenable ASIC clocks for USB */
+	if (machine_is(powermac)) {
+		struct device_node *of_node;
+
+		of_node = pci_device_to_OF_node(dev);
+		if (of_node)
+			pmac_call_feature(PMAC_FTR_USB_ENABLE,
+						of_node, 0, 1);
+	}
+#endif
+
 	hcd = pci_get_drvdata(dev);
 	if (hcd->state != HC_STATE_SUSPENDED) {
 		dev_dbg(hcd->self.controller,
@@ -405,6 +341,8 @@ int usb_hcd_pci_resume(struct pci_dev *d
 		return 0;
 	}
 
+	pci_enable_wake(dev, PCI_D0, false);
+
 	retval = pci_enable_device(dev);
 	if (retval < 0) {
 		dev_err(&dev->dev, "can't re-enable after resume, %d!\n",
Index: linux-2.6/drivers/usb/core/hcd.h
===================================================================
--- linux-2.6.orig/drivers/usb/core/hcd.h
+++ linux-2.6/drivers/usb/core/hcd.h
@@ -257,7 +257,6 @@ extern void usb_hcd_pci_remove(struct pc
 
 #ifdef CONFIG_PM
 extern int usb_hcd_pci_suspend(struct pci_dev *dev, pm_message_t msg);
-extern int usb_hcd_pci_suspend_late(struct pci_dev *dev, pm_message_t msg);
 extern int usb_hcd_pci_resume_early(struct pci_dev *dev);
 extern int usb_hcd_pci_resume(struct pci_dev *dev);
 #endif /* CONFIG_PM */
Index: linux-2.6/drivers/usb/host/ehci-pci.c
===================================================================
--- linux-2.6.orig/drivers/usb/host/ehci-pci.c
+++ linux-2.6/drivers/usb/host/ehci-pci.c
@@ -432,7 +432,6 @@ static struct pci_driver ehci_pci_driver
 
 #ifdef	CONFIG_PM
 	.suspend =	usb_hcd_pci_suspend,
-	.suspend_late =	usb_hcd_pci_suspend_late,
 	.resume_early =	usb_hcd_pci_resume_early,
 	.resume =	usb_hcd_pci_resume,
 #endif
Index: linux-2.6/drivers/usb/host/ohci-pci.c
===================================================================
--- linux-2.6.orig/drivers/usb/host/ohci-pci.c
+++ linux-2.6/drivers/usb/host/ohci-pci.c
@@ -487,7 +487,6 @@ static struct pci_driver ohci_pci_driver
 
 #ifdef	CONFIG_PM
 	.suspend =	usb_hcd_pci_suspend,
-	.suspend_late =	usb_hcd_pci_suspend_late,
 	.resume_early =	usb_hcd_pci_resume_early,
 	.resume =	usb_hcd_pci_resume,
 #endif
Index: linux-2.6/drivers/usb/host/uhci-hcd.c
===================================================================
--- linux-2.6.orig/drivers/usb/host/uhci-hcd.c
+++ linux-2.6/drivers/usb/host/uhci-hcd.c
@@ -942,7 +942,6 @@ static struct pci_driver uhci_pci_driver
 
 #ifdef	CONFIG_PM
 	.suspend =	usb_hcd_pci_suspend,
-	.suspend_late =	usb_hcd_pci_suspend_late,
 	.resume_early =	usb_hcd_pci_resume_early,
 	.resume =	usb_hcd_pci_resume,
 #endif	/* PM */

Re: 2.6.29-rc1: thinkpad problems during resume

[Pavel Machek]

On Tue 2009-01-13 23:21:17, Jeff Chua wrote:
> On Tue, Jan 13, 2009 at 10:36 PM, Pavel Machek <pavel@suse.cz> wrote:
> > resumes fine with CONFIG_SMP unset.
> 
> On my X60s, I had problem with s2ram, and I switch to the following ...
> 
> echo mem > /sys/power/state
> 
> Try and see if it works for you.

I tried that; unlike s2ram, this actually produces some oopses that
can be viewed. Unfortunately, they scroll a bit too fast.

cpu hotplug vs. cpufreq seems to be responsible in my case, looking at
the logs from "echo 1 > online".
									Pavel
-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

Re: 2.6.29-rc1: thinkpad problems during resume

[Rafael J. Wysocki]

On Friday 16 January 2009, Pavel Machek wrote:
> On Tue 2009-01-13 23:21:17, Jeff Chua wrote:
> > On Tue, Jan 13, 2009 at 10:36 PM, Pavel Machek <pavel@suse.cz> wrote:
> > > resumes fine with CONFIG_SMP unset.
> > 
> > On my X60s, I had problem with s2ram, and I switch to the following ...
> > 
> > echo mem > /sys/power/state
> > 
> > Try and see if it works for you.
> 
> I tried that; unlike s2ram, this actually produces some oopses that
> can be viewed. Unfortunately, they scroll a bit too fast.
> 
> cpu hotplug vs. cpufreq seems to be responsible in my case, looking at
> the logs from "echo 1 > online".

There are three patches from Mike Travis that can help:
http://lkml.org/lkml/2009/1/16/377

Thanks,
Rafael

Re: 2.6.29-rc1: thinkpad problems during resume

[Mike Travis]

Rafael J. Wysocki wrote:
> On Friday 16 January 2009, Pavel Machek wrote:
>> On Tue 2009-01-13 23:21:17, Jeff Chua wrote:
>>> On Tue, Jan 13, 2009 at 10:36 PM, Pavel Machek <pavel@suse.cz> wrote:
>>>> resumes fine with CONFIG_SMP unset.
>>> On my X60s, I had problem with s2ram, and I switch to the following ...
>>>
>>> echo mem > /sys/power/state
>>>
>>> Try and see if it works for you.
>> I tried that; unlike s2ram, this actually produces some oopses that
>> can be viewed. Unfortunately, they scroll a bit too fast.
>>
>> cpu hotplug vs. cpufreq seems to be responsible in my case, looking at
>> the logs from "echo 1 > online".
> 
> There are three patches from Mike Travis that can help:
> http://lkml.org/lkml/2009/1/16/377
> 
> Thanks,
> Rafael

Note that these don't really fix anything, just replaces the current
method of using set_cpus_allowed with the work_on_cpu call.  If
the laptop worked before the [bad] patch, then it should work again
now with this one.

Thanks,
Mike

Re: 2.6.29-rc1: thinkpad problems during resume

[Rafael J. Wysocki]

On Saturday 17 January 2009, Mike Travis wrote:
> Rafael J. Wysocki wrote:
> > On Friday 16 January 2009, Pavel Machek wrote:
> >> On Tue 2009-01-13 23:21:17, Jeff Chua wrote:
> >>> On Tue, Jan 13, 2009 at 10:36 PM, Pavel Machek <pavel@suse.cz> wrote:
> >>>> resumes fine with CONFIG_SMP unset.
> >>> On my X60s, I had problem with s2ram, and I switch to the following ...
> >>>
> >>> echo mem > /sys/power/state
> >>>
> >>> Try and see if it works for you.
> >> I tried that; unlike s2ram, this actually produces some oopses that
> >> can be viewed. Unfortunately, they scroll a bit too fast.
> >>
> >> cpu hotplug vs. cpufreq seems to be responsible in my case, looking at
> >> the logs from "echo 1 > online".
> > 
> > There are three patches from Mike Travis that can help:
> > http://lkml.org/lkml/2009/1/16/377
> > 
> > Thanks,
> > Rafael
> 
> Note that these don't really fix anything, just replaces the current
> method of using set_cpus_allowed with the work_on_cpu call.  If
> the laptop worked before the [bad] patch, then it should work again
> now with this one.

Thanks for the clarification, I misread the changelogs.

OK, so we still have a cpufreq vs CPU hotplug problem, it seems.  I can't
reproduce it myself, though.

Thanks,
Rafael

Re: 2.6.29-rc1: thinkpad problems during resume

[Christian Borntraeger]

Am Freitag 16 Januar 2009 schrieb Pavel Machek:
> Hi!
>
> > >> > Please let me know if that helped.
> > >>
> > >> I tested rc1+ these two reverts yesterday on my T61p. Doesnt work.
> > >> There must be at least one more patch that broke S2R on my thinkpad.
> > >> In fact, it is cpu hotplug that is broken (unplug works).
> > >
> > > I reproduced that: echo 0 > online works, echo 1 > online hangs. Will
> > > compile SMP-less kernel to verify that there are no more problems...

I made some progress on my T61p. git from yesterday + a revert of
commit e39ad415ac15116df213dfa2aa2a4f1b0857af9c
Author: Mike Travis <travis@sgi.com>
Date:   Sun Jan 4 05:18:10 2009 -0800

    cpumask: use work_on_cpu in acpi-cpufreq.c for read_measured_perf_ctrs

makes cpu hotplug working again. Resume from suspend to ram is still broken on 
my Thinkpad. Looks like there is yet another patch to find....

Ingo, Mike: reverting e39ad415ac15116df213dfa2aa2a4f1b0857af9c fixes cpu 
hotplug on my thinkpad. Any idea how to proceed? Should we revert that patch 
in Linus git until we know what was wrong?

Re: 2.6.29-rc1: [SOLVED] thinkpad problems during resume

[Christian Borntraeger]

> commit e39ad415ac15116df213dfa2aa2a4f1b0857af9c
> Author: Mike Travis <travis@sgi.com>
> Date:   Sun Jan 4 05:18:10 2009 -0800
>
>     cpumask: use work_on_cpu in acpi-cpufreq.c for read_measured_perf_ctrs
>
> makes cpu hotplug working again. Resume from suspend to ram is still broken
> on my Thinkpad. Looks like there is yet another patch to find....
>
> Ingo, Mike: reverting e39ad415ac15116df213dfa2aa2a4f1b0857af9c fixes cpu
> hotplug on my thinkpad. Any idea how to proceed? Should we revert that
> patch in Linus git until we know what was wrong?

I forgot to revert the usb patch.
Current status:
2.6.29-rc2 + 
reverted e39ad415ac15116df213dfa2aa2a4f1b0857af9c (cpumask: use work_on_cpu in 
acpi-cpufreq.c for read_measured_perf_ctrs) + 
reverted a0d4922da2e4ccb0973095d8d29f36f6b1b5f703 (USB: fix up suspend and 
resume for PCI host controllers)

has a working suspend to ram on my T61p. With any of these two patches not 
reverted resume hangs.

Christian

Re: 2.6.29-rc1: [SOLVED] thinkpad problems during resume

[Maciej Rutecki]

2009/1/17 Christian Borntraeger <borntraeger@de.ibm.com>:
>
> I forgot to revert the usb patch.
> Current status:
> 2.6.29-rc2 +
> reverted e39ad415ac15116df213dfa2aa2a4f1b0857af9c (cpumask: use work_on_cpu in
> acpi-cpufreq.c for read_measured_perf_ctrs) +
> reverted a0d4922da2e4ccb0973095d8d29f36f6b1b5f703 (USB: fix up suspend and
> resume for PCI host controllers)
>
> has a working suspend to ram on my T61p. With any of these two patches not
> reverted resume hangs.
>

Great work. Thanks. On my HP Compaq nx6310 revert this patches also
helps: suspend to ram/disk works.

Thanks again :-)


-- 
Maciej Rutecki
http://www.maciek.unixy.pl

Re: 2.6.29-rc1: [SOLVED] thinkpad problems during resume

[Mike Travis]

Christian Borntraeger wrote:
>> commit e39ad415ac15116df213dfa2aa2a4f1b0857af9c
>> Author: Mike Travis <travis@sgi.com>
>> Date:   Sun Jan 4 05:18:10 2009 -0800
>>
>>     cpumask: use work_on_cpu in acpi-cpufreq.c for read_measured_perf_ctrs
>>
>> makes cpu hotplug working again. Resume from suspend to ram is still broken
>> on my Thinkpad. Looks like there is yet another patch to find....
>>
>> Ingo, Mike: reverting e39ad415ac15116df213dfa2aa2a4f1b0857af9c fixes cpu
>> hotplug on my thinkpad. Any idea how to proceed? Should we revert that
>> patch in Linus git until we know what was wrong?
> 
> I forgot to revert the usb patch.
> Current status:
> 2.6.29-rc2 + 
> reverted e39ad415ac15116df213dfa2aa2a4f1b0857af9c (cpumask: use work_on_cpu in 
> acpi-cpufreq.c for read_measured_perf_ctrs) + 
> reverted a0d4922da2e4ccb0973095d8d29f36f6b1b5f703 (USB: fix up suspend and 
> resume for PCI host controllers)
> 
> has a working suspend to ram on my T61p. With any of these two patches not 
> reverted resume hangs.
> 
> Christian

Could you try one more experiment?  With your working system, please cherry
pick these commits and try it again?

68564a4... work_on_cpu: don't try to get_online_cpus() in work_on_cpu.
e1d9ec6... work_on_cpu: Use our own workqueue.
6eb714c... cpufreq: use work_on_cpu in acpi-cpufreq.c for drv_read and drv_write

>From git://git.kernel.org/pub/scm/linux/kernel/git/travis/linux-2.6-cpus4096-for-ingo.git

If that works, then try and un-revert e39ad415ac and see if it's fixed as well?

(The underlying work_on_cpu() function was causing these problems, but the 1st two
of the above should fix it.)

Thanks!
Mike

Re: 2.6.29-rc1: [SOLVED] thinkpad problems during resume

[Christian Borntraeger]

> Could you try one more experiment?  With your working system, please cherry
> pick these commits and try it again?
>
> 68564a4... work_on_cpu: don't try to get_online_cpus() in work_on_cpu.
> e1d9ec6... work_on_cpu: Use our own workqueue.
> 6eb714c... cpufreq: use work_on_cpu in acpi-cpufreq.c for drv_read and
> drv_write
>
> From
> git://git.kernel.org/pub/scm/linux/kernel/git/travis/linux-2.6-cpus4096-for
>-ingo.git
>
> If that works, then try and un-revert e39ad415ac and see if it's fixed as
> well?

Yes that works.

29-rc2 + your 3 patches cherry-picked + revert of 
a0d4922da2e4ccb0973095d8d29f36f6b1b5f703( usb problem) can suspend/resume. 
If you like, you can add an
Tested-by: Christian Borntraeger <borntraeger@de.ibm.com>
to your three patches.

Christian

Re: 2.6.29-rc1: [SOLVED] thinkpad problems during resume

[Mike Travis]

Christian Borntraeger wrote:
>> Could you try one more experiment?  With your working system, please cherry
>> pick these commits and try it again?
>>
>> 68564a4... work_on_cpu: don't try to get_online_cpus() in work_on_cpu.
>> e1d9ec6... work_on_cpu: Use our own workqueue.
>> 6eb714c... cpufreq: use work_on_cpu in acpi-cpufreq.c for drv_read and
>> drv_write
>>
>> From
>> git://git.kernel.org/pub/scm/linux/kernel/git/travis/linux-2.6-cpus4096-for
>> -ingo.git
>>
>> If that works, then try and un-revert e39ad415ac and see if it's fixed as
>> well?
> 
> Yes that works.
> 
> 29-rc2 + your 3 patches cherry-picked + revert of 
> a0d4922da2e4ccb0973095d8d29f36f6b1b5f703( usb problem) can suspend/resume. 
> If you like, you can add an
> Tested-by: Christian Borntraeger <borntraeger@de.ibm.com>
> to your three patches.
> 
> 
Thanks Christian!

Re: 2.6.29-rc1: [SOLVED] thinkpad problems during resume

[Ingo Molnar]

* Mike Travis <travis@sgi.com> wrote:

> Christian Borntraeger wrote:
> >> Could you try one more experiment?  With your working system, please cherry
> >> pick these commits and try it again?
> >>
> >> 68564a4... work_on_cpu: don't try to get_online_cpus() in work_on_cpu.
> >> e1d9ec6... work_on_cpu: Use our own workqueue.
> >> 6eb714c... cpufreq: use work_on_cpu in acpi-cpufreq.c for drv_read and
> >> drv_write
> >>
> >> From
> >> git://git.kernel.org/pub/scm/linux/kernel/git/travis/linux-2.6-cpus4096-for
> >> -ingo.git
> >>
> >> If that works, then try and un-revert e39ad415ac and see if it's fixed as
> >> well?
> > 
> > Yes that works.
> > 
> > 29-rc2 + your 3 patches cherry-picked + revert of 
> > a0d4922da2e4ccb0973095d8d29f36f6b1b5f703( usb problem) can suspend/resume. 
> > If you like, you can add an
> > Tested-by: Christian Borntraeger <borntraeger@de.ibm.com>
> > to your three patches.
> > 
> > 
> Thanks Christian!

Great.

Mike, could you please prepare a separate, linus/master based 'fixes' 
branch that cherry-picks these commits? (they overlap existing commits in 
cpus4096 which is a bit unfortunate but not that bad as long as it's done 
within reason - Git will sort it out.)

	Ingo

Re: 2.6.29-rc1: thinkpad problems during resume

[Pavel Machek]

Hi!

> > > There are three patches from Mike Travis that can help:
> > > http://lkml.org/lkml/2009/1/16/377
> > > 
> > > Thanks,
> > > Rafael
> > 
> > Note that these don't really fix anything, just replaces the current
> > method of using set_cpus_allowed with the work_on_cpu call.  If
> > the laptop worked before the [bad] patch, then it should work again
> > now with this one.
> 
> Thanks for the clarification, I misread the changelogs.
> 
> OK, so we still have a cpufreq vs CPU hotplug problem, it seems.  I can't
> reproduce it myself, though.

I kind of lost track here. Is everything fixed, or will there still be
problems in -rc3?

I turned off CPUFREQ to get rid of this problem, so yes, I can
reproduce it easily.

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

Re: 2.6.29-rc1: thinkpad problems during resume

[Rafael J. Wysocki]

On Monday 26 January 2009, Pavel Machek wrote:
> Hi!
> 
> > > > There are three patches from Mike Travis that can help:
> > > > http://lkml.org/lkml/2009/1/16/377
> > > > 
> > > > Thanks,
> > > > Rafael
> > > 
> > > Note that these don't really fix anything, just replaces the current
> > > method of using set_cpus_allowed with the work_on_cpu call.  If
> > > the laptop worked before the [bad] patch, then it should work again
> > > now with this one.
> > 
> > Thanks for the clarification, I misread the changelogs.
> > 
> > OK, so we still have a cpufreq vs CPU hotplug problem, it seems.  I can't
> > reproduce it myself, though.
> 
> I kind of lost track here. Is everything fixed, or will there still be
> problems in -rc3?

That depends on which patches get merged before -rc3.  There are quite a few
of them. :-(

Thanks,
Rafael