[Xen-changelog] [xen-3.2-testing] x86: Fix an S3 bug caused by x_firmware_waking_vector

["Xen patchbot-3.2-testing" <patchbot-3.2-testing@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1210841753 -3600
# Node ID ffbf5d0ff61d39929be663c714a3a958387d6b3d
# Parent  57cfcbe761b8aeb03f430c828e25a400d7a9b2d6
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@xxxxxxxxx>
xen-unstable changeset:   17644:29dc52031954896a407a97cba167c197f8e1c0ed
xen-unstable date:        Thu May 15 09:38:00 2008 +0100
---
 xen/arch/x86/acpi/boot.c |   15 ++++-----------
 1 files changed, 4 insertions(+), 11 deletions(-)

diff -r 57cfcbe761b8 -r ffbf5d0ff61d xen/arch/x86/acpi/boot.c
--- a/xen/arch/x86/acpi/boot.c  Thu May 15 09:53:32 2008 +0100
+++ b/xen/arch/x86/acpi/boot.c  Thu May 15 09:55:53 2008 +0100
@@ -450,17 +450,10 @@ acpi_fadt_parse_sleep_info(struct fadt_d
                        "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",

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