From 6734fe57a07b2dd23ef1ef2ac1f790747e53eefc Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Fri, 11 Mar 2011 16:12:19 -0500 Subject: ACPI: Bug compatibility for Windows on the ACPI reboot vector Windows ignores the bit_offset and bit_width, despite the spec requiring that they be validated. Drop the checks so that we match this behaviour. Windows also goes straight for the keyboard controller if the ACPI reboot fails, so we shouldn't sleep if we're still alive. Signed-off-by: Matthew Garrett Signed-off-by: Len Brown --- drivers/acpi/reboot.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'drivers/acpi/reboot.c') diff --git a/drivers/acpi/reboot.c b/drivers/acpi/reboot.c index 93f91142d7a..4870aaaa2ae 100644 --- a/drivers/acpi/reboot.c +++ b/drivers/acpi/reboot.c @@ -15,9 +15,10 @@ void acpi_reboot(void) rr = &acpi_gbl_FADT.reset_register; - /* Is the reset register supported? */ - if (!(acpi_gbl_FADT.flags & ACPI_FADT_RESET_REGISTER) || - rr->bit_width != 8 || rr->bit_offset != 0) + /* Is the reset register supported? The spec says we should be + * checking the bit width and bit offset, but Windows ignores + * these fields */ + if (!(acpi_gbl_FADT.flags & ACPI_FADT_RESET_REGISTER)) return; reset_value = acpi_gbl_FADT.reset_value; @@ -45,6 +46,4 @@ void acpi_reboot(void) acpi_reset(); break; } - /* Wait ten seconds */ - acpi_os_stall(10000000); } -- cgit v1.2.3-70-g09d2 From 95cf3e12e7f659e536215b37c67d46f3e2ce95cc Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Fri, 11 Mar 2011 16:12:20 -0500 Subject: ACPI: Make sure the FADT is at least rev 2 before using the reset register The reset register was only introduced with version 2 of the FADT, so we should check that the FADT revision before trusting its contents. Signed-off-by: Matthew Garrett Signed-off-by: Len Brown --- drivers/acpi/reboot.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'drivers/acpi/reboot.c') diff --git a/drivers/acpi/reboot.c b/drivers/acpi/reboot.c index 4870aaaa2ae..a6c77e8b37b 100644 --- a/drivers/acpi/reboot.c +++ b/drivers/acpi/reboot.c @@ -15,6 +15,11 @@ void acpi_reboot(void) rr = &acpi_gbl_FADT.reset_register; + /* ACPI reset register was only introduced with v2 of the FADT */ + + if (acpi_gbl_FADT.header.revision < 2) + return; + /* Is the reset register supported? The spec says we should be * checking the bit width and bit offset, but Windows ignores * these fields */ -- cgit v1.2.3-70-g09d2