From: Keir Fraser Date: Thu, 15 May 2008 08:55:53 +0000 (+0100) Subject: x86: Fix an S3 bug caused by x_firmware_waking_vector X-Git-Tag: 3.2.2-rc1~51 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=cba8fd559efdfb079762edc97ea91248d1a0ba9c;p=people%2Fvhanquez%2Fxen.git 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 xen-unstable changeset: 17644:29dc52031954896a407a97cba167c197f8e1c0ed xen-unstable date: Thu May 15 09:38:00 2008 +0100 --- diff --git a/xen/arch/x86/acpi/boot.c b/xen/arch/x86/acpi/boot.c index 0e1f3ecb4..c7004c666 100644 --- a/xen/arch/x86/acpi/boot.c +++ b/xen/arch/x86/acpi/boot.c @@ -450,17 +450,10 @@ acpi_fadt_parse_sleep_info(struct fadt_descriptor_rev2 *fadt) "FACS is shorter than ACPI spec allow: 0x%x", facs->length); - if ((rsdp->revision < 2) || (facs->length < 32)) { - acpi_sinfo.wakeup_vector = facs_pa + - offsetof(struct facs_descriptor_rev2, - firmware_waking_vector); - acpi_sinfo.vector_width = 32; - } else { - acpi_sinfo.wakeup_vector = facs_pa + - offsetof(struct facs_descriptor_rev2, - xfirmware_waking_vector); - acpi_sinfo.vector_width = 64; - } + acpi_sinfo.wakeup_vector = facs_pa + + offsetof(struct facs_descriptor_rev2, + firmware_waking_vector); + acpi_sinfo.vector_width = 32; printk(KERN_INFO PREFIX " wakeup_vec[%"PRIx64"], vec_size[%x]\n",