ia64/xen-unstable

changeset 17663:29dc52031954

x86: Fix an S3 bug caused by x_firmware_waking_vector

According to ACPI spec., x_firmware_waking_vector in FACS is for
waking up in protected mode and firmware_waking_vector is for in real
mode. Xen once use x_firmware_waking_vector which can make S3 failed
on some platform. This patch fixed the bug by using non-x one.

Signed-off-by: Huacai Chen <huacai.chen@intel.com>
author Keir Fraser <keir.fraser@citrix.com>
date Thu May 15 09:38:00 2008 +0100 (2008-05-15)
parents 9044705960cb
children 8d18e52a1b23
files xen/arch/x86/acpi/boot.c
line diff
     1.1 --- a/xen/arch/x86/acpi/boot.c	Thu May 15 09:36:38 2008 +0100
     1.2 +++ b/xen/arch/x86/acpi/boot.c	Thu May 15 09:38:00 2008 +0100
     1.3 @@ -441,17 +441,9 @@ acpi_fadt_parse_sleep_info(struct acpi_t
     1.4  			"FACS is shorter than ACPI spec allow: 0x%x",
     1.5  			facs->length);
     1.6  
     1.7 -	if ((rsdp->revision < 2) || (facs->length < 32)) {
     1.8 -		acpi_sinfo.wakeup_vector = facs_pa + 
     1.9 -			offsetof(struct acpi_table_facs,
    1.10 -				 firmware_waking_vector);
    1.11 -		acpi_sinfo.vector_width = 32;
    1.12 -	} else {
    1.13 -		acpi_sinfo.wakeup_vector = facs_pa +
    1.14 -			offsetof(struct acpi_table_facs,
    1.15 -				 xfirmware_waking_vector);
    1.16 -		acpi_sinfo.vector_width = 64;
    1.17 -	}
    1.18 +	acpi_sinfo.wakeup_vector = facs_pa + 
    1.19 +		offsetof(struct acpi_table_facs, firmware_waking_vector);
    1.20 +	acpi_sinfo.vector_width = 32;
    1.21  
    1.22  	printk(KERN_INFO PREFIX
    1.23  	       "                 wakeup_vec[%"PRIx64"], vec_size[%x]\n",