ACPI / sleep: remove panic in case hardware has changed after S4 (5c551e62) · Commits · 戴 / test

Some BIOSes change hardware based on the state of a laptop's lid. If the lid is closed, the touchpad is disabled and the checksum changes. Windows 8 no longer aborts resume if the checksum has changed. Signed-off-by:

Oliver Neukum <oneukum@suse.de> [rjw: Use pr_crit() for the message and don't break the string] Signed-off-by:

Rafael J. Wysocki <rafael.j.wysocki@intel.com>

drivers/acpi/sleep.c

+2 −5

Original line number	Diff line number	Diff line
		@@ -670,11 +670,8 @@ static void acpi_hibernation_leave(void)
		/* Reprogram control registers */
		acpi_leave_sleep_state_prep(ACPI_STATE_S4);
		/* Check the hardware signature */
		if (facs && s4_hardware_signature != facs->hardware_signature) {
		printk(KERN_EMERG "ACPI: Hardware changed while hibernated, "
		"cannot resume!\n");
		panic("ACPI S4 hardware signature mismatch");
		}
		if (facs && s4_hardware_signature != facs->hardware_signature)
		pr_crit("ACPI: Hardware changed while hibernated, success doubtful!\n");
		/* Restore the NVS memory area */
		suspend_nvs_restore();
		/* Allow EC transactions to happen. */

Admin message