Revert "ACPI: Ingore the RESET_REG_SUP bit when using ACPI reset mechanism"
This reverts commit 8fd145917f
.
http://bugzilla.kernel.org/show_bug.cgi?id=11942
Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
parent
f4a9bc4c7d
commit
d17cb18a07
1 changed files with 3 additions and 22 deletions
|
@ -15,28 +15,9 @@ void acpi_reboot(void)
|
||||||
|
|
||||||
rr = &acpi_gbl_FADT.reset_register;
|
rr = &acpi_gbl_FADT.reset_register;
|
||||||
|
|
||||||
/*
|
/* Is the reset register supported? */
|
||||||
* Is the ACPI reset register supported?
|
if (!(acpi_gbl_FADT.flags & ACPI_FADT_RESET_REGISTER) ||
|
||||||
*
|
rr->bit_width != 8 || rr->bit_offset != 0)
|
||||||
* According to ACPI 3.0, FADT.flags.RESET_REG_SUP indicates
|
|
||||||
* whether the ACPI reset mechanism is supported.
|
|
||||||
*
|
|
||||||
* However, some boxes have this bit clear, yet a valid
|
|
||||||
* ACPI_RESET_REG & RESET_VALUE, and ACPI reboot is the only
|
|
||||||
* mechanism that works for them after S3.
|
|
||||||
*
|
|
||||||
* This suggests that other operating systems may not be checking
|
|
||||||
* the RESET_REG_SUP bit, and are using other means to decide
|
|
||||||
* whether to use the ACPI reboot mechanism or not.
|
|
||||||
*
|
|
||||||
* So when acpi reboot is requested,
|
|
||||||
* only the reset_register is checked. If the following
|
|
||||||
* conditions are met, it indicates that the reset register is supported.
|
|
||||||
* a. reset_register is not zero
|
|
||||||
* b. the access width is eight
|
|
||||||
* c. the bit_offset is zero
|
|
||||||
*/
|
|
||||||
if (!(rr->address) || rr->bit_width != 8 || rr->bit_offset != 0)
|
|
||||||
return;
|
return;
|
||||||
|
|
||||||
reset_value = acpi_gbl_FADT.reset_value;
|
reset_value = acpi_gbl_FADT.reset_value;
|
||||||
|
|
Loading…
Reference in a new issue