diff options
author | Greg KH <greg@press.(none)> | 2005-06-28 01:07:56 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-06-28 01:07:56 -0400 |
commit | 8644d2a42bdba2d513f71c07eaf1b6f9b718b8eb (patch) | |
tree | c43b6c2fdf1b68b66906a2de69446dcec0f9af6b /Documentation | |
parent | 1cde8a16815bd85c8137d1ea556398983c597c11 (diff) | |
parent | 99f95e5286df2f69edab8a04c7080d986ee4233b (diff) |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/Changes | 24 | ||||
-rw-r--r-- | Documentation/block/ioprio.txt | 176 | ||||
-rw-r--r-- | Documentation/cciss.txt | 1 | ||||
-rw-r--r-- | Documentation/kernel-parameters.txt | 2 | ||||
-rw-r--r-- | Documentation/pcmcia/devicetable.txt | 64 | ||||
-rw-r--r-- | Documentation/pcmcia/driver-changes.txt | 51 |
6 files changed, 311 insertions, 7 deletions
diff --git a/Documentation/Changes b/Documentation/Changes index b37600754762..afebdbcd553a 100644 --- a/Documentation/Changes +++ b/Documentation/Changes | |||
@@ -44,9 +44,9 @@ running, the suggested command should tell you. | |||
44 | 44 | ||
45 | Again, keep in mind that this list assumes you are already | 45 | Again, keep in mind that this list assumes you are already |
46 | functionally running a Linux 2.4 kernel. Also, not all tools are | 46 | functionally running a Linux 2.4 kernel. Also, not all tools are |
47 | necessary on all systems; obviously, if you don't have any PCMCIA (PC | 47 | necessary on all systems; obviously, if you don't have any ISDN |
48 | Card) hardware, for example, you probably needn't concern yourself | 48 | hardware, for example, you probably needn't concern yourself with |
49 | with pcmcia-cs. | 49 | isdn4k-utils. |
50 | 50 | ||
51 | o Gnu C 2.95.3 # gcc --version | 51 | o Gnu C 2.95.3 # gcc --version |
52 | o Gnu make 3.79.1 # make --version | 52 | o Gnu make 3.79.1 # make --version |
@@ -57,6 +57,7 @@ o e2fsprogs 1.29 # tune2fs | |||
57 | o jfsutils 1.1.3 # fsck.jfs -V | 57 | o jfsutils 1.1.3 # fsck.jfs -V |
58 | o reiserfsprogs 3.6.3 # reiserfsck -V 2>&1|grep reiserfsprogs | 58 | o reiserfsprogs 3.6.3 # reiserfsck -V 2>&1|grep reiserfsprogs |
59 | o xfsprogs 2.6.0 # xfs_db -V | 59 | o xfsprogs 2.6.0 # xfs_db -V |
60 | o pcmciautils 001 | ||
60 | o pcmcia-cs 3.1.21 # cardmgr -V | 61 | o pcmcia-cs 3.1.21 # cardmgr -V |
61 | o quota-tools 3.09 # quota -V | 62 | o quota-tools 3.09 # quota -V |
62 | o PPP 2.4.0 # pppd --version | 63 | o PPP 2.4.0 # pppd --version |
@@ -186,13 +187,20 @@ architecture independent and any version from 2.0.0 onward should | |||
186 | work correctly with this version of the XFS kernel code (2.6.0 or | 187 | work correctly with this version of the XFS kernel code (2.6.0 or |
187 | later is recommended, due to some significant improvements). | 188 | later is recommended, due to some significant improvements). |
188 | 189 | ||
190 | PCMCIAutils | ||
191 | ----------- | ||
192 | |||
193 | PCMCIAutils replaces pcmcia-cs (see below). It properly sets up | ||
194 | PCMCIA sockets at system startup and loads the appropriate modules | ||
195 | for 16-bit PCMCIA devices if the kernel is modularized and the hotplug | ||
196 | subsystem is used. | ||
189 | 197 | ||
190 | Pcmcia-cs | 198 | Pcmcia-cs |
191 | --------- | 199 | --------- |
192 | 200 | ||
193 | PCMCIA (PC Card) support is now partially implemented in the main | 201 | PCMCIA (PC Card) support is now partially implemented in the main |
194 | kernel source. Pay attention when you recompile your kernel ;-). | 202 | kernel source. The "pcmciautils" package (see above) replaces pcmcia-cs |
195 | Also, be sure to upgrade to the latest pcmcia-cs release. | 203 | for newest kernels. |
196 | 204 | ||
197 | Quota-tools | 205 | Quota-tools |
198 | ----------- | 206 | ----------- |
@@ -349,9 +357,13 @@ Xfsprogs | |||
349 | -------- | 357 | -------- |
350 | o <ftp://oss.sgi.com/projects/xfs/download/> | 358 | o <ftp://oss.sgi.com/projects/xfs/download/> |
351 | 359 | ||
360 | Pcmciautils | ||
361 | ----------- | ||
362 | o <ftp://ftp.kernel.org/pub/linux/utils/kernel/pcmcia/> | ||
363 | |||
352 | Pcmcia-cs | 364 | Pcmcia-cs |
353 | --------- | 365 | --------- |
354 | o <ftp://pcmcia-cs.sourceforge.net/pub/pcmcia-cs/pcmcia-cs-3.1.21.tar.gz> | 366 | o <http://pcmcia-cs.sourceforge.net/> |
355 | 367 | ||
356 | Quota-tools | 368 | Quota-tools |
357 | ---------- | 369 | ---------- |
diff --git a/Documentation/block/ioprio.txt b/Documentation/block/ioprio.txt new file mode 100644 index 000000000000..96ccf681075e --- /dev/null +++ b/Documentation/block/ioprio.txt | |||
@@ -0,0 +1,176 @@ | |||
1 | Block io priorities | ||
2 | =================== | ||
3 | |||
4 | |||
5 | Intro | ||
6 | ----- | ||
7 | |||
8 | With the introduction of cfq v3 (aka cfq-ts or time sliced cfq), basic io | ||
9 | priorities is supported for reads on files. This enables users to io nice | ||
10 | processes or process groups, similar to what has been possible to cpu | ||
11 | scheduling for ages. This document mainly details the current possibilites | ||
12 | with cfq, other io schedulers do not support io priorities so far. | ||
13 | |||
14 | Scheduling classes | ||
15 | ------------------ | ||
16 | |||
17 | CFQ implements three generic scheduling classes that determine how io is | ||
18 | served for a process. | ||
19 | |||
20 | IOPRIO_CLASS_RT: This is the realtime io class. This scheduling class is given | ||
21 | higher priority than any other in the system, processes from this class are | ||
22 | given first access to the disk every time. Thus it needs to be used with some | ||
23 | care, one io RT process can starve the entire system. Within the RT class, | ||
24 | there are 8 levels of class data that determine exactly how much time this | ||
25 | process needs the disk for on each service. In the future this might change | ||
26 | to be more directly mappable to performance, by passing in a wanted data | ||
27 | rate instead. | ||
28 | |||
29 | IOPRIO_CLASS_BE: This is the best-effort scheduling class, which is the default | ||
30 | for any process that hasn't set a specific io priority. The class data | ||
31 | determines how much io bandwidth the process will get, it's directly mappable | ||
32 | to the cpu nice levels just more coarsely implemented. 0 is the highest | ||
33 | BE prio level, 7 is the lowest. The mapping between cpu nice level and io | ||
34 | nice level is determined as: io_nice = (cpu_nice + 20) / 5. | ||
35 | |||
36 | IOPRIO_CLASS_IDLE: This is the idle scheduling class, processes running at this | ||
37 | level only get io time when no one else needs the disk. The idle class has no | ||
38 | class data, since it doesn't really apply here. | ||
39 | |||
40 | Tools | ||
41 | ----- | ||
42 | |||
43 | See below for a sample ionice tool. Usage: | ||
44 | |||
45 | # ionice -c<class> -n<level> -p<pid> | ||
46 | |||
47 | If pid isn't given, the current process is assumed. IO priority settings | ||
48 | are inherited on fork, so you can use ionice to start the process at a given | ||
49 | level: | ||
50 | |||
51 | # ionice -c2 -n0 /bin/ls | ||
52 | |||
53 | will run ls at the best-effort scheduling class at the highest priority. | ||
54 | For a running process, you can give the pid instead: | ||
55 | |||
56 | # ionice -c1 -n2 -p100 | ||
57 | |||
58 | will change pid 100 to run at the realtime scheduling class, at priority 2. | ||
59 | |||
60 | ---> snip ionice.c tool <--- | ||
61 | |||
62 | #include <stdio.h> | ||
63 | #include <stdlib.h> | ||
64 | #include <errno.h> | ||
65 | #include <getopt.h> | ||
66 | #include <unistd.h> | ||
67 | #include <sys/ptrace.h> | ||
68 | #include <asm/unistd.h> | ||
69 | |||
70 | extern int sys_ioprio_set(int, int, int); | ||
71 | extern int sys_ioprio_get(int, int); | ||
72 | |||
73 | #if defined(__i386__) | ||
74 | #define __NR_ioprio_set 289 | ||
75 | #define __NR_ioprio_get 290 | ||
76 | #elif defined(__ppc__) | ||
77 | #define __NR_ioprio_set 273 | ||
78 | #define __NR_ioprio_get 274 | ||
79 | #elif defined(__x86_64__) | ||
80 | #define __NR_ioprio_set 251 | ||
81 | #define __NR_ioprio_get 252 | ||
82 | #elif defined(__ia64__) | ||
83 | #define __NR_ioprio_set 1274 | ||
84 | #define __NR_ioprio_get 1275 | ||
85 | #else | ||
86 | #error "Unsupported arch" | ||
87 | #endif | ||
88 | |||
89 | _syscall3(int, ioprio_set, int, which, int, who, int, ioprio); | ||
90 | _syscall2(int, ioprio_get, int, which, int, who); | ||
91 | |||
92 | enum { | ||
93 | IOPRIO_CLASS_NONE, | ||
94 | IOPRIO_CLASS_RT, | ||
95 | IOPRIO_CLASS_BE, | ||
96 | IOPRIO_CLASS_IDLE, | ||
97 | }; | ||
98 | |||
99 | enum { | ||
100 | IOPRIO_WHO_PROCESS = 1, | ||
101 | IOPRIO_WHO_PGRP, | ||
102 | IOPRIO_WHO_USER, | ||
103 | }; | ||
104 | |||
105 | #define IOPRIO_CLASS_SHIFT 13 | ||
106 | |||
107 | const char *to_prio[] = { "none", "realtime", "best-effort", "idle", }; | ||
108 | |||
109 | int main(int argc, char *argv[]) | ||
110 | { | ||
111 | int ioprio = 4, set = 0, ioprio_class = IOPRIO_CLASS_BE; | ||
112 | int c, pid = 0; | ||
113 | |||
114 | while ((c = getopt(argc, argv, "+n:c:p:")) != EOF) { | ||
115 | switch (c) { | ||
116 | case 'n': | ||
117 | ioprio = strtol(optarg, NULL, 10); | ||
118 | set = 1; | ||
119 | break; | ||
120 | case 'c': | ||
121 | ioprio_class = strtol(optarg, NULL, 10); | ||
122 | set = 1; | ||
123 | break; | ||
124 | case 'p': | ||
125 | pid = strtol(optarg, NULL, 10); | ||
126 | break; | ||
127 | } | ||
128 | } | ||
129 | |||
130 | switch (ioprio_class) { | ||
131 | case IOPRIO_CLASS_NONE: | ||
132 | ioprio_class = IOPRIO_CLASS_BE; | ||
133 | break; | ||
134 | case IOPRIO_CLASS_RT: | ||
135 | case IOPRIO_CLASS_BE: | ||
136 | break; | ||
137 | case IOPRIO_CLASS_IDLE: | ||
138 | ioprio = 7; | ||
139 | break; | ||
140 | default: | ||
141 | printf("bad prio class %d\n", ioprio_class); | ||
142 | return 1; | ||
143 | } | ||
144 | |||
145 | if (!set) { | ||
146 | if (!pid && argv[optind]) | ||
147 | pid = strtol(argv[optind], NULL, 10); | ||
148 | |||
149 | ioprio = ioprio_get(IOPRIO_WHO_PROCESS, pid); | ||
150 | |||
151 | printf("pid=%d, %d\n", pid, ioprio); | ||
152 | |||
153 | if (ioprio == -1) | ||
154 | perror("ioprio_get"); | ||
155 | else { | ||
156 | ioprio_class = ioprio >> IOPRIO_CLASS_SHIFT; | ||
157 | ioprio = ioprio & 0xff; | ||
158 | printf("%s: prio %d\n", to_prio[ioprio_class], ioprio); | ||
159 | } | ||
160 | } else { | ||
161 | if (ioprio_set(IOPRIO_WHO_PROCESS, pid, ioprio | ioprio_class << IOPRIO_CLASS_SHIFT) == -1) { | ||
162 | perror("ioprio_set"); | ||
163 | return 1; | ||
164 | } | ||
165 | |||
166 | if (argv[optind]) | ||
167 | execvp(argv[optind], &argv[optind]); | ||
168 | } | ||
169 | |||
170 | return 0; | ||
171 | } | ||
172 | |||
173 | ---> snip ionice.c tool <--- | ||
174 | |||
175 | |||
176 | March 11 2005, Jens Axboe <axboe@suse.de> | ||
diff --git a/Documentation/cciss.txt b/Documentation/cciss.txt index d599beb9df8a..c8f9a73111da 100644 --- a/Documentation/cciss.txt +++ b/Documentation/cciss.txt | |||
@@ -17,6 +17,7 @@ This driver is known to work with the following cards: | |||
17 | * SA P600 | 17 | * SA P600 |
18 | * SA P800 | 18 | * SA P800 |
19 | * SA E400 | 19 | * SA E400 |
20 | * SA E300 | ||
20 | 21 | ||
21 | If nodes are not already created in the /dev/cciss directory, run as root: | 22 | If nodes are not already created in the /dev/cciss directory, run as root: |
22 | 23 | ||
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 96d924eb7b64..0f71251f12b9 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt | |||
@@ -1119,7 +1119,7 @@ running once the system is up. | |||
1119 | See Documentation/ramdisk.txt. | 1119 | See Documentation/ramdisk.txt. |
1120 | 1120 | ||
1121 | psmouse.proto= [HW,MOUSE] Highest PS2 mouse protocol extension to | 1121 | psmouse.proto= [HW,MOUSE] Highest PS2 mouse protocol extension to |
1122 | probe for (bare|imps|exps). | 1122 | probe for (bare|imps|exps|lifebook|any). |
1123 | psmouse.rate= [HW,MOUSE] Set desired mouse report rate, in reports | 1123 | psmouse.rate= [HW,MOUSE] Set desired mouse report rate, in reports |
1124 | per second. | 1124 | per second. |
1125 | psmouse.resetafter= | 1125 | psmouse.resetafter= |
diff --git a/Documentation/pcmcia/devicetable.txt b/Documentation/pcmcia/devicetable.txt new file mode 100644 index 000000000000..045511acafc9 --- /dev/null +++ b/Documentation/pcmcia/devicetable.txt | |||
@@ -0,0 +1,64 @@ | |||
1 | Matching of PCMCIA devices to drivers is done using one or more of the | ||
2 | following criteria: | ||
3 | |||
4 | - manufactor ID | ||
5 | - card ID | ||
6 | - product ID strings _and_ hashes of these strings | ||
7 | - function ID | ||
8 | - device function (actual and pseudo) | ||
9 | |||
10 | You should use the helpers in include/pcmcia/device_id.h for generating the | ||
11 | struct pcmcia_device_id[] entries which match devices to drivers. | ||
12 | |||
13 | If you want to match product ID strings, you also need to pass the crc32 | ||
14 | hashes of the string to the macro, e.g. if you want to match the product ID | ||
15 | string 1, you need to use | ||
16 | |||
17 | PCMCIA_DEVICE_PROD_ID1("some_string", 0x(hash_of_some_string)), | ||
18 | |||
19 | If the hash is incorrect, the kernel will inform you about this in "dmesg" | ||
20 | upon module initialization, and tell you of the correct hash. | ||
21 | |||
22 | You can determine the hash of the product ID strings by running | ||
23 | "pcmcia-modalias %n.%m" [%n being replaced with the socket number and %m being | ||
24 | replaced with the device function] from pcmciautils. It generates a string | ||
25 | in the following form: | ||
26 | pcmcia:m0149cC1ABf06pfn00fn00pa725B842DpbF1EFEE84pc0877B627pd00000000 | ||
27 | |||
28 | The hex value after "pa" is the hash of product ID string 1, after "pb" for | ||
29 | string 2 and so on. | ||
30 | |||
31 | Alternatively, you can use this small tool to determine the crc32 hash. | ||
32 | simply pass the string you want to evaluate as argument to this program, | ||
33 | e.g. | ||
34 | $ ./crc32hash "Dual Speed" | ||
35 | |||
36 | ------------------------------------------------------------------------- | ||
37 | /* crc32hash.c - derived from linux/lib/crc32.c, GNU GPL v2 */ | ||
38 | #include <string.h> | ||
39 | #include <stdio.h> | ||
40 | #include <ctype.h> | ||
41 | #include <stdlib.h> | ||
42 | |||
43 | unsigned int crc32(unsigned char const *p, unsigned int len) | ||
44 | { | ||
45 | int i; | ||
46 | unsigned int crc = 0; | ||
47 | while (len--) { | ||
48 | crc ^= *p++; | ||
49 | for (i = 0; i < 8; i++) | ||
50 | crc = (crc >> 1) ^ ((crc & 1) ? 0xedb88320 : 0); | ||
51 | } | ||
52 | return crc; | ||
53 | } | ||
54 | |||
55 | int main(int argc, char **argv) { | ||
56 | unsigned int result; | ||
57 | if (argc != 2) { | ||
58 | printf("no string passed as argument\n"); | ||
59 | return -1; | ||
60 | } | ||
61 | result = crc32(argv[1], strlen(argv[1])); | ||
62 | printf("0x%x\n", result); | ||
63 | return 0; | ||
64 | } | ||
diff --git a/Documentation/pcmcia/driver-changes.txt b/Documentation/pcmcia/driver-changes.txt new file mode 100644 index 000000000000..9c315ab48a02 --- /dev/null +++ b/Documentation/pcmcia/driver-changes.txt | |||
@@ -0,0 +1,51 @@ | |||
1 | This file details changes in 2.6 which affect PCMCIA card driver authors: | ||
2 | |||
3 | * in-kernel device<->driver matching | ||
4 | PCMCIA devices and their correct drivers can now be matched in | ||
5 | kernelspace. See 'devicetable.txt' for details. | ||
6 | |||
7 | * Device model integration (as of 2.6.11) | ||
8 | A struct pcmcia_device is registered with the device model core, | ||
9 | and can be used (e.g. for SET_NETDEV_DEV) by using | ||
10 | handle_to_dev(client_handle_t * handle). | ||
11 | |||
12 | * Convert internal I/O port addresses to unsigned long (as of 2.6.11) | ||
13 | ioaddr_t should be replaced by kio_addr_t in PCMCIA card drivers. | ||
14 | |||
15 | * irq_mask and irq_list parameters (as of 2.6.11) | ||
16 | The irq_mask and irq_list parameters should no longer be used in | ||
17 | PCMCIA card drivers. Instead, it is the job of the PCMCIA core to | ||
18 | determine which IRQ should be used. Therefore, link->irq.IRQInfo2 | ||
19 | is ignored. | ||
20 | |||
21 | * client->PendingEvents is gone (as of 2.6.11) | ||
22 | client->PendingEvents is no longer available. | ||
23 | |||
24 | * client->Attributes are gone (as of 2.6.11) | ||
25 | client->Attributes is unused, therefore it is removed from all | ||
26 | PCMCIA card drivers | ||
27 | |||
28 | * core functions no longer available (as of 2.6.11) | ||
29 | The following functions have been removed from the kernel source | ||
30 | because they are unused by all in-kernel drivers, and no external | ||
31 | driver was reported to rely on them: | ||
32 | pcmcia_get_first_region() | ||
33 | pcmcia_get_next_region() | ||
34 | pcmcia_modify_window() | ||
35 | pcmcia_set_event_mask() | ||
36 | pcmcia_get_first_window() | ||
37 | pcmcia_get_next_window() | ||
38 | |||
39 | * device list iteration upon module removal (as of 2.6.10) | ||
40 | It is no longer necessary to iterate on the driver's internal | ||
41 | client list and call the ->detach() function upon module removal. | ||
42 | |||
43 | * Resource management. (as of 2.6.8) | ||
44 | Although the PCMCIA subsystem will allocate resources for cards, | ||
45 | it no longer marks these resources busy. This means that driver | ||
46 | authors are now responsible for claiming your resources as per | ||
47 | other drivers in Linux. You should use request_region() to mark | ||
48 | your IO regions in-use, and request_mem_region() to mark your | ||
49 | memory regions in-use. The name argument should be a pointer to | ||
50 | your driver name. Eg, for pcnet_cs, name should point to the | ||
51 | string "pcnet_cs". | ||