ACPI: Allow setting SCI_EN bit in PM1_CONTROL register

This is needed by at least the Mac Mini's, which (incorrectly) come back
from suspend with SCI_EN clear.

Thanks to Frédéric Riss for hunting this down.

Acked-by: Frédéric Riss <frederic.riss@gmail.com>
Cc: Pavel Machek <pavel@ucw.cz>
Cc: Len Brown <len.brown@intel.com>
Cc: Arjan van de Ven <arjan@infradead.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/drivers/acpi/hardware/hwregs.c b/drivers/acpi/hardware/hwregs.c
index 3143f36fcec9f50caa5b3320191a5c1086a5ab18..fa58c1edce1e52f00c6b1cecebbe3f63a7a4af6f 100644 (file)
--- a/drivers/acpi/hardware/hwregs.c
+++ b/drivers/acpi/hardware/hwregs.c
@@ -665,8 +665,6 @@ acpi_status acpi_hw_register_write(u8 use_lock, u32 register_id, u32 value)
 
                /*
                 * Perform a read first to preserve certain bits (per ACPI spec)
-                *
-                * Note: This includes SCI_EN, we never want to change this bit
                 */
                status = acpi_hw_register_read(ACPI_MTX_DO_NOT_LOCK,
                                               ACPI_REGISTER_PM1_CONTROL,

diff --git a/include/acpi/aclocal.h b/include/acpi/aclocal.h
index a4d0e73d5acac5084e3a0671651cac13edb6b583..063c4b54290f254d7ba22ec933be53ca03fcb561 100644 (file)
--- a/include/acpi/aclocal.h
+++ b/include/acpi/aclocal.h
@@ -708,7 +708,7 @@ struct acpi_bit_register_info {
  * must be preserved.
  */
 #define ACPI_PM1_STATUS_PRESERVED_BITS          0x0800 /* Bit 11 */
-#define ACPI_PM1_CONTROL_PRESERVED_BITS         0x0201 /* Bit 9, Bit 0 (SCI_EN) */
+#define ACPI_PM1_CONTROL_PRESERVED_BITS         0x0200 /* Bit 9 (whatever) */
 
 /*
  * Register IDs