Skip to content

Commit 86ba54f

Browse files
committed
Merge branches 'pm-sleep', 'pm-domains', 'powercap' and 'pm-tools'
* pm-sleep: PM: sleep: spread "const char *" correctness PM: hibernate: fix white space in a few places freezer: Add unsafe version of freezable_schedule_timeout_interruptible() for NFS PM: sleep: core: Emit changed uevent on wakeup_sysfs_add/remove * pm-domains: PM: domains: Restore comment indentation for generic_pm_domain.child_links PM: domains: Fix up terminology with parent/child * powercap: powercap: Add Power Limit4 support powercap: idle_inject: Replace play_idle() with play_idle_precise() in comments powercap: intel_rapl: add support for Sapphire Rapids * pm-tools: pm-graph v5.7 - important s2idle fixes cpupower: Replace HTTP links with HTTPS ones cpupower: Fix NULL but dereferenced coccicheck errors cpupower: Fix comparing pointer to 0 coccicheck warns
5 parents c81b30c + 02d7f40 + afb0367 + 8365a89 + 68f9b22 commit 86ba54f

File tree

20 files changed

+411
-249
lines changed

20 files changed

+411
-249
lines changed

Documentation/power/powercap/powercap.rst

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -167,11 +167,13 @@ For example::
167167
package-0
168168
---------
169169

170-
The Intel RAPL technology allows two constraints, short term and long term,
171-
with two different time windows to be applied to each power zone. Thus for
172-
each zone there are 2 attributes representing the constraint names, 2 power
173-
limits and 2 attributes representing the sizes of the time windows. Such that,
174-
constraint_j_* attributes correspond to the jth constraint (j = 0,1).
170+
Depending on different power zones, the Intel RAPL technology allows
171+
one or multiple constraints like short term, long term and peak power,
172+
with different time windows to be applied to each power zone.
173+
All the zones contain attributes representing the constraint names,
174+
power limits and the sizes of the time windows. Note that time window
175+
is not applicable to peak power. Here, constraint_j_* attributes
176+
correspond to the jth constraint (j = 0,1,2).
175177

176178
For example::
177179

@@ -181,6 +183,9 @@ For example::
181183
constraint_1_name
182184
constraint_1_power_limit_uw
183185
constraint_1_time_window_us
186+
constraint_2_name
187+
constraint_2_power_limit_uw
188+
constraint_2_time_window_us
184189

185190
Power Zone Attributes
186191
=====================

0 commit comments

Comments
 (0)