Merge tag 'pm-6.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

[linux-block.git] / Documentation / admin-guide / kernel-parameters.txt

diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index 10e2e5c3ff0bb23c3b6b1ce9f59e41d7aac0ca17..bbecbd5797a33e9aab2a318f61e15767a365289a 100644 (file)
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -339,6 +339,29 @@
                                     This mode requires kvm-amd.avic=1.
                                     (Default when IOMMU HW support is present.)
 
+       amd_pstate=     [X86]
+                       disable
+                         Do not enable amd_pstate as the default
+                         scaling driver for the supported processors
+                       passive
+                         Use amd_pstate with passive mode as a scaling driver.
+                         In this mode autonomous selection is disabled.
+                         Driver requests a desired performance level and platform
+                         tries to match the same performance level if it is
+                         satisfied by guaranteed performance level.
+                       active
+                         Use amd_pstate_epp driver instance as the scaling driver,
+                         driver provides a hint to the hardware if software wants
+                         to bias toward performance (0x0) or energy efficiency (0xff)
+                         to the CPPC firmware. then CPPC power algorithm will
+                         calculate the runtime workload and adjust the realtime cores
+                         frequency.
+                       guided
+                         Activate guided autonomous mode. Driver requests minimum and
+                         maximum performance level and the platform autonomously
+                         selects a performance level in this range and appropriate
+                         to the current workload.
+
        amijoy.map=     [HW,JOY] Amiga joystick support
                        Map of devices attached to JOY0DAT and JOY1DAT
                        Format: <a>,<b>
@@ -7062,20 +7085,3 @@
                                xmon commands.
                        off     xmon is disabled.
 
-       amd_pstate=     [X86]
-                       disable
-                         Do not enable amd_pstate as the default
-                         scaling driver for the supported processors
-                       passive
-                         Use amd_pstate as a scaling driver, driver requests a
-                         desired performance on this abstract scale and the power
-                         management firmware translates the requests into actual
-                         hardware states (core frequency, data fabric and memory
-                         clocks etc.)
-                       active
-                         Use amd_pstate_epp driver instance as the scaling driver,
-                         driver provides a hint to the hardware if software wants
-                         to bias toward performance (0x0) or energy efficiency (0xff)
-                         to the CPPC firmware. then CPPC power algorithm will
-                         calculate the runtime workload and adjust the realtime cores
-                         frequency.