diff options
| author | Lin Ming <ming.m.lin@intel.com> | 2009-05-15 22:27:49 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-05-15 22:27:49 -0400 |
| commit | 975b3c474c13d29337eaf7da8f5f5c0299e4943f (patch) | |
| tree | a4a57d9716c90b00c7de9acbe3b78b3721c71562 /drivers | |
| parent | 091bf7624d1c90cec9e578a18529f615213ff847 (diff) | |
| download | linux-3.10-975b3c474c13d29337eaf7da8f5f5c0299e4943f.tar.gz linux-3.10-975b3c474c13d29337eaf7da8f5f5c0299e4943f.tar.bz2 linux-3.10-975b3c474c13d29337eaf7da8f5f5c0299e4943f.zip | |
ACPI: resume: re-enable SCI-enable workaround
The BIOS bug workaround mistakenly got disabled
when we followed the ACPI specification more closely
by ignoring OS updates to that bit.
(The BIOS is supposed to update SCI_EN, not the OS)
http://bugzilla.kernel.org/show_bug.cgi?id=13289
Signed-off-by: Lin Ming <ming.m.lin@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/acpi/acpica/aclocal.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/acpi/acpica/aclocal.h b/drivers/acpi/acpica/aclocal.h index 772ee5c4ccc..2ec394a328e 100644 --- a/drivers/acpi/acpica/aclocal.h +++ b/drivers/acpi/acpica/aclocal.h @@ -787,7 +787,12 @@ struct acpi_bit_register_info { /* For control registers, both ignored and reserved bits must be preserved */ -#define ACPI_PM1_CONTROL_IGNORED_BITS 0x0201 /* Bits 9, 0(SCI_EN) */ +/* + * The ACPI spec says to ignore PM1_CTL.SCI_EN (bit 0) + * but we need to be able to write ACPI_BITREG_SCI_ENABLE directly + * as a BIOS workaround on some machines. + */ +#define ACPI_PM1_CONTROL_IGNORED_BITS 0x0200 /* Bits 9 */ #define ACPI_PM1_CONTROL_RESERVED_BITS 0xC1F8 /* Bits 14-15, 3-8 */ #define ACPI_PM1_CONTROL_PRESERVED_BITS \ (ACPI_PM1_CONTROL_IGNORED_BITS | ACPI_PM1_CONTROL_RESERVED_BITS) |