diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2024-09-11 19:50:02 +0300 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2024-09-11 19:50:02 +0300 |
commit | 52f1192887f825bd29c1e72303d9e62f8382ba20 (patch) | |
tree | 58325ac6226934598b762eb492fb00abcd33b0d6 | |
parent | 415dff1c96cc553b52e13685495fef5d66c875f7 (diff) | |
parent | 6baacf9391c03f91a7644b3f94634b7d4b2c5e34 (diff) | |
parent | 6b08b4ee5e60d8789aeb87250f718ef14bebb90e (diff) | |
download | linux-52f1192887f825bd29c1e72303d9e62f8382ba20.tar.xz |
Merge branches 'pm-cpuidle' and 'pm-powercap'
Merge cpuidle updates and power capping updates for 6.12-rc1:
- Add Granite Rapids Xeon support to intel_idle (Artem Bityutskiy).
- Disable promotion to C1E on Jasper Lake and Elkhart Lake in
intel_idle (Kai-Heng Feng).
- Use scoped device node handling to fix missing of_node_put() and
simplify walking OF children in the riscv-sbi cpuidle driver (Krzysztof
Kozlowski).
- Remove dead code from cpuidle_enter_state() (Dhruva Gole).
- Change an error pointer to NULL to fix error handling in the
intel_rapl power capping driver (Dan Carpenter).
- Fix off by one in get_rpi() in the intel_rapl power capping
driver (Dan Carpenter).
- Add support for ArrowLake-U to the intel_rapl power capping
driver (Sumeet Pawnikar).
- Fix the energy-pkg event for AMD CPUs in the intel_rapl power capping
driver (Dhananjay Ugwekar).
- Add support for AMD family 1Ah processors to the intel_rapl power
capping driver (Dhananjay Ugwekar).
* pm-cpuidle:
cpuidle: remove dead code from cpuidle_enter_state()
cpuidle: riscv-sbi: Simplify with scoped for each OF child loop
cpuidle: riscv-sbi: Use scoped device node handling to fix missing of_node_put
intel_idle: Disable promotion to C1E on Jasper Lake and Elkhart Lake
intel_idle: add Granite Rapids Xeon support
* pm-powercap:
powercap: intel_rapl: Change an error pointer to NULL
powercap: intel_rapl: Fix off by one in get_rpi()
powercap: intel_rapl: Add support for ArrowLake-U platform
powercap/intel_rapl: Fix the energy-pkg event for AMD CPUs
powercap/intel_rapl: Add support for AMD family 1Ah