ia64/linux-2.6.18-xen.hg

changeset 608:905f275ed4d8

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@intel.com>
author Keir Fraser <keir.fraser@citrix.com>
date Mon Jul 21 09:51:36 2008 +0100 (2008-07-21)
parents 2c80783731a2
children 8a3dc4fdb478
files drivers/acpi/hardware/hwregs.c include/acpi/aclocal.h
line diff
     1.1 --- a/drivers/acpi/hardware/hwregs.c	Fri Jul 18 11:26:26 2008 +0100
     1.2 +++ b/drivers/acpi/hardware/hwregs.c	Mon Jul 21 09:51:36 2008 +0100
     1.3 @@ -665,8 +665,6 @@ acpi_status acpi_hw_register_write(u8 us
     1.4  
     1.5  		/*
     1.6  		 * Perform a read first to preserve certain bits (per ACPI spec)
     1.7 -		 *
     1.8 -		 * Note: This includes SCI_EN, we never want to change this bit
     1.9  		 */
    1.10  		status = acpi_hw_register_read(ACPI_MTX_DO_NOT_LOCK,
    1.11  					       ACPI_REGISTER_PM1_CONTROL,
     2.1 --- a/include/acpi/aclocal.h	Fri Jul 18 11:26:26 2008 +0100
     2.2 +++ b/include/acpi/aclocal.h	Mon Jul 21 09:51:36 2008 +0100
     2.3 @@ -708,7 +708,7 @@ struct acpi_bit_register_info {
     2.4   * must be preserved.
     2.5   */
     2.6  #define ACPI_PM1_STATUS_PRESERVED_BITS          0x0800	/* Bit 11 */
     2.7 -#define ACPI_PM1_CONTROL_PRESERVED_BITS         0x0201	/* Bit 9, Bit 0 (SCI_EN) */
     2.8 +#define ACPI_PM1_CONTROL_PRESERVED_BITS         0x0200	/* Bit 9 (whatever) */
     2.9  
    2.10  /*
    2.11   * Register IDs