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@xxxxxxxxxxxxx> > > > > 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@xxxxxxxxxxxxx> > > --- > > 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 ***
>From 871dccf769ad7be6625bb10a0d58408bf90e6c51 Mon Sep 17 00:00:00 2001 From: Colin Ian King <colin.king@xxxxxxxxxxxxx> 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@xxxxxxxxxxxxx> --- 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
