Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

+1 -3
-2
drivers/acpi/hardware/hwregs.c
··· 665 665 666 666 /* 667 667 * Perform a read first to preserve certain bits (per ACPI spec) 668 - * 669 - * Note: This includes SCI_EN, we never want to change this bit 670 668 */ 671 669 status = acpi_hw_register_read(ACPI_MTX_DO_NOT_LOCK, 672 670 ACPI_REGISTER_PM1_CONTROL,
+1 -1
include/acpi/aclocal.h
··· 708 708 * must be preserved. 709 709 */ 710 710 #define ACPI_PM1_STATUS_PRESERVED_BITS 0x0800 /* Bit 11 */ 711 - #define ACPI_PM1_CONTROL_PRESERVED_BITS 0x0201 /* Bit 9, Bit 0 (SCI_EN) */ 711 + #define ACPI_PM1_CONTROL_PRESERVED_BITS 0x0200 /* Bit 9 (whatever) */ 712 712 713 713 /* 714 714 * Register IDs