diffstat:
Documentation/s390/CommonIO | 46 ++----------------------------------
Documentation/s390/driver-model.txt | 10 +++----
2 files changed, 8 insertions(+), 48 deletions(-)
diff -urN linux-2.6/Documentation/s390/CommonIO linux-2.6-s390/Documentation/s390/CommonIO
--- linux-2.6/Documentation/s390/CommonIO Sat Aug 23 02:00:52 2003
+++ linux-2.6-s390/Documentation/s390/CommonIO Fri Aug 29 18:55:13 2003
@@ -45,25 +45,6 @@
/proc entries
-------------
-* /proc/subchannels
-
- This entry shows information on a per-subchannel basis.
-
- The data is ordered in the following way:
-
- - device number
- - subchannel number
- - device type/model (if applicable; if not, this is empty) and control unit
- type/model
- - whether the device is in use (i. e. a device driver has requested ownership
- and registered an interrupt handler)
- - path installed mask (PIM), as reflected by last store subchannel
- - path available mask (PAM), as reflected by last store subchannel
- - path operational mask (POM), as reflected by last store subchannel
- - the channel path IDs (CHPIDs)
-
- All fields are separated by spaces, the chpids are in blocks of four chpids.
-
* /proc/cio_ignore
Lists the ranges of device numbers which are ignored by common I/O.
@@ -116,27 +97,6 @@
/proc/s390dbf/cio_*/level a number between 0 and 6; see the documentation on
the S/390 debug feature (Documentation/s390/s390dbf.txt) for details.
-* /proc/irq_count
-
- This entry counts how many times s390_process_IRQ has been called for each
- CPU. This info is in /proc/interrupts on other architectures.
-
-* /proc/chpids
-
- This entry serves a dual purpose:
-
- - show which chpids are currently known to Linux and their status (online,
- logically offline),
-
- - toggling known chpids logically online/offline.
-
- To toggle a known chpid logically offline, do an
- echo off <chpid> > /proc/chpids
- <chpid> is interpreted as hex, even if you omit the '0x'.
- The chpid will be treated by Linux as if it were not online, which can mean
- some devices will become unavailable.
-
- You can toggle a logically offline chpid online again by
- echo on <chpid> > /proc/chpids
- If devices became unavailable by toggling the chpid logically offline, they
- will become available again after you toggle the chpid online again.
+* For some of the information present in the /proc filesystem in 2.4 (namely,
+ /proc/subchannels and /proc/chpids), see driver-model.txt.
+ Information formerly in /proc/irq_count is now in /proc/interrupts.
diff -urN linux-2.6/Documentation/s390/driver-model.txt linux-2.6-s390/Documentation/s390/driver-model.txt
--- linux-2.6/Documentation/s390/driver-model.txt Sat Aug 23 01:50:28 2003
+++ linux-2.6-s390/Documentation/s390/driver-model.txt Fri Aug 29 18:55:13 2003
@@ -14,15 +14,15 @@
- sys
- legacy
- css0/
- - 0:0000/0:0815/
- - 0:0001/0:4711/
- - 0:0002/
+ - 0.0.0000/0.0.0815/
+ - 0.0.0001/0.0.4711/
+ - 0.0.0002/
...
In this example, device 0815 is accessed via subchannel 0, device 4711 via
subchannel 1, and subchannel 2 is a non-I/O subchannel.
-You should address a ccw device via its bus id (e.g. 0:4711); the device can
+You should address a ccw device via its bus id (e.g. 0.0.4711); the device can
be found under bus/ccw/devices/.
All ccw devices export some data via sysfs additional to the standard 'name'
@@ -186,7 +186,7 @@
-----------------
Channel paths show up, like subchannels, under the channel subsystem root (css0)
-and are called 'chp<chpid>'. They have no driver and do not belong to any bus.
+and are called 'chp0.<chpid>'. They have no driver and do not belong to any bus.
status - Can be 'online', 'logically offline' or 'n/a'.
Piping 'on' or 'off' sets the chpid logically online/offline.