From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Tue, 22 Jul 2025 16:01:15 +0000 (+0200)
Subject: Merge branches 'pm-runtime' and 'pm-powercap'
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3b4d4c98e5bb74ba193179ac36af780b28e47d29;p=thirdparty%2Flinux.git

Merge branches 'pm-runtime' and 'pm-powercap'

Merge runtime PM updates and power capping updates for 6.17-rc1:

 - Document return values of suspend-related API functions in the
   runtime PM framework (Sakari Ailus)

 - Mark last busy stamp in multiple autosuspend-related functions in the
   runtime PM framework and update its documentation (Sakari Ailus)

 - Take active children into account in pm_runtime_get_if_in_use() for
   consistency (Rafael Wysocki)

 - Fix NULL pointer dereference in get_pd_power_uw() in the dtpm_cpu
   power capping driver (Sivan Zohar-Kotzer)

 - Add support for the Bartlett Lake platform to the Intel RAPL power
   capping driver (Qiao Wei)

 - Add PL4 support for Panther Lake to the intel_rapl_msr power capping
   driver (Zhang Rui)

* pm-runtime:
  PM: runtime: Take active children into account in pm_runtime_get_if_in_use()
  Documentation: PM: *_autosuspend() functions update last busy time
  PM: runtime: Mark last busy stamp in pm_request_autosuspend()
  PM: runtime: Mark last busy stamp in pm_runtime_autosuspend()
  PM: runtime: Mark last busy stamp in pm_runtime_put_sync_autosuspend()
  PM: runtime: Mark last busy stamp in pm_runtime_put_autosuspend()
  PM: runtime: Document return values of suspend-related API functions

* pm-powercap:
  powercap: dtpm_cpu: Fix NULL pointer dereference in get_pd_power_uw()
  powercap: intel_rapl: Add support for Bartlett Lake platform
  powercap: intel_rapl_msr: Add PL4 support for Panther Lake
---

3b4d4c98e5bb74ba193179ac36af780b28e47d29
diff --cc drivers/base/power/runtime.c
index 05ff3d2209e6d,2ba0dfd1de5a4,c55a7c70bc1a8..f835b85bd4d96
--- a/drivers/base/power/runtime.c
+++ b/drivers/base/power/runtime.c
@@@@ -2039,20 -2022,13 -2013,13 +2048,20 @@@@ EXPORT_SYMBOL_GPL(pm_runtime_force_susp
    * pm_runtime_force_resume - Force a device into resume state if needed.
    * @dev: Device to resume.
    *
 -- * Prior invoking this function we expect the user to have brought the device
 -- * into low power state by a call to pm_runtime_force_suspend(). Here we reverse
 -- * those actions and bring the device into full power, if it is expected to be
 -- * used on system resume.  In the other case, we defer the resume to be managed
 -- * via runtime PM.
 ++ * This function expects that either pm_runtime_force_suspend() has put the
 ++ * device into a low-power state prior to calling it, or the device had been
 ++ * runtime-suspended before the preceding system-wide suspend transition and it
 ++ * was left in suspend during that transition.
 +  *
  - * Typically this function may be invoked from a system resume callback.
 ++ * The actions carried out by pm_runtime_force_suspend(), or by a runtime
 ++ * suspend in general, are reversed and the device is brought back into full
 ++ * power if it is expected to be used on system resume, which is the case when
 ++ * its needs_force_resume flag is set or when its smart_suspend flag is set and
 ++ * its runtime PM status is "active".
  + *
 -  * Typically this function may be invoked from a system resume callback.
 ++ * In other cases, the resume is deferred to be managed via runtime PM.
 ++ *
 ++ * Typically, this function may be invoked from a system resume callback.
    */
   int pm_runtime_force_resume(struct device *dev)
   {