summaryrefslogtreecommitdiffstats
path: root/Documentation/ABI
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-09-16 16:51:27 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-09-16 16:51:27 -0700
commit8f949b9a7e0bac3a9c3c29dc27c476a87e21db3e (patch)
tree88cd7852d59ebae54fcc2f57019ea13284042962 /Documentation/ABI
parent6f586e663e3b3674cadad0d5329424b006a0a289 (diff)
parent5698bd757d55b1bb87edd1a9744ab09c142abfc2 (diff)
downloadlinux-8f949b9a7e0bac3a9c3c29dc27c476a87e21db3e.tar.gz
linux-8f949b9a7e0bac3a9c3c29dc27c476a87e21db3e.tar.bz2
linux-8f949b9a7e0bac3a9c3c29dc27c476a87e21db3e.zip
Merge 3.6-rc7 into driver-core-next
This pulls in the fixes in that branch that are needed here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'Documentation/ABI')
-rw-r--r--Documentation/ABI/testing/sysfs-bus-pci12
1 files changed, 12 insertions, 0 deletions
diff --git a/Documentation/ABI/testing/sysfs-bus-pci b/Documentation/ABI/testing/sysfs-bus-pci
index 34f51100f029..dff1f48d252d 100644
--- a/Documentation/ABI/testing/sysfs-bus-pci
+++ b/Documentation/ABI/testing/sysfs-bus-pci
@@ -210,3 +210,15 @@ Users:
firmware assigned instance number of the PCI
device that can help in understanding the firmware
intended order of the PCI device.
+
+What: /sys/bus/pci/devices/.../d3cold_allowed
+Date: July 2012
+Contact: Huang Ying <ying.huang@intel.com>
+Description:
+ d3cold_allowed is bit to control whether the corresponding PCI
+ device can be put into D3Cold state. If it is cleared, the
+ device will never be put into D3Cold state. If it is set, the
+ device may be put into D3Cold state if other requirements are
+ satisfied too. Reading this attribute will show the current
+ value of d3cold_allowed bit. Writing this attribute will set
+ the value of d3cold_allowed bit.