Merge branch 'powercap' (d64e6906) · Commits · 戴 / test

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),

+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.