summaryrefslogtreecommitdiffstats
path: root/kernel/power
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2022-05-23 19:18:51 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2022-05-23 19:18:51 +0200
commit16a23f394dd926c35d44ae420a76ac12c9203f96 (patch)
tree80eeef7f1bf74014bad1a8e600d3b20539067208 /kernel/power
parent95f2ce548a2d0ad7add02394814136f52ba14b06 (diff)
parentc9d8923bfbcb63f15ea6cb2b5c8426fc3d96f643 (diff)
parenta6653fb584b5f6ac60ddd5d86ddd49a1f3945a04 (diff)
downloadlinux-16a23f394dd926c35d44ae420a76ac12c9203f96.tar.gz
linux-16a23f394dd926c35d44ae420a76ac12c9203f96.tar.bz2
linux-16a23f394dd926c35d44ae420a76ac12c9203f96.zip
Merge branches 'pm-em' and 'pm-cpuidle'
Marge Energy Model support updates and cpuidle updates for 5.19-rc1: - Update the Energy Model support code to allow the Energy Model to be artificial, which means that the power values may not be on a uniform scale with other devices providing power information, and update the cpufreq_cooling and devfreq_cooling thermal drivers to support artificial Energy Models (Lukasz Luba). - Make DTPM check the Energy Model type (Lukasz Luba). - Fix policy counter decrementation in cpufreq if Energy Model is in use (Pierre Gondois). - Add AlderLake processor support to the intel_idle driver (Zhang Rui). - Fix regression leading to no genpd governor in the PSCI cpuidle driver and fix the riscv-sbi cpuidle driver to allow a genpd governor to be used (Ulf Hansson). * pm-em: PM: EM: Decrement policy counter powercap: DTPM: Check for Energy Model type thermal: cooling: Check Energy Model type in cpufreq_cooling and devfreq_cooling Documentation: EM: Add artificial EM registration description PM: EM: Remove old debugfs files and print all 'flags' PM: EM: Change the order of arguments in the .active_power() callback PM: EM: Use the new .get_cost() callback while registering EM PM: EM: Add artificial EM flag PM: EM: Add .get_cost() callback * pm-cpuidle: cpuidle: riscv-sbi: Fix code to allow a genpd governor to be used cpuidle: psci: Fix regression leading to no genpd governor intel_idle: Add AlderLake support