Commit beb53e4b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'acpi-4.9-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

Pull ACPI fixes from Rafael Wysocki:
 "Two ACPI fixes for 4.9-rc7.

  One of them reverts a recent ACPI commit that attempted to improve
  reboot/power-off on some systems, but introduced problems elsewhere,
  and the other one fixes kernel builds with the new WDAT watchdog
  driver enabled in some configurations.

  Specifics:

   - Revert the recent commit that caused the ACPI _PTS method to be
     executed in the power-off/reboot code path (as per the
     specification) in an attempt to improve things on some systems
     (apparently expecting _PTS to be executed in that code path), but
     broke power-off/reboot on at least one other machine (Rafael
     Wysocki).

   - Fix kernel builds with the new WDAT watchdog driver enabled in some
     configurations by explicitly selecting WATCHDOG_CORE when enabling
     the WDAT watchdog driver (Mika Westerberg)"

* tag 'acpi-4.9-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  watchdog: wdat_wdt: Select WATCHDOG_CORE
  Revert "ACPI: Execute _PTS before system reboot"
parents 68656443 7e5c07af

drivers/acpi/sleep.c

+6 −23
Original line number Diff line number Diff line
@@ -47,32 +47,15 @@ static void acpi_sleep_tts_switch(u32 acpi_state) 
	}

}



static void acpi_sleep_pts_switch(u32 acpi_state)

{

	acpi_status status;



	status = acpi_execute_simple_method(NULL, "\\_PTS", acpi_state);

	if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) {

		/*

		 * OS can't evaluate the _PTS object correctly. Some warning

		 * message will be printed. But it won't break anything.

		 */

		printk(KERN_NOTICE "Failure in evaluating _PTS object\n");

	}

}



static int sleep_notify_reboot(struct notifier_block *this,

static int tts_notify_reboot(struct notifier_block *this,

			unsigned long code, void *x)

{

	acpi_sleep_tts_switch(ACPI_STATE_S5);



	acpi_sleep_pts_switch(ACPI_STATE_S5);



	return NOTIFY_DONE;

}



static struct notifier_block sleep_notifier = {

	.notifier_call	= sleep_notify_reboot,

static struct notifier_block tts_notifier = {

	.notifier_call	= tts_notify_reboot,

	.next		= NULL,

	.priority	= 0,

};
@@ -916,9 +899,9 @@ int __init acpi_sleep_init(void) 
	pr_info(PREFIX "(supports%s)\n", supported);



	/*

	 * Register the sleep_notifier to reboot notifier list so that the _TTS

	 * and _PTS object can also be evaluated when the system enters S5.

	 * Register the tts_notifier to reboot notifier list so that the _TTS

	 * object can also be evaluated when the system enters S5.

	 */

	register_reboot_notifier(&sleep_notifier);

	register_reboot_notifier(&tts_notifier);

	return 0;

}

drivers/watchdog/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -155,6 +155,7 @@ config TANGOX_WATCHDOG 
config WDAT_WDT

	tristate "ACPI Watchdog Action Table (WDAT)"

	depends on ACPI

	select WATCHDOG_CORE

	select ACPI_WATCHDOG

	help

	  This driver adds support for systems with ACPI Watchdog Action

CRA Git | Maintained and supported by SUSTech CRA and CCSE