2007-02-09 19:02:44

by Jens Axboe

[permalink] [raw]
Subject: current git breaks resume

Hi,

Unfortunately I'm a little short on time as I'll be travelling tomorrow,
but of course preparing a new kernel for the laptop is something you
want to do right before leaving. So I discovered that the current (well
as of yesterday, HEAD is 5986a2ec35836a878350c54af4bd91b1de6abc59)
doesn't resume on my x60. 2.6.20 works fine, so something broke since
then.

--
Jens Axboe


2007-02-10 09:51:41

by Rafael J. Wysocki

[permalink] [raw]
Subject: Re: current git breaks resume

Hi,

On Friday, 9 February 2007 20:03, Jens Axboe wrote:
> Hi,
>
> Unfortunately I'm a little short on time as I'll be travelling tomorrow,
> but of course preparing a new kernel for the laptop is something you
> want to do right before leaving. So I discovered that the current (well
> as of yesterday, HEAD is 5986a2ec35836a878350c54af4bd91b1de6abc59)
> doesn't resume on my x60. 2.6.20 works fine, so something broke since
> then.

I think the patch from

http://marc.theaimsgroup.com/?l=linux-acpi&m=117103448629685&w=2

is likely to help.

Greetings,
Rafael


--
If you don't have the time to read,
you don't have the time or the tools to write.
- Stephen King

2007-02-10 11:24:36

by Jens Axboe

[permalink] [raw]
Subject: Re: current git breaks resume

On Sat, Feb 10 2007, Rafael J. Wysocki wrote:
> Hi,
>
> On Friday, 9 February 2007 20:03, Jens Axboe wrote:
> > Hi,
> >
> > Unfortunately I'm a little short on time as I'll be travelling tomorrow,
> > but of course preparing a new kernel for the laptop is something you
> > want to do right before leaving. So I discovered that the current (well
> > as of yesterday, HEAD is 5986a2ec35836a878350c54af4bd91b1de6abc59)
> > doesn't resume on my x60. 2.6.20 works fine, so something broke since
> > then.
>
> I think the patch from
>
> http://marc.theaimsgroup.com/?l=linux-acpi&m=117103448629685&w=2
>
> is likely to help.

Thanks, will give it a shot.

--
Jens Axboe

2007-02-10 11:49:55

by Jens Axboe

[permalink] [raw]
Subject: Re: current git breaks resume

On Sat, Feb 10 2007, Jens Axboe wrote:
> On Sat, Feb 10 2007, Rafael J. Wysocki wrote:
> > Hi,
> >
> > On Friday, 9 February 2007 20:03, Jens Axboe wrote:
> > > Hi,
> > >
> > > Unfortunately I'm a little short on time as I'll be travelling tomorrow,
> > > but of course preparing a new kernel for the laptop is something you
> > > want to do right before leaving. So I discovered that the current (well
> > > as of yesterday, HEAD is 5986a2ec35836a878350c54af4bd91b1de6abc59)
> > > doesn't resume on my x60. 2.6.20 works fine, so something broke since
> > > then.
> >
> > I think the patch from
> >
> > http://marc.theaimsgroup.com/?l=linux-acpi&m=117103448629685&w=2
> >
> > is likely to help.
>
> Thanks, will give it a shot.

Doesn't work, still hangs in the same way.

--
Jens Axboe

2007-02-10 12:00:09

by Rafael J. Wysocki

[permalink] [raw]
Subject: Re: current git breaks resume

On Saturday, 10 February 2007 12:50, Jens Axboe wrote:
> On Sat, Feb 10 2007, Jens Axboe wrote:
> > On Sat, Feb 10 2007, Rafael J. Wysocki wrote:
> > > Hi,
> > >
> > > On Friday, 9 February 2007 20:03, Jens Axboe wrote:
> > > > Hi,
> > > >
> > > > Unfortunately I'm a little short on time as I'll be travelling tomorrow,
> > > > but of course preparing a new kernel for the laptop is something you
> > > > want to do right before leaving. So I discovered that the current (well
> > > > as of yesterday, HEAD is 5986a2ec35836a878350c54af4bd91b1de6abc59)
> > > > doesn't resume on my x60. 2.6.20 works fine, so something broke since
> > > > then.
> > >
> > > I think the patch from
> > >
> > > http://marc.theaimsgroup.com/?l=linux-acpi&m=117103448629685&w=2
> > >
> > > is likely to help.
> >
> > Thanks, will give it a shot.
>
> Doesn't work, still hangs in the same way.

Well, looked promising ...

Still, I suspect the ACPI changes cause the problem to happen.

I've tested 2.6.20-git4 and it works on my box (HPC nx6325, x86_64).
Unfortunately I have no i386 setup anywhere close to me right now.

Greetings,
Rafael

2007-02-11 03:28:42

by Jens Axboe

[permalink] [raw]
Subject: Re: current git breaks resume

On Sat, Feb 10 2007, Rafael J. Wysocki wrote:
> On Saturday, 10 February 2007 12:50, Jens Axboe wrote:
> > On Sat, Feb 10 2007, Jens Axboe wrote:
> > > On Sat, Feb 10 2007, Rafael J. Wysocki wrote:
> > > > Hi,
> > > >
> > > > On Friday, 9 February 2007 20:03, Jens Axboe wrote:
> > > > > Hi,
> > > > >
> > > > > Unfortunately I'm a little short on time as I'll be travelling tomorrow,
> > > > > but of course preparing a new kernel for the laptop is something you
> > > > > want to do right before leaving. So I discovered that the current (well
> > > > > as of yesterday, HEAD is 5986a2ec35836a878350c54af4bd91b1de6abc59)
> > > > > doesn't resume on my x60. 2.6.20 works fine, so something broke since
> > > > > then.
> > > >
> > > > I think the patch from
> > > >
> > > > http://marc.theaimsgroup.com/?l=linux-acpi&m=117103448629685&w=2
> > > >
> > > > is likely to help.
> > >
> > > Thanks, will give it a shot.
> >
> > Doesn't work, still hangs in the same way.
>
> Well, looked promising ...
>
> Still, I suspect the ACPI changes cause the problem to happen.
>
> I've tested 2.6.20-git4 and it works on my box (HPC nx6325, x86_64).
> Unfortunately I have no i386 setup anywhere close to me right now.

When I'm on stable ground again, I'll try with pm tracing and see if
that yields anything. Otherwise I'll do a bisect.

--
Jens Axboe

2007-02-11 05:03:59

by Len Brown

[permalink] [raw]
Subject: Re: current git breaks resume

On Friday 09 February 2007 14:03, Jens Axboe wrote:
> Hi,
>
> Unfortunately I'm a little short on time as I'll be travelling tomorrow,
> but of course preparing a new kernel for the laptop is something you
> want to do right before leaving. So I discovered that the current (well
> as of yesterday, HEAD is 5986a2ec35836a878350c54af4bd91b1de6abc59)
> doesn't resume on my x60. 2.6.20 works fine, so something broke since
> then.

resume from RAM, or resume from disk?

2007-02-11 14:34:32

by Alexey Starikovskiy

[permalink] [raw]
Subject: Re: current git breaks resume

Disable wake GPEs only once.

From: Alexey Starikovskiy <[email protected]>


---

drivers/acpi/events/evgpe.c | 11 -----------
1 files changed, 0 insertions(+), 11 deletions(-)

diff --git a/drivers/acpi/events/evgpe.c b/drivers/acpi/events/evgpe.c
index dfac3ec..635ba44 100644
--- a/drivers/acpi/events/evgpe.c
+++ b/drivers/acpi/events/evgpe.c
@@ -636,17 +636,6 @@ acpi_ev_gpe_dispatch(struct acpi_gpe_eve
}
}

- if (!acpi_gbl_system_awake_and_running) {
- /*
- * We just woke up because of a wake GPE. Disable any further GPEs
- * until we are fully up and running (Only wake GPEs should be enabled
- * at this time, but we just brute-force disable them all.)
- * 1) We must disable this particular wake GPE so it won't fire again
- * 2) We want to disable all wake GPEs, since we are now awake
- */
- (void)acpi_hw_disable_all_gpes();
- }
-
/*
* Dispatch the GPE to either an installed handler, or the control method
* associated with this GPE (_Lxx or _Exx). If a handler exists, we invoke


Attachments:
fix-disable_all_wake_gpes.patch (1.02 kB)

2007-02-11 17:15:57

by Jens Axboe

[permalink] [raw]
Subject: Re: current git breaks resume

On Sun, Feb 11 2007, Len Brown wrote:
> On Friday 09 February 2007 14:03, Jens Axboe wrote:
> > Hi,
> >
> > Unfortunately I'm a little short on time as I'll be travelling tomorrow,
> > but of course preparing a new kernel for the laptop is something you
> > want to do right before leaving. So I discovered that the current (well
> > as of yesterday, HEAD is 5986a2ec35836a878350c54af4bd91b1de6abc59)
> > doesn't resume on my x60. 2.6.20 works fine, so something broke since
> > then.
>
> resume from RAM, or resume from disk?

Resume from RAM, I never use suspend-to-disk.

--
Jens Axboe

2007-02-11 17:31:38

by Alexey Starikovskiy

[permalink] [raw]
Subject: Re: current git breaks resume

Jens Axboe wrote:
> On Sun, Feb 11 2007, Len Brown wrote:
>
>> On Friday 09 February 2007 14:03, Jens Axboe wrote:
>>
>>> Hi,
>>>
>>> Unfortunately I'm a little short on time as I'll be travelling tomorrow,
>>> but of course preparing a new kernel for the laptop is something you
>>> want to do right before leaving. So I discovered that the current (well
>>> as of yesterday, HEAD is 5986a2ec35836a878350c54af4bd91b1de6abc59)
>>> doesn't resume on my x60. 2.6.20 works fine, so something broke since
>>> then.
>>>
>> resume from RAM, or resume from disk?
>>
>
> Resume from RAM, I never use suspend-to-disk.
>
>
Jens,
Could you please test the patch I've sent?

Thanks,
Alex.

2007-02-11 17:36:12

by Jens Axboe

[permalink] [raw]
Subject: Re: current git breaks resume

On Sun, Feb 11 2007, Alexey Starikovskiy wrote:
> Jens Axboe wrote:
> >On Sun, Feb 11 2007, Len Brown wrote:
> >
> >>On Friday 09 February 2007 14:03, Jens Axboe wrote:
> >>
> >>>Hi,
> >>>
> >>>Unfortunately I'm a little short on time as I'll be travelling tomorrow,
> >>>but of course preparing a new kernel for the laptop is something you
> >>>want to do right before leaving. So I discovered that the current (well
> >>>as of yesterday, HEAD is 5986a2ec35836a878350c54af4bd91b1de6abc59)
> >>>doesn't resume on my x60. 2.6.20 works fine, so something broke since
> >>>then.
> >>>
> >>resume from RAM, or resume from disk?
> >>
> >
> >Resume from RAM, I never use suspend-to-disk.
> >
> >
> Jens,
> Could you please test the patch I've sent?

Just saw it, will do.

--
Jens Axboe

2007-02-11 17:56:21

by Jens Axboe

[permalink] [raw]
Subject: Re: current git breaks resume

On Sun, Feb 11 2007, Jens Axboe wrote:
> On Sun, Feb 11 2007, Alexey Starikovskiy wrote:
> > Jens Axboe wrote:
> > >On Sun, Feb 11 2007, Len Brown wrote:
> > >
> > >>On Friday 09 February 2007 14:03, Jens Axboe wrote:
> > >>
> > >>>Hi,
> > >>>
> > >>>Unfortunately I'm a little short on time as I'll be travelling tomorrow,
> > >>>but of course preparing a new kernel for the laptop is something you
> > >>>want to do right before leaving. So I discovered that the current (well
> > >>>as of yesterday, HEAD is 5986a2ec35836a878350c54af4bd91b1de6abc59)
> > >>>doesn't resume on my x60. 2.6.20 works fine, so something broke since
> > >>>then.
> > >>>
> > >>resume from RAM, or resume from disk?
> > >>
> > >
> > >Resume from RAM, I never use suspend-to-disk.
> > >
> > >
> > Jens,
> > Could you please test the patch I've sent?
>
> Just saw it, will do.

With that patch applied, current git works as expected. Thanks!

--
Jens Axboe