History

Merge branch 'powercap'

* powercap: powercap: make documentation reflect code powercap/intel_rapl: add support for AlderLake powercap/intel_rapl: add support for RocketLake powercap/intel_rapl: add support for TigerLake Desktop

Rafael J. Wysocki committed 6 years ago

Commit d64e6902 parents 95035ea cc88b782 files · +8 −6Browse files

Unified · Split

2 files
  1. drivers/powercap/intel_rapl_common.c +3 −0
  2. include/linux/powercap.h +5 −6
drivers/powercap/intel_rapl_common.c+3−0
@@ -1035,6 +1035,9 @@ static const struct x86_cpu_id rapl_ids[] __initconst = { · 1034 unmodified lines
1035 X86_MATCH_INTEL_FAM6_MODEL(COMETLAKE_L, &rapl_defaults_core),1035 X86_MATCH_INTEL_FAM6_MODEL(COMETLAKE_L, &rapl_defaults_core),
1036 X86_MATCH_INTEL_FAM6_MODEL(COMETLAKE, &rapl_defaults_core),1036 X86_MATCH_INTEL_FAM6_MODEL(COMETLAKE, &rapl_defaults_core),
1037 X86_MATCH_INTEL_FAM6_MODEL(TIGERLAKE_L, &rapl_defaults_core),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 X86_MATCH_INTEL_FAM6_MODEL(SAPPHIRERAPIDS_X, &rapl_defaults_spr_server),1041 X86_MATCH_INTEL_FAM6_MODEL(SAPPHIRERAPIDS_X, &rapl_defaults_spr_server),
1039 1042
1040 X86_MATCH_INTEL_FAM6_MODEL(ATOM_SILVERMONT, &rapl_defaults_byt),1043 X86_MATCH_INTEL_FAM6_MODEL(ATOM_SILVERMONT, &rapl_defaults_byt),
include/linux/powercap.h+5−6
@@ -44,19 +44,18 @@ struct powercap_control_type_ops { · 43 unmodified lines
44};44};
45 45
46/**46/**
47 * struct powercap_control_type- Defines a powercap control_type47 * struct powercap_control_type - Defines a powercap control_type
48 * @name: name of control_type
49 * @dev: device for this control_type48 * @dev: device for this control_type
50 * @idr: idr to have unique id for its child49 * @idr: idr to have unique id for its child
51 * @root_node: Root holding power zones for this control_type50 * @nr_zones: counter for number of zones of this type
52 * @ops: Pointer to callback struct51 * @ops: Pointer to callback struct
53 * @node_lock: mutex for control type52 * @lock: mutex for control type
54 * @allocated: This is possible that client owns the memory53 * @allocated: This is possible that client owns the memory
55 * used by this structure. In this case54 * used by this structure. In this case
56 * this flag is set to false by framework to55 * this flag is set to false by framework to
57 * prevent deallocation during release process.56 * prevent deallocation during release process.
58 * Otherwise this flag is set to true.57 * Otherwise this flag is set to true.
59 * @ctrl_inst: link to the control_type list58 * @node: linked-list node
60 *59 *
61 * Defines powercap control_type. This acts as a container for power60 * Defines powercap control_type. This acts as a container for power
62 * zones, which use same method to control power. E.g. RAPL, RAPL-PCI etc.61 * zones, which use same method to control power. E.g. RAPL, RAPL-PCI etc.
@@ -129,7 +128,7 @@ struct powercap_zone_ops { · 66 unmodified lines
129 * this flag is set to false by framework to128 * this flag is set to false by framework to
130 * prevent deallocation during release process.129 * prevent deallocation during release process.
131 * Otherwise this flag is set to true.130 * Otherwise this flag is set to true.
132 * @constraint_ptr: List of constraints for this zone.131 * @constraints: List of constraints for this zone.
133 *132 *
134 * This defines a power zone instance. The fields of this structure are133 * This defines a power zone instance. The fields of this structure are
135 * private, and should not be used by client drivers.134 * private, and should not be used by client drivers.