* [RESEND][PATCH 0/1] acpi: clear PCIEXP_WAKE_STS on resume
@ 2010-09-28 11:00 Colin King
2010-09-28 11:00 ` [PATCH 1/1] " Colin King
0 siblings, 1 reply; 7+ messages in thread
From: Colin King @ 2010-09-28 11:00 UTC (permalink / raw)
To: Len Brown, linux-acpi
From: Colin Ian King <colin.king@canonical.com>
Discovered that clearing the PCIEXP_WAKE_STS bit in PM1 on
resume fixes a S3 resume hang in a BIOS. I beleive the on
board PCI Express ethernet is sometimes causing a PCI wakeup
event which requires clearing the PCIEXP_WAKE_STS bit before
we go into the next resume or it will hang in the BIOS.
The ACPI spec 4.0 does indicate that this bit should be
cleared before suspending (see section 4.7.3.1.1, table 4-11
in the PCIEXP_WAKE_STS entry) otherwise "the system will
not automatically wake."
Colin Ian King (1):
acpi: clear PCIEXP_WAKE_STS on resume
drivers/acpi/acpica/aclocal.h | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 1/1] acpi: clear PCIEXP_WAKE_STS on resume
2010-09-28 11:00 [RESEND][PATCH 0/1] acpi: clear PCIEXP_WAKE_STS on resume Colin King
@ 2010-09-28 11:00 ` Colin King
2010-09-28 15:31 ` Randy Dunlap
0 siblings, 1 reply; 7+ messages in thread
From: Colin King @ 2010-09-28 11:00 UTC (permalink / raw)
To: Len Brown, linux-acpi
From: Colin Ian King <colin.king@canonical.com>
Section 4.7.3.1.1 (PM1 Status Registers) of version 4.0 of
the ACPI spec concerning PCIEXP_WAKE_STS points out in
in the final note field in table 4-11 that if this bit is
set to 1 and the system is put into a sleeping state then
the system will not automatically wake.
This bit gets set by hardware to indicate that the system
woke up due to a PCI Express wakeup event, so clear it during
acpi_hw_clear_acpi_status() calls to enable subsequent
resumes to work.
BugLink: http://bugs.launchpad.net/bugs/613381
Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
drivers/acpi/acpica/aclocal.h | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/drivers/acpi/acpica/aclocal.h b/drivers/acpi/acpica/aclocal.h
index 147a7e6..f26db38 100644
--- a/drivers/acpi/acpica/aclocal.h
+++ b/drivers/acpi/acpica/aclocal.h
@@ -853,6 +853,7 @@ struct acpi_bit_register_info {
ACPI_BITMASK_POWER_BUTTON_STATUS | \
ACPI_BITMASK_SLEEP_BUTTON_STATUS | \
ACPI_BITMASK_RT_CLOCK_STATUS | \
+ ACPI_BITMASK_PCIEXP_WAKE_DISABLE | \
ACPI_BITMASK_WAKE_STATUS)
#define ACPI_BITMASK_TIMER_ENABLE 0x0001
--
1.7.0.4
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH 1/1] acpi: clear PCIEXP_WAKE_STS on resume
2010-09-28 11:00 ` [PATCH 1/1] " Colin King
@ 2010-09-28 15:31 ` Randy Dunlap
2010-09-28 15:46 ` Colin Ian King
0 siblings, 1 reply; 7+ messages in thread
From: Randy Dunlap @ 2010-09-28 15:31 UTC (permalink / raw)
To: Colin King; +Cc: Len Brown, linux-acpi
On Tue, 28 Sep 2010 12:00:24 +0100 Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
>
> Section 4.7.3.1.1 (PM1 Status Registers) of version 4.0 of
> the ACPI spec concerning PCIEXP_WAKE_STS points out in
> in the final note field in table 4-11 that if this bit is
> set to 1 and the system is put into a sleeping state then
> the system will not automatically wake.
>
> This bit gets set by hardware to indicate that the system
> woke up due to a PCI Express wakeup event, so clear it during
> acpi_hw_clear_acpi_status() calls to enable subsequent
> resumes to work.
>
> BugLink: http://bugs.launchpad.net/bugs/613381
>
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
> drivers/acpi/acpica/aclocal.h | 1 +
> 1 files changed, 1 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/acpi/acpica/aclocal.h b/drivers/acpi/acpica/aclocal.h
> index 147a7e6..f26db38 100644
> --- a/drivers/acpi/acpica/aclocal.h
> +++ b/drivers/acpi/acpica/aclocal.h
> @@ -853,6 +853,7 @@ struct acpi_bit_register_info {
> ACPI_BITMASK_POWER_BUTTON_STATUS | \
> ACPI_BITMASK_SLEEP_BUTTON_STATUS | \
> ACPI_BITMASK_RT_CLOCK_STATUS | \
> + ACPI_BITMASK_PCIEXP_WAKE_DISABLE | \
(1) Above should be indented with tabs, not spaces.
(2) It should not take 2 emails to send a patch with one line changed.
Patch 0/N is unnecessary and not desirable on short patch series (N = 1 is short).
> ACPI_BITMASK_WAKE_STATUS)
>
> #define ACPI_BITMASK_TIMER_ENABLE 0x0001
> --
---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH 1/1] acpi: clear PCIEXP_WAKE_STS on resume
2010-09-28 15:31 ` Randy Dunlap
@ 2010-09-28 15:46 ` Colin Ian King
2010-09-28 15:51 ` Randy Dunlap
2010-09-28 19:42 ` Len Brown
0 siblings, 2 replies; 7+ messages in thread
From: Colin Ian King @ 2010-09-28 15:46 UTC (permalink / raw)
To: Randy Dunlap; +Cc: Len Brown, linux-acpi
[-- Attachment #1: Type: text/plain, Size: 1807 bytes --]
On Tue, 2010-09-28 at 08:31 -0700, Randy Dunlap wrote:
> On Tue, 28 Sep 2010 12:00:24 +0100 Colin King wrote:
>
> > From: Colin Ian King <colin.king@canonical.com>
> >
> > Section 4.7.3.1.1 (PM1 Status Registers) of version 4.0 of
> > the ACPI spec concerning PCIEXP_WAKE_STS points out in
> > in the final note field in table 4-11 that if this bit is
> > set to 1 and the system is put into a sleeping state then
> > the system will not automatically wake.
> >
> > This bit gets set by hardware to indicate that the system
> > woke up due to a PCI Express wakeup event, so clear it during
> > acpi_hw_clear_acpi_status() calls to enable subsequent
> > resumes to work.
> >
> > BugLink: http://bugs.launchpad.net/bugs/613381
> >
> > Signed-off-by: Colin Ian King <colin.king@canonical.com>
> > ---
> > drivers/acpi/acpica/aclocal.h | 1 +
> > 1 files changed, 1 insertions(+), 0 deletions(-)
> >
> > diff --git a/drivers/acpi/acpica/aclocal.h b/drivers/acpi/acpica/aclocal.h
> > index 147a7e6..f26db38 100644
> > --- a/drivers/acpi/acpica/aclocal.h
> > +++ b/drivers/acpi/acpica/aclocal.h
> > @@ -853,6 +853,7 @@ struct acpi_bit_register_info {
> > ACPI_BITMASK_POWER_BUTTON_STATUS | \
> > ACPI_BITMASK_SLEEP_BUTTON_STATUS | \
> > ACPI_BITMASK_RT_CLOCK_STATUS | \
> > + ACPI_BITMASK_PCIEXP_WAKE_DISABLE | \
>
> (1) Above should be indented with tabs, not spaces.
My fail. Attached corrected patch.
>
> (2) It should not take 2 emails to send a patch with one line changed.
> Patch 0/N is unnecessary and not desirable on short patch series (N = 1 is short).
>
> > ACPI_BITMASK_WAKE_STATUS)
> >
> > #define ACPI_BITMASK_TIMER_ENABLE 0x0001
> > --
>
>
> ---
> ~Randy
> *** Remember to use Documentation/SubmitChecklist when testing your code ***
[-- Attachment #2: 0001-acpi-clear-PCIEXP_WAKE_STS-on-resume.patch --]
[-- Type: text/x-patch, Size: 1369 bytes --]
>From 871dccf769ad7be6625bb10a0d58408bf90e6c51 Mon Sep 17 00:00:00 2001
From: Colin Ian King <colin.king@canonical.com>
Date: Mon, 2 Aug 2010 15:14:43 +0000
Subject: [PATCH] acpi: clear PCIEXP_WAKE_STS on resume
Section 4.7.3.1.1 (PM1 Status Registers) of version 4.0 of
the ACPI spec concerning PCIEXP_WAKE_STS points out in
in the final note field in table 4-11 that if this bit is
set to 1 and the system is put into a sleeping state then
the system will not automatically wake.
This bit gets set by hardware to indicate that the system
woke up due to a PCI Express wakeup event, so clear it during
acpi_hw_clear_acpi_status() calls to enable subsequent
resumes to work.
BugLink: http://bugs.launchpad.net/bugs/613381
Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
drivers/acpi/acpica/aclocal.h | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/drivers/acpi/acpica/aclocal.h b/drivers/acpi/acpica/aclocal.h
index 147a7e6..f26db38 100644
--- a/drivers/acpi/acpica/aclocal.h
+++ b/drivers/acpi/acpica/aclocal.h
@@ -853,6 +853,7 @@ struct acpi_bit_register_info {
ACPI_BITMASK_POWER_BUTTON_STATUS | \
ACPI_BITMASK_SLEEP_BUTTON_STATUS | \
ACPI_BITMASK_RT_CLOCK_STATUS | \
+ ACPI_BITMASK_PCIEXP_WAKE_DISABLE | \
ACPI_BITMASK_WAKE_STATUS)
#define ACPI_BITMASK_TIMER_ENABLE 0x0001
--
1.7.0.4
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH 1/1] acpi: clear PCIEXP_WAKE_STS on resume
2010-09-28 15:46 ` Colin Ian King
@ 2010-09-28 15:51 ` Randy Dunlap
2010-09-28 19:42 ` Len Brown
1 sibling, 0 replies; 7+ messages in thread
From: Randy Dunlap @ 2010-09-28 15:51 UTC (permalink / raw)
To: Colin Ian King; +Cc: Len Brown, linux-acpi
On Tue, 28 Sep 2010 16:46:02 +0100 Colin Ian King wrote:
> On Tue, 2010-09-28 at 08:31 -0700, Randy Dunlap wrote:
> > On Tue, 28 Sep 2010 12:00:24 +0100 Colin King wrote:
> >
> > > From: Colin Ian King <colin.king@canonical.com>
> > >
> > > Section 4.7.3.1.1 (PM1 Status Registers) of version 4.0 of
> > > the ACPI spec concerning PCIEXP_WAKE_STS points out in
> > > in the final note field in table 4-11 that if this bit is
> > > set to 1 and the system is put into a sleeping state then
> > > the system will not automatically wake.
> > >
> > > This bit gets set by hardware to indicate that the system
> > > woke up due to a PCI Express wakeup event, so clear it during
> > > acpi_hw_clear_acpi_status() calls to enable subsequent
> > > resumes to work.
> > >
> > > BugLink: http://bugs.launchpad.net/bugs/613381
> > >
> > > Signed-off-by: Colin Ian King <colin.king@canonical.com>
> > > ---
> > > drivers/acpi/acpica/aclocal.h | 1 +
> > > 1 files changed, 1 insertions(+), 0 deletions(-)
> > >
> > > diff --git a/drivers/acpi/acpica/aclocal.h b/drivers/acpi/acpica/aclocal.h
> > > index 147a7e6..f26db38 100644
> > > --- a/drivers/acpi/acpica/aclocal.h
> > > +++ b/drivers/acpi/acpica/aclocal.h
> > > @@ -853,6 +853,7 @@ struct acpi_bit_register_info {
> > > ACPI_BITMASK_POWER_BUTTON_STATUS | \
> > > ACPI_BITMASK_SLEEP_BUTTON_STATUS | \
> > > ACPI_BITMASK_RT_CLOCK_STATUS | \
> > > + ACPI_BITMASK_PCIEXP_WAKE_DISABLE | \
> >
> > (1) Above should be indented with tabs, not spaces.
>
> My fail. Attached corrected patch.
BTW, have you read Documentation/SubmittingPatches?
> >
> > (2) It should not take 2 emails to send a patch with one line changed.
> > Patch 0/N is unnecessary and not desirable on short patch series (N = 1 is short).
> >
> > > ACPI_BITMASK_WAKE_STATUS)
> > >
> > > #define ACPI_BITMASK_TIMER_ENABLE 0x0001
> > > --
---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH 1/1] acpi: clear PCIEXP_WAKE_STS on resume
2010-09-28 15:46 ` Colin Ian King
2010-09-28 15:51 ` Randy Dunlap
@ 2010-09-28 19:42 ` Len Brown
1 sibling, 0 replies; 7+ messages in thread
From: Len Brown @ 2010-09-28 19:42 UTC (permalink / raw)
To: Colin Ian King; +Cc: Randy Dunlap, linux-acpi
> .... Attached corrected patch.
Good find!
applied to acpi-test,
and I forwarded it to the ACPICA folks b/c it is a patch to ACPICA code.
thanks,
Len Brown, Intel Open Source Technology Center
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 0/1] acpi: clear PCIEXP_WAKE_STS on resume
@ 2010-08-04 10:06 Colin King
2010-08-04 10:06 ` [PATCH 1/1] " Colin King
0 siblings, 1 reply; 7+ messages in thread
From: Colin King @ 2010-08-04 10:06 UTC (permalink / raw)
To: Len Brown, linux-acpi
From: Colin Ian King <colin.king@canonical.com>
Discovered that clearing the PCIEXP_WAKE_STS bit in PM1 on
resume fixes a S3 resume hang in a BIOS. I beleive the on
board PCI Express ethernet is sometimes causing a PCI wakeup
event which requires clearing the PCIEXP_WAKE_STS bit before
we go into the next resume or it will hang in the BIOS.
The ACPI spec 4.0 does indicate that this bit should be
cleared before suspending (see section 4.7.3.1.1, table 4-11
in the PCIEXP_WAKE_STS entry) otherwise "the system will
not automatically wake."
Colin Ian King (1):
acpi: clear PCIEXP_WAKE_STS on resume
drivers/acpi/acpica/aclocal.h | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 1/1] acpi: clear PCIEXP_WAKE_STS on resume
2010-08-04 10:06 [PATCH 0/1] " Colin King
@ 2010-08-04 10:06 ` Colin King
0 siblings, 0 replies; 7+ messages in thread
From: Colin King @ 2010-08-04 10:06 UTC (permalink / raw)
To: Len Brown, linux-acpi
From: Colin Ian King <colin.king@canonical.com>
Section 4.7.3.1.1 (PM1 Status Registers) of version 4.0 of
the ACPI spec concerning PCIEXP_WAKE_STS points out in
in the final note field in table 4-11 that if this bit is
set to 1 and the system is put into a sleeping state then
the system will not automatically wake.
This bit gets set by hardware to indicate that the system
woke up due to a PCI Express wakeup event, so clear it during
acpi_hw_clear_acpi_status() calls to enable subsequent
resumes to work.
BugLink: http://bugs.launchpad.net/bugs/613381
Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
drivers/acpi/acpica/aclocal.h | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/drivers/acpi/acpica/aclocal.h b/drivers/acpi/acpica/aclocal.h
index 147a7e6..f26db38 100644
--- a/drivers/acpi/acpica/aclocal.h
+++ b/drivers/acpi/acpica/aclocal.h
@@ -853,6 +853,7 @@ struct acpi_bit_register_info {
ACPI_BITMASK_POWER_BUTTON_STATUS | \
ACPI_BITMASK_SLEEP_BUTTON_STATUS | \
ACPI_BITMASK_RT_CLOCK_STATUS | \
+ ACPI_BITMASK_PCIEXP_WAKE_DISABLE | \
ACPI_BITMASK_WAKE_STATUS)
#define ACPI_BITMASK_TIMER_ENABLE 0x0001
--
1.7.0.4
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2010-09-28 19:42 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-09-28 11:00 [RESEND][PATCH 0/1] acpi: clear PCIEXP_WAKE_STS on resume Colin King
2010-09-28 11:00 ` [PATCH 1/1] " Colin King
2010-09-28 15:31 ` Randy Dunlap
2010-09-28 15:46 ` Colin Ian King
2010-09-28 15:51 ` Randy Dunlap
2010-09-28 19:42 ` Len Brown
-- strict thread matches above, loose matches on Subject: below --
2010-08-04 10:06 [PATCH 0/1] " Colin King
2010-08-04 10:06 ` [PATCH 1/1] " Colin King
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox