Commit 566e24ee authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 7b8731d9 d64e6906

drivers/powercap/intel_rapl_common.c

+3 −0
Original line number Diff line number Diff line
@@ -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),

include/linux/device.h

+1 −0
Original line number Diff line number Diff line
@@ -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

include/linux/powercap.h

+5 −6
Original line number Diff line number Diff line
@@ -45,18 +45,17 @@ struct powercap_control_type_ops { 


/**

 * struct powercap_control_type - Defines a powercap control_type

 * @name:		name of 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.

CRA Git | Maintained and supported by SUSTech CRA and CCSE