diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2026-02-18 19:48:30 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2026-02-18 19:48:30 +0100 |
| commit | becbdde56a5c0e40c9bbbb6b8d5ffbb8de635d63 (patch) | |
| tree | 05cbcf3959981935d2e347643e7aebcb28ec93d9 /rust/alloc/collections/git@git.tavy.me:linux.git | |
| parent | bd9635c4d6728a9f58f6545f1c8a0a5335aeaa30 (diff) | |
| parent | c7d54dafa042cf379859dba265fe5afef6fa8770 (diff) | |
| parent | 93983a9f3beea791c21d77c2425488ad327d4fda (diff) | |
Merge branches 'pm-powercap' and 'pm-cpuidle'
Merge additional power capping and cpuidle updates for 7.0-rc1:
- Fix the handling of package-scope MSRs in the intel_rapl power
capping driver when called from the PMU subsystem and make it add all
package CPUs to the PMU cpumask to allow tools to read RAPL events
from any CPU in the package (Kuppuswamy Sathyanarayanan)
- Rework the invalid version check in the intel_rapl_tpmi power capping
driver to account for the fact that on partitioned systems, multiple
TPMI instances may exist per package, but RAPL registers are only
valid on one instance (Kuppuswamy Satharayananyan)
- Describe the new intel_idle.table command line option in the
admin-guide intel_idle documentation (Artem Bityutskiy)
- Fix a crash in the ladder cpuidle governor on systems with only one
(polling) idle state available by making the cpuidle core bypass the
governor in those cases and adjust the other existing governors to
that change (Aboorva Devarajan, Christian Loehle)
* pm-powercap:
powercap: intel_rapl_tpmi: Remove FW_BUG from invalid version check
powercap: intel_rapl: Expose all package CPUs in PMU cpumask
powercap: intel_rapl: Remove incorrect CPU check in PMU context
* pm-cpuidle:
cpuidle: menu: Remove single state handling
cpuidle: teo: Remove single state handling
cpuidle: haltpoll: Remove single state handling
cpuidle: Skip governor when only one idle state is available
Documentation: PM: Document intel_idle.table command line option
