2 files changed, 29 insertions, 1 deletions

diff --git a/Documentation/ABI/testing/sysfs-power b/Documentation/ABI/testing/sysfs-power
index d882f8093871..dcff4d0623ad 100644
--- a/Documentation/ABI/testing/sysfs-power
+++ b/Documentation/ABI/testing/sysfs-power
@@ -21,7 +21,7 @@ Description:
                 these states.
 
 What:           /sys/power/disk
-Date:           August 2006
+Date:           September 2006
 Contact:        Rafael J. Wysocki <rjw@sisk.pl>
 Description:
                 The /sys/power/disk file controls the operating mode of the
@@ -39,6 +39,19 @@ Description:
                 'reboot' - the memory image will be saved by the kernel and
                 the system will be rebooted.
 
+                Additionally, /sys/power/disk can be used to turn on one of the
+                two testing modes of the suspend-to-disk mechanism: 'testproc'
+                or 'test'.  If the suspend-to-disk mechanism is in the
+                'testproc' mode, writing 'disk' to /sys/power/state will cause
+                the kernel to disable nonboot CPUs and freeze tasks, wait for 5
+                seconds, unfreeze tasks and enable nonboot CPUs.  If it is in
+                the 'test' mode, writing 'disk' to /sys/power/state will cause
+                the kernel to disable nonboot CPUs and freeze tasks, shrink
+                memory, suspend devices, wait for 5 seconds, resume devices,
+                unfreeze tasks and enable nonboot CPUs.  Then, we are able to
+                look in the log messages and work out, for example, which code
+                is being slow and which device drivers are misbehaving.
+
                 The suspend-to-disk method may be chosen by writing to this
                 file one of the accepted strings:
 
@@ -46,6 +59,8 @@ Description:
                 'platform'
                 'shutdown'
                 'reboot'
+                'testproc'
+                'test'
 
                 It will only change to 'firmware' or 'platform' if the system
                 supports that.
diff --git a/Documentation/power/interface.txt b/Documentation/power/interface.txt
index a66bec222b16..74311d7e0f3c 100644
--- a/Documentation/power/interface.txt
+++ b/Documentation/power/interface.txt
@@ -30,6 +30,17 @@ testing). The system will support either 'firmware' or 'platform', and
 that is known a priori. But, the user may choose 'shutdown' or
 'reboot' as alternatives. 
 
+Additionally, /sys/power/disk can be used to turn on one of the two testing
+modes of the suspend-to-disk mechanism: 'testproc' or 'test'.  If the
+suspend-to-disk mechanism is in the 'testproc' mode, writing 'disk' to
+/sys/power/state will cause the kernel to disable nonboot CPUs and freeze
+tasks, wait for 5 seconds, unfreeze tasks and enable nonboot CPUs.  If it is
+in the 'test' mode, writing 'disk' to /sys/power/state will cause the kernel
+to disable nonboot CPUs and freeze tasks, shrink memory, suspend devices, wait
+for 5 seconds, resume devices, unfreeze tasks and enable nonboot CPUs.  Then,
+we are able to look in the log messages and work out, for example, which code
+is being slow and which device drivers are misbehaving.
+
 Reading from this file will display what the mode is currently set
 to. Writing to this file will accept one of
 
@@ -37,6 +48,8 @@ to. Writing to this file will accept one of
        'platform'
        'shutdown'
        'reboot'
+       'testproc'
+       'test'
 
 It will only change to 'firmware' or 'platform' if the system supports
 it.