[Xen-changelog] [linux-2.6.18-xen] From 2.6.19: Set SCI_EN when resuming from S3

["Xen patchbot-linux-2.6.18-xen" <patchbot-linux-2.6.18-xen@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1216630296 -3600
# Node ID 905f275ed4d8a7bca99dba273e9bc838f605e8b9
# Parent  2c80783731a23f4718089761a0f4e4a8e635c035
>From 2.6.19: Set SCI_EN when resuming from S3

When resuming from S3, some platforms may clear SCI_EN bit in
PM1_CONTROL register and cause SCI interrupt disabled in Domain0. This
patch fixes this issue as Linux-2.6.19 does.

Signed-off-by:  Huacai Chen <huacai.chen@xxxxxxxxx>
---
 drivers/acpi/hardware/hwregs.c |    2 --
 include/acpi/aclocal.h         |    2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff -r 2c80783731a2 -r 905f275ed4d8 drivers/acpi/hardware/hwregs.c
--- a/drivers/acpi/hardware/hwregs.c    Fri Jul 18 11:26:26 2008 +0100
+++ b/drivers/acpi/hardware/hwregs.c    Mon Jul 21 09:51:36 2008 +0100
@@ -665,8 +665,6 @@ acpi_status acpi_hw_register_write(u8 us
 
                /*
                 * 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 -r 2c80783731a2 -r 905f275ed4d8 include/acpi/aclocal.h
--- a/include/acpi/aclocal.h    Fri Jul 18 11:26:26 2008 +0100
+++ b/include/acpi/aclocal.h    Mon Jul 21 09:51:36 2008 +0100
@@ -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

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog