diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2022-07-29 19:33:13 +0200 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2022-07-29 19:33:13 +0200 |
commit | 954a83fc60c805f138db26747645710f243a9939 (patch) | |
tree | a39fb903910be91d2b02b353155ddbfe56fbb6ff /kernel/power | |
parent | 82b6c2e7df79eb01ef561f8bf7a881f7db466c7a (diff) | |
parent | c46a0d5ae4f93800d2d90f3a3290e58a2f4b6bdf (diff) | |
parent | 8386c414e27caba8501119948e9551e52b527f59 (diff) | |
parent | b08b95cf30f53b674bdef510d4cfd0623199b036 (diff) | |
parent | 37101d3c719386040ded735a5ec06974f1d94d1f (diff) | |
parent | f3ac888fc5fbdeeec1e084327de06a2765542d56 (diff) |
Merge branches 'pm-core', 'pm-sleep', 'powercap', 'pm-domains' and 'pm-em'
Merge core device power management changes for v5.20-rc1:
- Extend support for wakeirq to callback wrappers used during system
suspend and resume (Ulf Hansson).
- Defer waiting for device probe before loading a hibernation image
till the first actual device access to avoid possible deadlocks
reported by syzbot (Tetsuo Handa).
- Unify device_init_wakeup() for PM_SLEEP and !PM_SLEEP (Bjorn
Helgaas).
- Add Raptor Lake-P to the list of processors supported by the Intel
RAPL driver (George D Sworo).
- Add Alder Lake-N and Raptor Lake-P to the list of processors for
which Power Limit4 is supported in the Intel RAPL driver (Sumeet
Pawnikar).
- Make pm_genpd_remove() check genpd_debugfs_dir against NULL before
attempting to remove it (Hsin-Yi Wang).
- Change the Energy Model code to represent power in micro-Watts and
adjust its users accordingly (Lukasz Luba).
* pm-core:
PM: runtime: Extend support for wakeirq for force_suspend|resume
* pm-sleep:
PM: hibernate: defer device probing when resuming from hibernation
PM: wakeup: Unify device_init_wakeup() for PM_SLEEP and !PM_SLEEP
* powercap:
powercap: RAPL: Add Power Limit4 support for Alder Lake-N and Raptor Lake-P
powercap: intel_rapl: Add support for RAPTORLAKE_P
* pm-domains:
PM: domains: Ensure genpd_debugfs_dir exists before remove
* pm-em:
cpufreq: scmi: Support the power scale in micro-Watts in SCMI v3.1
firmware: arm_scmi: Get detailed power scale from perf
Documentation: EM: Switch to micro-Watts scale
PM: EM: convert power field to micro-Watts precision and align drivers