2 files changed, 69 insertions, 0 deletions

diff --git a/Documentation/ABI/testing/sysfs-block b/Documentation/ABI/testing/sysfs-block
index 4bd9ea539129..44f52a4f5903 100644
--- a/Documentation/ABI/testing/sysfs-block
+++ b/Documentation/ABI/testing/sysfs-block
@@ -26,3 +26,37 @@ Description:
                 I/O statistics of partition <part>. The format is the
                 same as the above-written /sys/block/<disk>/stat
                 format.
+
+
+What:           /sys/block/<disk>/integrity/format
+Date:           June 2008
+Contact:        Martin K. Petersen <martin.petersen@oracle.com>
+Description:
+                Metadata format for integrity capable block device.
+                E.g. T10-DIF-TYPE1-CRC.
+
+
+What:           /sys/block/<disk>/integrity/read_verify
+Date:           June 2008
+Contact:        Martin K. Petersen <martin.petersen@oracle.com>
+Description:
+                Indicates whether the block layer should verify the
+                integrity of read requests serviced by devices that
+                support sending integrity metadata.
+
+
+What:           /sys/block/<disk>/integrity/tag_size
+Date:           June 2008
+Contact:        Martin K. Petersen <martin.petersen@oracle.com>
+Description:
+                Number of bytes of integrity tag space available per
+                512 bytes of data.
+
+
+What:           /sys/block/<disk>/integrity/write_generate
+Date:           June 2008
+Contact:        Martin K. Petersen <martin.petersen@oracle.com>
+Description:
+                Indicates whether the block layer should automatically
+                generate checksums for write requests bound for
+                devices that support receiving integrity metadata.
diff --git a/Documentation/ABI/testing/sysfs-bus-css b/Documentation/ABI/testing/sysfs-bus-css
new file mode 100644
index 000000000000..b585ec258a08
--- /dev/null
+++ b/Documentation/ABI/testing/sysfs-bus-css
@@ -0,0 +1,35 @@
+What:           /sys/bus/css/devices/.../type
+Date:           March 2008
+Contact:        Cornelia Huck <cornelia.huck@de.ibm.com>
+                linux-s390@vger.kernel.org
+Description:    Contains the subchannel type, as reported by the hardware.
+                This attribute is present for all subchannel types.
+
+What:           /sys/bus/css/devices/.../modalias
+Date:           March 2008
+Contact:        Cornelia Huck <cornelia.huck@de.ibm.com>
+                linux-s390@vger.kernel.org
+Description:    Contains the module alias as reported with uevents.
+                It is of the format css:t<type> and present for all
+                subchannel types.
+
+What:           /sys/bus/css/drivers/io_subchannel/.../chpids
+Date:           December 2002
+Contact:        Cornelia Huck <cornelia.huck@de.ibm.com>
+                linux-s390@vger.kernel.org
+Description:    Contains the ids of the channel paths used by this
+                subchannel, as reported by the channel subsystem
+                during subchannel recognition.
+                Note: This is an I/O-subchannel specific attribute.
+Users:          s390-tools, HAL
+
+What:           /sys/bus/css/drivers/io_subchannel/.../pimpampom
+Date:           December 2002
+Contact:        Cornelia Huck <cornelia.huck@de.ibm.com>
+                linux-s390@vger.kernel.org
+Description:    Contains the PIM/PAM/POM values, as reported by the
+                channel subsystem when last queried by the common I/O
+                layer (this implies that this attribute is not neccessarily
+                in sync with the values current in the channel subsystem).
+                Note: This is an I/O-subchannel specific attribute.
+Users:          s390-tools, HAL