From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Mon, 13 Nov 2017 00:41:26 +0000 (+0100)
Subject: Merge branch 'pm-core'
X-Git-Tag: v4.19~2229^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1efef68262dc567f0c09da9d11924e8287cd3a8b;p=platform%2Fkernel%2Flinux-rpi.git

Merge branch 'pm-core'

* pm-core:
  ACPI / PM: Take SMART_SUSPEND driver flag into account
  PCI / PM: Take SMART_SUSPEND driver flag into account
  PCI / PM: Drop unnecessary invocations of pcibios_pm_ops callbacks
  PM / core: Add SMART_SUSPEND driver flag
  PCI / PM: Use the NEVER_SKIP driver flag
  PM / core: Add NEVER_SKIP and SMART_PREPARE driver flags
  PM / core: Convert timers to use timer_setup()
  PM / core: Fix kerneldoc comments of four functions
  PM / core: Drop legacy class suspend/resume operations
---

1efef68262dc567f0c09da9d11924e8287cd3a8b
diff --cc drivers/misc/mei/pci-me.c
index 78b3172,f17e4b4..f4f1755
--- a/drivers/misc/mei/pci-me.c
+++ b/drivers/misc/mei/pci-me.c
@@@ -225,18 -223,15 +225,18 @@@ static int mei_me_probe(struct pci_dev 
  	 * MEI requires to resume from runtime suspend mode
  	 * in order to perform link reset flow upon system suspend.
  	 */
- 	pdev->dev_flags |= PCI_DEV_FLAGS_NEEDS_RESUME;
+ 	dev_pm_set_driver_flags(&pdev->dev, DPM_FLAG_NEVER_SKIP);
  
  	/*
 -	* For not wake-able HW runtime pm framework
 -	* can't be used on pci device level.
 -	* Use domain runtime pm callbacks instead.
 -	*/
 -	if (!pci_dev_run_wake(pdev))
 -		mei_me_set_pm_domain(dev);
 +	 * ME maps runtime suspend/resume to D0i states,
 +	 * hence we need to go around native PCI runtime service which
 +	 * eventually brings the device into D3cold/hot state,
 +	 * but the mei device cannot wake up from D3 unlike from D0i3.
 +	 * To get around the PCI device native runtime pm,
 +	 * ME uses runtime pm domain handlers which take precedence
 +	 * over the driver's pm handlers.
 +	 */
 +	mei_me_set_pm_domain(dev);
  
  	if (mei_pg_is_enabled(dev))
  		pm_runtime_put_noidle(&pdev->dev);
diff --cc drivers/misc/mei/pci-txe.c
index 0566f9b,f911a08..e1b9091
--- a/drivers/misc/mei/pci-txe.c
+++ b/drivers/misc/mei/pci-txe.c
@@@ -141,17 -141,15 +141,17 @@@ static int mei_txe_probe(struct pci_de
  	 * MEI requires to resume from runtime suspend mode
  	 * in order to perform link reset flow upon system suspend.
  	 */
- 	pdev->dev_flags |= PCI_DEV_FLAGS_NEEDS_RESUME;
+ 	dev_pm_set_driver_flags(&pdev->dev, DPM_FLAG_NEVER_SKIP);
  
  	/*
 -	* For not wake-able HW runtime pm framework
 -	* can't be used on pci device level.
 -	* Use domain runtime pm callbacks instead.
 -	*/
 -	if (!pci_dev_run_wake(pdev))
 -		mei_txe_set_pm_domain(dev);
 +	 * TXE maps runtime suspend/resume to own power gating states,
 +	 * hence we need to go around native PCI runtime service which
 +	 * eventually brings the device into D3cold/hot state.
 +	 * But the TXE device cannot wake up from D3 unlike from own
 +	 * power gating. To get around PCI device native runtime pm,
 +	 * TXE uses runtime pm domain handlers which take precedence.
 +	 */
 +	mei_txe_set_pm_domain(dev);
  
  	pm_runtime_put_noidle(&pdev->dev);
  
diff --cc drivers/pci/pci-driver.c
index 9be5630,d19bd54..07b8a9b
--- a/drivers/pci/pci-driver.c
+++ b/drivers/pci/pci-driver.c
@@@ -680,10 -680,20 +680,13 @@@ static int pci_pm_prepare(struct devic
  {
  	struct device_driver *drv = dev->driver;
  
 -	/*
 -	 * Devices having power.ignore_children set may still be necessary for
 -	 * suspending their children in the next phase of device suspend.
 -	 */
 -	if (dev->power.ignore_children)
 -		pm_runtime_resume(dev);
 -
  	if (drv && drv->pm && drv->pm->prepare) {
  		int error = drv->pm->prepare(dev);
- 		if (error)
+ 		if (error < 0)
  			return error;
+ 
+ 		if (!error && dev_pm_test_driver_flags(dev, DPM_FLAG_SMART_PREPARE))
+ 			return 0;
  	}
  	return pci_dev_keep_suspended(to_pci_dev(dev));
  }