Commit 032b4cc8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pm-4.15-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

Pull power management fix from Rafael Wysocki:
 "This fixes an issue in two recent commits that may cause
  pm_runtime_enable() to be called for too many times for some devices
  during the "thaw" transition belonging to hibernation"

* tag 'pm-4.15-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  PM / sleep: Avoid excess pm_runtime_enable() calls in device_resume()
parents 04243787 3487972d

drivers/acpi/device_pm.c

+1 −1
Original line number Diff line number Diff line
@@ -1138,7 +1138,7 @@ int acpi_subsys_thaw_noirq(struct device *dev) 
	 * skip all of the subsequent "thaw" callbacks for the device.

	 */

	if (dev_pm_smart_suspend_and_suspended(dev)) {

		dev->power.direct_complete = true;

		dev_pm_skip_next_resume_phases(dev);

		return 0;

	}

drivers/base/power/main.c

+15 −0
Original line number Diff line number Diff line
@@ -525,6 +525,21 @@ static void dpm_watchdog_clear(struct dpm_watchdog *wd) 


/*------------------------- Resume routines -------------------------*/



/**

 * dev_pm_skip_next_resume_phases - Skip next system resume phases for device.

 * @dev: Target device.

 *

 * Make the core skip the "early resume" and "resume" phases for @dev.

 *

 * This function can be called by middle-layer code during the "noirq" phase of

 * system resume if necessary, but not by device drivers.

 */

void dev_pm_skip_next_resume_phases(struct device *dev)

{

	dev->power.is_late_suspended = false;

	dev->power.is_suspended = false;

}



/**

 * device_resume_noirq - Execute a "noirq resume" callback for given device.

 * @dev: Device to handle.

drivers/pci/pci-driver.c

+1 −1
Original line number Diff line number Diff line
@@ -999,7 +999,7 @@ static int pci_pm_thaw_noirq(struct device *dev) 
	 * the subsequent "thaw" callbacks for the device.

	 */

	if (dev_pm_smart_suspend_and_suspended(dev)) {

		dev->power.direct_complete = true;

		dev_pm_skip_next_resume_phases(dev);

		return 0;

	}

include/linux/pm.h

+1 −0
Original line number Diff line number Diff line
@@ -765,6 +765,7 @@ extern int pm_generic_poweroff_late(struct device *dev); 
extern int pm_generic_poweroff(struct device *dev);

extern void pm_generic_complete(struct device *dev);



extern void dev_pm_skip_next_resume_phases(struct device *dev);

extern bool dev_pm_smart_suspend_and_suspended(struct device *dev);



#else /* !CONFIG_PM_SLEEP */

CRA Git | Maintained and supported by SUSTech CRA and CCSE