tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'pm-5.9-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

Pull power management fixes from Rafael Wysocki:
"These fix three pieces of documentation and add new CPU IDs to the
Intel RAPL power capping driver.

Specifics:

- Add CPU IDs of the TigerLake Desktop, RocketLake and AlderLake
chips to the Intel RAPL power capping driver (Zhang Rui).

- Add the missing energy model performance domain item to the struct
device kerneldoc comment (Randy Dunlap).

- Fix the struct powercap_control_type kerneldoc comment to match the
actual definition of that structure and add missing item to the
struct powercap_zone_ops kerneldoc comment (Amit Kucheria)"

* tag 'pm-5.9-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
powercap: make documentation reflect code
PM: <linux/device.h>: fix @em_pd kernel-doc warning
powercap/intel_rapl: add support for AlderLake
powercap/intel_rapl: add support for RocketLake
powercap/intel_rapl: add support for TigerLake Desktop

Linus Torvalds 566e24ee 7b8731d9

+9 -6
+3
drivers/powercap/intel_rapl_common.c
··· 1035 1035 X86_MATCH_INTEL_FAM6_MODEL(COMETLAKE_L, &rapl_defaults_core), 1036 1036 X86_MATCH_INTEL_FAM6_MODEL(COMETLAKE, &rapl_defaults_core), 1037 1037 X86_MATCH_INTEL_FAM6_MODEL(TIGERLAKE_L, &rapl_defaults_core), 1038 + X86_MATCH_INTEL_FAM6_MODEL(TIGERLAKE, &rapl_defaults_core), 1039 + X86_MATCH_INTEL_FAM6_MODEL(ROCKETLAKE, &rapl_defaults_core), 1040 + X86_MATCH_INTEL_FAM6_MODEL(ALDERLAKE, &rapl_defaults_core), 1038 1041 X86_MATCH_INTEL_FAM6_MODEL(SAPPHIRERAPIDS_X, &rapl_defaults_spr_server), 1039 1042 1040 1043 X86_MATCH_INTEL_FAM6_MODEL(ATOM_SILVERMONT, &rapl_defaults_byt),
+1
include/linux/device.h
··· 454 454 * @pm_domain: Provide callbacks that are executed during system suspend, 455 455 * hibernation, system resume and during runtime PM transitions 456 456 * along with subsystem-level and driver-level callbacks. 457 + * @em_pd: device's energy model performance domain 457 458 * @pins: For device pin management. 458 459 * See Documentation/driver-api/pinctl.rst for details. 459 460 * @msi_list: Hosts MSI descriptors
+5 -6
include/linux/powercap.h
··· 44 44 }; 45 45 46 46 /** 47 - * struct powercap_control_type- Defines a powercap control_type 48 - * @name: name of control_type 47 + * struct powercap_control_type - Defines a powercap control_type 49 48 * @dev: device for this control_type 50 49 * @idr: idr to have unique id for its child 51 - * @root_node: Root holding power zones for this control_type 50 + * @nr_zones: counter for number of zones of this type 52 51 * @ops: Pointer to callback struct 53 - * @node_lock: mutex for control type 52 + * @lock: mutex for control type 54 53 * @allocated: This is possible that client owns the memory 55 54 * used by this structure. In this case 56 55 * this flag is set to false by framework to 57 56 * prevent deallocation during release process. 58 57 * Otherwise this flag is set to true. 59 - * @ctrl_inst: link to the control_type list 58 + * @node: linked-list node 60 59 * 61 60 * Defines powercap control_type. This acts as a container for power 62 61 * zones, which use same method to control power. E.g. RAPL, RAPL-PCI etc. ··· 128 129 * this flag is set to false by framework to 129 130 * prevent deallocation during release process. 130 131 * Otherwise this flag is set to true. 131 - * @constraint_ptr: List of constraints for this zone. 132 + * @constraints: List of constraints for this zone. 132 133 * 133 134 * This defines a power zone instance. The fields of this structure are 134 135 * private, and should not be used by client drivers.