github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-01 02:53:36 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Power management updates for 5.9-rc5

Browse Source 
- 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).
 -----BEGIN PGP SIGNATURE-----
 
 iQJGBAABCAAwFiEE4fcc61cGeeHD/fCwgsRv/nhiVHEFAl9bkdwSHHJqd0Byand5
 c29ja2kubmV0AAoJEILEb/54YlRxmOsP/1DGVAwLMOSbJ3MuDM2BE7c73/SWS0un
 +Im9CmyMD08KS72lFsQgnR7meToaip6cJQNDO6HeODjC3ufStzIwwN2ujSlItEWu
 07B6d6BETCX8Ktm1hlYU6i8jX+N0W3jyoH2Ytb0PwjyTj4x+GXjOxwkA4OyS7j+j
 pfBLZvWvULyMI+QEFEPNsPIVvIvh7D2m5MAAml0Bp1tMewbyRw9/PHt0fK3qRVh+
 hdodv9UjU6eB3bYVT69oNf/p9DuhmmYKmXqoIo/nRGbYemT81j8/iqRD550FcpAs
 beSrelPNVxJ40sFxSW6mFKzn4WZh1J++qd/ssMs/+F8cClHqFX8R2XgNVIh5ZDHz
 AyTb9/7ln272+xVF1rDkfik1K+j7LbHEmTHnwkMhPpVY94Ka0n8yyIHG20vI/lxz
 gNL+cFYuZOHmJ5YKHt5RRnRYSA7/jmgL60SHFlnvfqGZqbmz4CzUtD+py/u7ChRe
 1u1LudQ2GhlRFBL+NYI2gOInauw9tux0zEeiTpDWwL05fhIkhoqTu9GdTt6hu2PT
 xcLdejchicGlShhZG7UK1/0rnWzFEEPfWyiru+ACrHIFz3+W+Ed+6ftzXlPORkq4
 amrPUYVcr8+sMmW5Gxl517fpuV+NwqFG9mzLsrXGNexFXrkdDNCn6o0Fe7oyO52P
 cC766l+vFzKP
 =8iut
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2020-09-11 11:59:14 -07:00
commit 566e24eeb4
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/powercap/intel_rapl_common.c
View File

@ -1035,6 +1035,9 @@ static const struct x86_cpu_id rapl_ids[] __initconst = {
X86_MATCH_INTEL_FAM6_MODEL(COMETLAKE_L, &rapl_defaults_core),
X86_MATCH_INTEL_FAM6_MODEL(COMETLAKE, &rapl_defaults_core),
X86_MATCH_INTEL_FAM6_MODEL(TIGERLAKE_L, &rapl_defaults_core),
X86_MATCH_INTEL_FAM6_MODEL(TIGERLAKE, &rapl_defaults_core),
X86_MATCH_INTEL_FAM6_MODEL(ROCKETLAKE, &rapl_defaults_core),
X86_MATCH_INTEL_FAM6_MODEL(ALDERLAKE, &rapl_defaults_core),
X86_MATCH_INTEL_FAM6_MODEL(SAPPHIRERAPIDS_X, &rapl_defaults_spr_server),
X86_MATCH_INTEL_FAM6_MODEL(ATOM_SILVERMONT, &rapl_defaults_byt),

1
include/linux/device.h
View File

@ -454,6 +454,7 @@ struct dev_links_info {
* @pm_domain: Provide callbacks that are executed during system suspend,
* hibernation, system resume and during runtime PM transitions
* along with subsystem-level and driver-level callbacks.
* @em_pd: device's energy model performance domain
* @pins: For device pin management.
* See Documentation/driver-api/pinctl.rst for details.
* @msi_list: Hosts MSI descriptors

11
include/linux/powercap.h
View File

@ -44,19 +44,18 @@ struct powercap_control_type_ops {
};
/**
* struct powercap_control_type- Defines a powercap control_type
* @name: name of control_type
* struct powercap_control_type - Defines a powercap control_type
* @dev: device for this control_type
* @idr: idr to have unique id for its child
* @root_node: Root holding power zones for this control_type
* @nr_zones: counter for number of zones of this type
* @ops: Pointer to callback struct
* @node_lock: mutex for control type
* @lock: mutex for control type
* @allocated: This is possible that client owns the memory
* used by this structure. In this case
* this flag is set to false by framework to
* prevent deallocation during release process.
* Otherwise this flag is set to true.
* @ctrl_inst: link to the control_type list
* @node: linked-list node
*
* Defines powercap control_type. This acts as a container for power
* zones, which use same method to control power. E.g. RAPL, RAPL-PCI etc.
@ -129,7 +128,7 @@ struct powercap_zone_ops {
* this flag is set to false by framework to
* prevent deallocation during release process.
* Otherwise this flag is set to true.
* @constraint_ptr: List of constraints for this zone.
* @constraints: List of constraints for this zone.
*
* This defines a power zone instance. The fields of this structure are
* private, and should not be used by client drivers.