aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/aoe/mkshelf.sh6
-rw-r--r--Documentation/cciss.txt4
-rw-r--r--Documentation/connector/cn_test.c194
-rw-r--r--Documentation/connector/connector.txt133
-rw-r--r--Documentation/dontdiff1
-rw-r--r--Documentation/fb/intel810.txt56
-rw-r--r--Documentation/feature-removal-schedule.txt9
-rw-r--r--Documentation/firmware_class/firmware_sample_driver.c8
-rw-r--r--Documentation/input/appletouch.txt84
-rw-r--r--Documentation/kdump/kdump.txt11
-rw-r--r--Documentation/kernel-parameters.txt9
-rw-r--r--Documentation/oops-tracing.txt25
-rw-r--r--Documentation/pm.txt6
-rw-r--r--Documentation/scsi/00-INDEX2
-rw-r--r--Documentation/scsi/scsi_eh.txt479
-rw-r--r--Documentation/usb/proc_usb_info.txt13
-rw-r--r--Documentation/x86_64/boot-options.txt5
17 files changed, 987 insertions, 58 deletions
diff --git a/Documentation/aoe/mkshelf.sh b/Documentation/aoe/mkshelf.sh
index 8bacf9f2c7cc..32615814271c 100644
--- a/Documentation/aoe/mkshelf.sh
+++ b/Documentation/aoe/mkshelf.sh
@@ -8,13 +8,15 @@ fi
8n_partitions=${n_partitions:-16} 8n_partitions=${n_partitions:-16}
9dir=$1 9dir=$1
10shelf=$2 10shelf=$2
11nslots=16
12maxslot=`echo $nslots 1 - p | dc`
11MAJOR=152 13MAJOR=152
12 14
13set -e 15set -e
14 16
15minor=`echo 10 \* $shelf \* $n_partitions | bc` 17minor=`echo $nslots \* $shelf \* $n_partitions | bc`
16endp=`echo $n_partitions - 1 | bc` 18endp=`echo $n_partitions - 1 | bc`
17for slot in `seq 0 9`; do 19for slot in `seq 0 $maxslot`; do
18 for part in `seq 0 $endp`; do 20 for part in `seq 0 $endp`; do
19 name=e$shelf.$slot 21 name=e$shelf.$slot
20 test "$part" != "0" && name=${name}p$part 22 test "$part" != "0" && name=${name}p$part
diff --git a/Documentation/cciss.txt b/Documentation/cciss.txt
index c8f9a73111da..68a711fb82cf 100644
--- a/Documentation/cciss.txt
+++ b/Documentation/cciss.txt
@@ -17,7 +17,9 @@ 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 * SA P400i
21 * SA E200
22 * SA E200i
21 23
22If nodes are not already created in the /dev/cciss directory, run as root: 24If nodes are not already created in the /dev/cciss directory, run as root:
23 25
diff --git a/Documentation/connector/cn_test.c b/Documentation/connector/cn_test.c
new file mode 100644
index 000000000000..b7de82e9c0e0
--- /dev/null
+++ b/Documentation/connector/cn_test.c
@@ -0,0 +1,194 @@
1/*
2 * cn_test.c
3 *
4 * 2004-2005 Copyright (c) Evgeniy Polyakov <johnpol@2ka.mipt.ru>
5 * All rights reserved.
6 *
7 * This program is free software; you can redistribute it and/or modify
8 * it under the terms of the GNU General Public License as published by
9 * the Free Software Foundation; either version 2 of the License, or
10 * (at your option) any later version.
11 *
12 * This program is distributed in the hope that it will be useful,
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 * GNU General Public License for more details.
16 *
17 * You should have received a copy of the GNU General Public License
18 * along with this program; if not, write to the Free Software
19 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
20 */
21
22#include <linux/kernel.h>
23#include <linux/module.h>
24#include <linux/moduleparam.h>
25#include <linux/skbuff.h>
26#include <linux/timer.h>
27
28#include "connector.h"
29
30static struct cb_id cn_test_id = { 0x123, 0x456 };
31static char cn_test_name[] = "cn_test";
32static struct sock *nls;
33static struct timer_list cn_test_timer;
34
35void cn_test_callback(void *data)
36{
37 struct cn_msg *msg = (struct cn_msg *)data;
38
39 printk("%s: %lu: idx=%x, val=%x, seq=%u, ack=%u, len=%d: %s.\n",
40 __func__, jiffies, msg->id.idx, msg->id.val,
41 msg->seq, msg->ack, msg->len, (char *)msg->data);
42}
43
44static int cn_test_want_notify(void)
45{
46 struct cn_ctl_msg *ctl;
47 struct cn_notify_req *req;
48 struct cn_msg *msg = NULL;
49 int size, size0;
50 struct sk_buff *skb;
51 struct nlmsghdr *nlh;
52 u32 group = 1;
53
54 size0 = sizeof(*msg) + sizeof(*ctl) + 3 * sizeof(*req);
55
56 size = NLMSG_SPACE(size0);
57
58 skb = alloc_skb(size, GFP_ATOMIC);
59 if (!skb) {
60 printk(KERN_ERR "Failed to allocate new skb with size=%u.\n",
61 size);
62
63 return -ENOMEM;
64 }
65
66 nlh = NLMSG_PUT(skb, 0, 0x123, NLMSG_DONE, size - sizeof(*nlh));
67
68 msg = (struct cn_msg *)NLMSG_DATA(nlh);
69
70 memset(msg, 0, size0);
71
72 msg->id.idx = -1;
73 msg->id.val = -1;
74 msg->seq = 0x123;
75 msg->ack = 0x345;
76 msg->len = size0 - sizeof(*msg);
77
78 ctl = (struct cn_ctl_msg *)(msg + 1);
79
80 ctl->idx_notify_num = 1;
81 ctl->val_notify_num = 2;
82 ctl->group = group;
83 ctl->len = msg->len - sizeof(*ctl);
84
85 req = (struct cn_notify_req *)(ctl + 1);
86
87 /*
88 * Idx.
89 */
90 req->first = cn_test_id.idx;
91 req->range = 10;
92
93 /*
94 * Val 0.
95 */
96 req++;
97 req->first = cn_test_id.val;
98 req->range = 10;
99
100 /*
101 * Val 1.
102 */
103 req++;
104 req->first = cn_test_id.val + 20;
105 req->range = 10;
106
107 NETLINK_CB(skb).dst_groups = ctl->group;
108 //netlink_broadcast(nls, skb, 0, ctl->group, GFP_ATOMIC);
109 netlink_unicast(nls, skb, 0, 0);
110
111 printk(KERN_INFO "Request was sent. Group=0x%x.\n", ctl->group);
112
113 return 0;
114
115nlmsg_failure:
116 printk(KERN_ERR "Failed to send %u.%u\n", msg->seq, msg->ack);
117 kfree_skb(skb);
118 return -EINVAL;
119}
120
121static u32 cn_test_timer_counter;
122static void cn_test_timer_func(unsigned long __data)
123{
124 struct cn_msg *m;
125 char data[32];
126
127 m = kmalloc(sizeof(*m) + sizeof(data), GFP_ATOMIC);
128 if (m) {
129 memset(m, 0, sizeof(*m) + sizeof(data));
130
131 memcpy(&m->id, &cn_test_id, sizeof(m->id));
132 m->seq = cn_test_timer_counter;
133 m->len = sizeof(data);
134
135 m->len =
136 scnprintf(data, sizeof(data), "counter = %u",
137 cn_test_timer_counter) + 1;
138
139 memcpy(m + 1, data, m->len);
140
141 cn_netlink_send(m, 0, gfp_any());
142 kfree(m);
143 }
144
145 cn_test_timer_counter++;
146
147 mod_timer(&cn_test_timer, jiffies + HZ);
148}
149
150static int cn_test_init(void)
151{
152 int err;
153
154 err = cn_add_callback(&cn_test_id, cn_test_name, cn_test_callback);
155 if (err)
156 goto err_out;
157 cn_test_id.val++;
158 err = cn_add_callback(&cn_test_id, cn_test_name, cn_test_callback);
159 if (err) {
160 cn_del_callback(&cn_test_id);
161 goto err_out;
162 }
163
164 init_timer(&cn_test_timer);
165 cn_test_timer.function = cn_test_timer_func;
166 cn_test_timer.expires = jiffies + HZ;
167 cn_test_timer.data = 0;
168 add_timer(&cn_test_timer);
169
170 return 0;
171
172 err_out:
173 if (nls && nls->sk_socket)
174 sock_release(nls->sk_socket);
175
176 return err;
177}
178
179static void cn_test_fini(void)
180{
181 del_timer_sync(&cn_test_timer);
182 cn_del_callback(&cn_test_id);
183 cn_test_id.val--;
184 cn_del_callback(&cn_test_id);
185 if (nls && nls->sk_socket)
186 sock_release(nls->sk_socket);
187}
188
189module_init(cn_test_init);
190module_exit(cn_test_fini);
191
192MODULE_LICENSE("GPL");
193MODULE_AUTHOR("Evgeniy Polyakov <johnpol@2ka.mipt.ru>");
194MODULE_DESCRIPTION("Connector's test module");
diff --git a/Documentation/connector/connector.txt b/Documentation/connector/connector.txt
new file mode 100644
index 000000000000..54a0a14bfbe3
--- /dev/null
+++ b/Documentation/connector/connector.txt
@@ -0,0 +1,133 @@
1/*****************************************/
2Kernel Connector.
3/*****************************************/
4
5Kernel connector - new netlink based userspace <-> kernel space easy
6to use communication module.
7
8Connector driver adds possibility to connect various agents using
9netlink based network. One must register callback and
10identifier. When driver receives special netlink message with
11appropriate identifier, appropriate callback will be called.
12
13From the userspace point of view it's quite straightforward:
14
15 socket();
16 bind();
17 send();
18 recv();
19
20But if kernelspace want to use full power of such connections, driver
21writer must create special sockets, must know about struct sk_buff
22handling... Connector allows any kernelspace agents to use netlink
23based networking for inter-process communication in a significantly
24easier way:
25
26int cn_add_callback(struct cb_id *id, char *name, void (*callback) (void *));
27void cn_netlink_send(struct cn_msg *msg, u32 __group, int gfp_mask);
28
29struct cb_id
30{
31 __u32 idx;
32 __u32 val;
33};
34
35idx and val are unique identifiers which must be registered in
36connector.h for in-kernel usage. void (*callback) (void *) - is a
37callback function which will be called when message with above idx.val
38will be received by connector core. Argument for that function must
39be dereferenced to struct cn_msg *.
40
41struct cn_msg
42{
43 struct cb_id id;
44
45 __u32 seq;
46 __u32 ack;
47
48 __u32 len; /* Length of the following data */
49 __u8 data[0];
50};
51
52/*****************************************/
53Connector interfaces.
54/*****************************************/
55
56int cn_add_callback(struct cb_id *id, char *name, void (*callback) (void *));
57
58Registers new callback with connector core.
59
60struct cb_id *id - unique connector's user identifier.
61 It must be registered in connector.h for legal in-kernel users.
62char *name - connector's callback symbolic name.
63void (*callback) (void *) - connector's callback.
64 Argument must be dereferenced to struct cn_msg *.
65
66void cn_del_callback(struct cb_id *id);
67
68Unregisters new callback with connector core.
69
70struct cb_id *id - unique connector's user identifier.
71
72void cn_netlink_send(struct cn_msg *msg, u32 __groups, int gfp_mask);
73
74Sends message to the specified groups. It can be safely called from
75any context, but may silently fail under strong memory pressure.
76
77struct cn_msg * - message header(with attached data).
78u32 __group - destination group.
79 If __group is zero, then appropriate group will
80 be searched through all registered connector users,
81 and message will be delivered to the group which was
82 created for user with the same ID as in msg.
83 If __group is not zero, then message will be delivered
84 to the specified group.
85int gfp_mask - GFP mask.
86
87Note: When registering new callback user, connector core assigns
88netlink group to the user which is equal to it's id.idx.
89
90/*****************************************/
91Protocol description.
92/*****************************************/
93
94Current offers transport layer with fixed header. Recommended
95protocol which uses such header is following:
96
97msg->seq and msg->ack are used to determine message genealogy. When
98someone sends message it puts there locally unique sequence and random
99acknowledge numbers. Sequence number may be copied into
100nlmsghdr->nlmsg_seq too.
101
102Sequence number is incremented with each message to be sent.
103
104If we expect reply to our message, then sequence number in received
105message MUST be the same as in original message, and acknowledge
106number MUST be the same + 1.
107
108If we receive message and it's sequence number is not equal to one we
109are expecting, then it is new message. If we receive message and it's
110sequence number is the same as one we are expecting, but it's
111acknowledge is not equal acknowledge number in original message + 1,
112then it is new message.
113
114Obviously, protocol header contains above id.
115
116connector allows event notification in the following form: kernel
117driver or userspace process can ask connector to notify it when
118selected id's will be turned on or off(registered or unregistered it's
119callback). It is done by sending special command to connector
120driver(it also registers itself with id={-1, -1}).
121
122As example of usage Documentation/connector now contains cn_test.c -
123testing module which uses connector to request notification and to
124send messages.
125
126/*****************************************/
127Reliability.
128/*****************************************/
129
130Netlink itself is not reliable protocol, that means that messages can
131be lost due to memory pressure or process' receiving queue overflowed,
132so caller is warned must be prepared. That is why struct cn_msg [main
133connector's message header] contains u32 seq and u32 ack fields.
diff --git a/Documentation/dontdiff b/Documentation/dontdiff
index 96bea278bbf6..24adfe9af3ca 100644
--- a/Documentation/dontdiff
+++ b/Documentation/dontdiff
@@ -55,6 +55,7 @@ aic7*seq.h*
55aicasm 55aicasm
56aicdb.h* 56aicdb.h*
57asm 57asm
58asm-offsets.*
58asm_offsets.* 59asm_offsets.*
59autoconf.h* 60autoconf.h*
60bbootsect 61bbootsect
diff --git a/Documentation/fb/intel810.txt b/Documentation/fb/intel810.txt
index fd68b162e4a1..4f0d6bc789ef 100644
--- a/Documentation/fb/intel810.txt
+++ b/Documentation/fb/intel810.txt
@@ -5,6 +5,7 @@ Intel 810/815 Framebuffer driver
5 March 17, 2002 5 March 17, 2002
6 6
7 First Released: July 2001 7 First Released: July 2001
8 Last Update: September 12, 2005
8================================================================ 9================================================================
9 10
10A. Introduction 11A. Introduction
@@ -44,6 +45,8 @@ B. Features
44 45
45 - Hardware Cursor Support 46 - Hardware Cursor Support
46 47
48 - Supports EDID probing either by DDC/I2C or through the BIOS
49
47C. List of available options 50C. List of available options
48 51
49 a. "video=i810fb" 52 a. "video=i810fb"
@@ -52,14 +55,17 @@ C. List of available options
52 Recommendation: required 55 Recommendation: required
53 56
54 b. "xres:<value>" 57 b. "xres:<value>"
55 select horizontal resolution in pixels 58 select horizontal resolution in pixels. (This parameter will be
59 ignored if 'mode_option' is specified. See 'o' below).
56 60
57 Recommendation: user preference 61 Recommendation: user preference
58 (default = 640) 62 (default = 640)
59 63
60 c. "yres:<value>" 64 c. "yres:<value>"
61 select vertical resolution in scanlines. If Discrete Video Timings 65 select vertical resolution in scanlines. If Discrete Video Timings
62 is enabled, this will be ignored and computed as 3*xres/4. 66 is enabled, this will be ignored and computed as 3*xres/4. (This
67 parameter will be ignored if 'mode_option' is specified. See 'o'
68 below)
63 69
64 Recommendation: user preference 70 Recommendation: user preference
65 (default = 480) 71 (default = 480)
@@ -86,7 +92,8 @@ C. List of available options
86 g. "hsync1/hsync2:<value>" 92 g. "hsync1/hsync2:<value>"
87 select the minimum and maximum Horizontal Sync Frequency of the 93 select the minimum and maximum Horizontal Sync Frequency of the
88 monitor in KHz. If a using a fixed frequency monitor, hsync1 must 94 monitor in KHz. If a using a fixed frequency monitor, hsync1 must
89 be equal to hsync2. 95 be equal to hsync2. If EDID probing is successful, these will be
96 ignored and values will be taken from the EDID block.
90 97
91 Recommendation: check monitor manual for correct values 98 Recommendation: check monitor manual for correct values
92 default (29/30) 99 default (29/30)
@@ -94,7 +101,8 @@ C. List of available options
94 h. "vsync1/vsync2:<value>" 101 h. "vsync1/vsync2:<value>"
95 select the minimum and maximum Vertical Sync Frequency of the monitor 102 select the minimum and maximum Vertical Sync Frequency of the monitor
96 in Hz. You can also use this option to lock your monitor's refresh 103 in Hz. You can also use this option to lock your monitor's refresh
97 rate. 104 rate. If EDID probing is successful, these will be ignored and values
105 will be taken from the EDID block.
98 106
99 Recommendation: check monitor manual for correct values 107 Recommendation: check monitor manual for correct values
100 (default = 60/60) 108 (default = 60/60)
@@ -154,7 +162,11 @@ C. List of available options
154 162
155 Recommendation: do not set 163 Recommendation: do not set
156 (default = not set) 164 (default = not set)
157 165 o. <xres>x<yres>[-<bpp>][@<refresh>]
166 The driver will now accept specification of boot mode option. If this
167 is specified, the options 'xres' and 'yres' will be ignored. See
168 Documentation/fb/modedb.txt for usage.
169
158D. Kernel booting 170D. Kernel booting
159 171
160Separate each option/option-pair by commas (,) and the option from its value 172Separate each option/option-pair by commas (,) and the option from its value
@@ -176,7 +188,10 @@ will be computed based on the hsync1/hsync2 and vsync1/vsync2 values.
176 188
177IMPORTANT: 189IMPORTANT:
178You must include hsync1, hsync2, vsync1 and vsync2 to enable video modes 190You must include hsync1, hsync2, vsync1 and vsync2 to enable video modes
179better than 640x480 at 60Hz. 191better than 640x480 at 60Hz. HOWEVER, if your chipset/display combination
192supports I2C and has an EDID block, you can safely exclude hsync1, hsync2,
193vsync1 and vsync2 parameters. These parameters will be taken from the EDID
194block.
180 195
181E. Module options 196E. Module options
182 197
@@ -217,32 +232,21 @@ F. Setup
217 This is required. The option is under "Character Devices" 232 This is required. The option is under "Character Devices"
218 233
219 d. Under "Graphics Support", select "Intel 810/815" either statically 234 d. Under "Graphics Support", select "Intel 810/815" either statically
220 or as a module. Choose "use VESA GTF for video timings" if you 235 or as a module. Choose "use VESA Generalized Timing Formula" if
221 need to maximize the capability of your display. To be on the 236 you need to maximize the capability of your display. To be on the
222 safe side, you can leave this unselected. 237 safe side, you can leave this unselected.
223 238
224 e. If you want a framebuffer console, enable it under "Console 239 e. If you want support for DDC/I2C probing (Plug and Play Displays),
240 set 'Enable DDC Support' to 'y'. To make this option appear, set
241 'use VESA Generalized Timing Formula' to 'y'.
242
243 f. If you want a framebuffer console, enable it under "Console
225 Drivers" 244 Drivers"
226 245
227 f. Compile your kernel. 246 g. Compile your kernel.
228 247
229 g. Load the driver as described in section D and E. 248 h. Load the driver as described in section D and E.
230 249
231 Optional:
232 h. If you are going to run XFree86 with its native drivers, the
233 standard XFree86 4.1.0 and 4.2.0 drivers should work as is.
234 However, there's a bug in the XFree86 i810 drivers. It attempts
235 to use XAA even when switched to the console. This will crash
236 your server. I have a fix at this site:
237
238 http://i810fb.sourceforge.net.
239
240 You can either use the patch, or just replace
241
242 /usr/X11R6/lib/modules/drivers/i810_drv.o
243
244 with the one provided at the website.
245
246 i. Try the DirectFB (http://www.directfb.org) + the i810 gfxdriver 250 i. Try the DirectFB (http://www.directfb.org) + the i810 gfxdriver
247 patch to see the chipset in action (or inaction :-). 251 patch to see the chipset in action (or inaction :-).
248 252
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 784e08c1c80a..b67189a8d8d4 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -17,15 +17,6 @@ Who: Greg Kroah-Hartman <greg@kroah.com>
17 17
18--------------------------- 18---------------------------
19 19
20What: io_remap_page_range() (macro or function)
21When: September 2005
22Why: Replaced by io_remap_pfn_range() which allows more memory space
23 addressabilty (by using a pfn) and supports sparc & sparc64
24 iospace as part of the pfn.
25Who: Randy Dunlap <rddunlap@osdl.org>
26
27---------------------------
28
29What: RAW driver (CONFIG_RAW_DRIVER) 20What: RAW driver (CONFIG_RAW_DRIVER)
30When: December 2005 21When: December 2005
31Why: declared obsolete since kernel 2.6.3 22Why: declared obsolete since kernel 2.6.3
diff --git a/Documentation/firmware_class/firmware_sample_driver.c b/Documentation/firmware_class/firmware_sample_driver.c
index e1c56a7e6583..4bef8c25172c 100644
--- a/Documentation/firmware_class/firmware_sample_driver.c
+++ b/Documentation/firmware_class/firmware_sample_driver.c
@@ -32,14 +32,14 @@ static void sample_firmware_load(char *firmware, int size)
32 u8 buf[size+1]; 32 u8 buf[size+1];
33 memcpy(buf, firmware, size); 33 memcpy(buf, firmware, size);
34 buf[size] = '\0'; 34 buf[size] = '\0';
35 printk("firmware_sample_driver: firmware: %s\n", buf); 35 printk(KERN_INFO "firmware_sample_driver: firmware: %s\n", buf);
36} 36}
37 37
38static void sample_probe_default(void) 38static void sample_probe_default(void)
39{ 39{
40 /* uses the default method to get the firmware */ 40 /* uses the default method to get the firmware */
41 const struct firmware *fw_entry; 41 const struct firmware *fw_entry;
42 printk("firmware_sample_driver: a ghost device got inserted :)\n"); 42 printk(KERN_INFO "firmware_sample_driver: a ghost device got inserted :)\n");
43 43
44 if(request_firmware(&fw_entry, "sample_driver_fw", &ghost_device)!=0) 44 if(request_firmware(&fw_entry, "sample_driver_fw", &ghost_device)!=0)
45 { 45 {
@@ -61,7 +61,7 @@ static void sample_probe_specific(void)
61 61
62 /* NOTE: This currently doesn't work */ 62 /* NOTE: This currently doesn't work */
63 63
64 printk("firmware_sample_driver: a ghost device got inserted :)\n"); 64 printk(KERN_INFO "firmware_sample_driver: a ghost device got inserted :)\n");
65 65
66 if(request_firmware(NULL, "sample_driver_fw", &ghost_device)!=0) 66 if(request_firmware(NULL, "sample_driver_fw", &ghost_device)!=0)
67 { 67 {
@@ -83,7 +83,7 @@ static void sample_probe_async_cont(const struct firmware *fw, void *context)
83 return; 83 return;
84 } 84 }
85 85
86 printk("firmware_sample_driver: device pointer \"%s\"\n", 86 printk(KERN_INFO "firmware_sample_driver: device pointer \"%s\"\n",
87 (char *)context); 87 (char *)context);
88 sample_firmware_load(fw->data, fw->size); 88 sample_firmware_load(fw->data, fw->size);
89} 89}
diff --git a/Documentation/input/appletouch.txt b/Documentation/input/appletouch.txt
new file mode 100644
index 000000000000..b48d11d0326d
--- /dev/null
+++ b/Documentation/input/appletouch.txt
@@ -0,0 +1,84 @@
1Apple Touchpad Driver (appletouch)
2----------------------------------
3 Copyright (C) 2005 Stelian Pop <stelian@popies.net>
4
5appletouch is a Linux kernel driver for the USB touchpad found on post
6February 2005 Apple Alu Powerbooks.
7
8This driver is derived from Johannes Berg's appletrackpad driver[1], but it has
9been improved in some areas:
10 * appletouch is a full kernel driver, no userspace program is necessary
11 * appletouch can be interfaced with the synaptics X11 driver, in order
12 to have touchpad acceleration, scrolling, etc.
13
14Credits go to Johannes Berg for reverse-engineering the touchpad protocol,
15Frank Arnold for further improvements, and Alex Harper for some additional
16information about the inner workings of the touchpad sensors.
17
18Usage:
19------
20
21In order to use the touchpad in the basic mode, compile the driver and load
22the module. A new input device will be detected and you will be able to read
23the mouse data from /dev/input/mice (using gpm, or X11).
24
25In X11, you can configure the touchpad to use the synaptics X11 driver, which
26will give additional functionalities, like acceleration, scrolling, 2 finger
27tap for middle button mouse emulation, 3 finger tap for right button mouse
28emulation, etc. In order to do this, make sure you're using a recent version of
29the synaptics driver (tested with 0.14.2, available from [2]), and configure a
30new input device in your X11 configuration file (take a look below for an
31example). For additional configuration, see the synaptics driver documentation.
32
33 Section "InputDevice"
34 Identifier "Synaptics Touchpad"
35 Driver "synaptics"
36 Option "SendCoreEvents" "true"
37 Option "Device" "/dev/input/mice"
38 Option "Protocol" "auto-dev"
39 Option "LeftEdge" "0"
40 Option "RightEdge" "850"
41 Option "TopEdge" "0"
42 Option "BottomEdge" "645"
43 Option "MinSpeed" "0.4"
44 Option "MaxSpeed" "1"
45 Option "AccelFactor" "0.02"
46 Option "FingerLow" "0"
47 Option "FingerHigh" "30"
48 Option "MaxTapMove" "20"
49 Option "MaxTapTime" "100"
50 Option "HorizScrollDelta" "0"
51 Option "VertScrollDelta" "30"
52 Option "SHMConfig" "on"
53 EndSection
54
55 Section "ServerLayout"
56 ...
57 InputDevice "Mouse"
58 InputDevice "Synaptics Touchpad"
59 ...
60 EndSection
61
62Fuzz problems:
63--------------
64
65The touchpad sensors are very sensitive to heat, and will generate a lot of
66noise when the temperature changes. This is especially true when you power-on
67the laptop for the first time.
68
69The appletouch driver tries to handle this noise and auto adapt itself, but it
70is not perfect. If finger movements are not recognized anymore, try reloading
71the driver.
72
73You can activate debugging using the 'debug' module parameter. A value of 0
74deactivates any debugging, 1 activates tracing of invalid samples, 2 activates
75full tracing (each sample is being traced):
76 modprobe appletouch debug=1
77 or
78 echo "1" > /sys/module/appletouch/parameters/debug
79
80Links:
81------
82
83[1]: http://johannes.sipsolutions.net/PowerBook/touchpad/
84[2]: http://web.telia.com/~u89404340/touchpad/index.html
diff --git a/Documentation/kdump/kdump.txt b/Documentation/kdump/kdump.txt
index 1f5f7d28c9e6..5f08f9ce6046 100644
--- a/Documentation/kdump/kdump.txt
+++ b/Documentation/kdump/kdump.txt
@@ -66,11 +66,11 @@ SETUP
66 c) Enable "/proc/vmcore support" (Optional, in Pseudo filesystems). 66 c) Enable "/proc/vmcore support" (Optional, in Pseudo filesystems).
67 CONFIG_PROC_VMCORE=y 67 CONFIG_PROC_VMCORE=y
68 d) Disable SMP support and build a UP kernel (Until it is fixed). 68 d) Disable SMP support and build a UP kernel (Until it is fixed).
69 CONFIG_SMP=n 69 CONFIG_SMP=n
70 e) Enable "Local APIC support on uniprocessors". 70 e) Enable "Local APIC support on uniprocessors".
71 CONFIG_X86_UP_APIC=y 71 CONFIG_X86_UP_APIC=y
72 f) Enable "IO-APIC support on uniprocessors" 72 f) Enable "IO-APIC support on uniprocessors"
73 CONFIG_X86_UP_IOAPIC=y 73 CONFIG_X86_UP_IOAPIC=y
74 74
75 Note: i) Options a) and b) depend upon "Configure standard kernel features 75 Note: i) Options a) and b) depend upon "Configure standard kernel features
76 (for small systems)" (under General setup). 76 (for small systems)" (under General setup).
@@ -95,6 +95,11 @@ SETUP
95 hence have memory less than 4GB. 95 hence have memory less than 4GB.
96 iii) Specify "irqpoll" as command line parameter. This reduces driver 96 iii) Specify "irqpoll" as command line parameter. This reduces driver
97 initialization failures in second kernel due to shared interrupts. 97 initialization failures in second kernel due to shared interrupts.
98 iv) <root-dev> needs to be specified in a format corresponding to
99 the root device name in the output of mount command.
100 v) If you have built the drivers required to mount root file
101 system as modules in <second-kernel>, then, specify
102 --initrd=<initrd-for-second-kernel>.
98 103
995) System reboots into the second kernel when a panic occurs. A module can be 1045) System reboots into the second kernel when a panic occurs. A module can be
100 written to force the panic or "ALT-SysRq-c" can be used initiate a crash 105 written to force the panic or "ALT-SysRq-c" can be used initiate a crash
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index db2603ceabba..7086f0a90d14 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -164,6 +164,15 @@ running once the system is up.
164 over-ride platform specific driver. 164 over-ride platform specific driver.
165 See also Documentation/acpi-hotkey.txt. 165 See also Documentation/acpi-hotkey.txt.
166 166
167 enable_timer_pin_1 [i386,x86-64]
168 Enable PIN 1 of APIC timer
169 Can be useful to work around chipset bugs (in particular on some ATI chipsets)
170 The kernel tries to set a reasonable default.
171
172 disable_timer_pin_1 [i386,x86-64]
173 Disable PIN 1 of APIC timer
174 Can be useful to work around chipset bugs.
175
167 ad1816= [HW,OSS] 176 ad1816= [HW,OSS]
168 Format: <io>,<irq>,<dma>,<dma2> 177 Format: <io>,<irq>,<dma>,<dma2>
169 See also Documentation/sound/oss/AD1816. 178 See also Documentation/sound/oss/AD1816.
diff --git a/Documentation/oops-tracing.txt b/Documentation/oops-tracing.txt
index da711028e5f7..66eaaab7773d 100644
--- a/Documentation/oops-tracing.txt
+++ b/Documentation/oops-tracing.txt
@@ -205,8 +205,8 @@ Phone: 701-234-7556
205Tainted kernels: 205Tainted kernels:
206 206
207Some oops reports contain the string 'Tainted: ' after the program 207Some oops reports contain the string 'Tainted: ' after the program
208counter, this indicates that the kernel has been tainted by some 208counter. This indicates that the kernel has been tainted by some
209mechanism. The string is followed by a series of position sensitive 209mechanism. The string is followed by a series of position-sensitive
210characters, each representing a particular tainted value. 210characters, each representing a particular tainted value.
211 211
212 1: 'G' if all modules loaded have a GPL or compatible license, 'P' if 212 1: 'G' if all modules loaded have a GPL or compatible license, 'P' if
@@ -214,16 +214,25 @@ characters, each representing a particular tainted value.
214 MODULE_LICENSE or with a MODULE_LICENSE that is not recognised by 214 MODULE_LICENSE or with a MODULE_LICENSE that is not recognised by
215 insmod as GPL compatible are assumed to be proprietary. 215 insmod as GPL compatible are assumed to be proprietary.
216 216
217 2: 'F' if any module was force loaded by insmod -f, ' ' if all 217 2: 'F' if any module was force loaded by "insmod -f", ' ' if all
218 modules were loaded normally. 218 modules were loaded normally.
219 219
220 3: 'S' if the oops occurred on an SMP kernel running on hardware that 220 3: 'S' if the oops occurred on an SMP kernel running on hardware that
221 hasn't been certified as safe to run multiprocessor. 221 hasn't been certified as safe to run multiprocessor.
222 Currently this occurs only on various Athlons that are not 222 Currently this occurs only on various Athlons that are not
223 SMP capable. 223 SMP capable.
224
225 4: 'R' if a module was force unloaded by "rmmod -f", ' ' if all
226 modules were unloaded normally.
227
228 5: 'M' if any processor has reported a Machine Check Exception,
229 ' ' if no Machine Check Exceptions have occurred.
230
231 6: 'B' if a page-release function has found a bad page reference or
232 some unexpected page flags.
224 233
225The primary reason for the 'Tainted: ' string is to tell kernel 234The primary reason for the 'Tainted: ' string is to tell kernel
226debuggers if this is a clean kernel or if anything unusual has 235debuggers if this is a clean kernel or if anything unusual has
227occurred. Tainting is permanent, even if an offending module is 236occurred. Tainting is permanent: even if an offending module is
228unloading the tainted value remains to indicate that the kernel is not 237unloaded, the tainted value remains to indicate that the kernel is not
229trustworthy. 238trustworthy.
diff --git a/Documentation/pm.txt b/Documentation/pm.txt
index cc63ae18d147..2ea1149bf6b0 100644
--- a/Documentation/pm.txt
+++ b/Documentation/pm.txt
@@ -38,6 +38,12 @@ system the associated daemon will exit gracefully.
38 38
39Driver Interface -- OBSOLETE, DO NOT USE! 39Driver Interface -- OBSOLETE, DO NOT USE!
40----------------************************* 40----------------*************************
41
42Note: pm_register(), pm_access(), pm_dev_idle() and friends are
43obsolete. Please do not use them. Instead you should properly hook
44your driver into the driver model, and use its suspend()/resume()
45callbacks to do this kind of stuff.
46
41If you are writing a new driver or maintaining an old driver, it 47If you are writing a new driver or maintaining an old driver, it
42should include power management support. Without power management 48should include power management support. Without power management
43support, a single driver may prevent a system with power management 49support, a single driver may prevent a system with power management
diff --git a/Documentation/scsi/00-INDEX b/Documentation/scsi/00-INDEX
index f9cb5bdcce41..fef92ebf266f 100644
--- a/Documentation/scsi/00-INDEX
+++ b/Documentation/scsi/00-INDEX
@@ -60,6 +60,8 @@ scsi.txt
60 - short blurb on using SCSI support as a module. 60 - short blurb on using SCSI support as a module.
61scsi_mid_low_api.txt 61scsi_mid_low_api.txt
62 - info on API between SCSI layer and low level drivers 62 - info on API between SCSI layer and low level drivers
63scsi_eh.txt
64 - info on SCSI midlayer error handling infrastructure
63st.txt 65st.txt
64 - info on scsi tape driver 66 - info on scsi tape driver
65sym53c500_cs.txt 67sym53c500_cs.txt
diff --git a/Documentation/scsi/scsi_eh.txt b/Documentation/scsi/scsi_eh.txt
new file mode 100644
index 000000000000..534a50922a7b
--- /dev/null
+++ b/Documentation/scsi/scsi_eh.txt
@@ -0,0 +1,479 @@
1
2SCSI EH
3======================================
4
5 This document describes SCSI midlayer error handling infrastructure.
6Please refer to Documentation/scsi/scsi_mid_low_api.txt for more
7information regarding SCSI midlayer.
8
9TABLE OF CONTENTS
10
11[1] How SCSI commands travel through the midlayer and to EH
12 [1-1] struct scsi_cmnd
13 [1-2] How do scmd's get completed?
14 [1-2-1] Completing a scmd w/ scsi_done
15 [1-2-2] Completing a scmd w/ timeout
16 [1-3] How EH takes over
17[2] How SCSI EH works
18 [2-1] EH through fine-grained callbacks
19 [2-1-1] Overview
20 [2-1-2] Flow of scmds through EH
21 [2-1-3] Flow of control
22 [2-2] EH through hostt->eh_strategy_handler()
23 [2-2-1] Pre hostt->eh_strategy_handler() SCSI midlayer conditions
24 [2-2-2] Post hostt->eh_strategy_handler() SCSI midlayer conditions
25 [2-2-3] Things to consider
26
27
28[1] How SCSI commands travel through the midlayer and to EH
29
30[1-1] struct scsi_cmnd
31
32 Each SCSI command is represented with struct scsi_cmnd (== scmd). A
33scmd has two list_head's to link itself into lists. The two are
34scmd->list and scmd->eh_entry. The former is used for free list or
35per-device allocated scmd list and not of much interest to this EH
36discussion. The latter is used for completion and EH lists and unless
37otherwise stated scmds are always linked using scmd->eh_entry in this
38discussion.
39
40
41[1-2] How do scmd's get completed?
42
43 Once LLDD gets hold of a scmd, either the LLDD will complete the
44command by calling scsi_done callback passed from midlayer when
45invoking hostt->queuecommand() or SCSI midlayer will time it out.
46
47
48[1-2-1] Completing a scmd w/ scsi_done
49
50 For all non-EH commands, scsi_done() is the completion callback. It
51does the following.
52
53 1. Delete timeout timer. If it fails, it means that timeout timer
54 has expired and is going to finish the command. Just return.
55
56 2. Link scmd to per-cpu scsi_done_q using scmd->en_entry
57
58 3. Raise SCSI_SOFTIRQ
59
60 SCSI_SOFTIRQ handler scsi_softirq calls scsi_decide_disposition() to
61determine what to do with the command. scsi_decide_disposition()
62looks at the scmd->result value and sense data to determine what to do
63with the command.
64
65 - SUCCESS
66 scsi_finish_command() is invoked for the command. The
67 function does some maintenance choirs and notify completion by
68 calling scmd->done() callback, which, for fs requests, would
69 be HLD completion callback - sd:sd_rw_intr, sr:rw_intr,
70 st:st_intr.
71
72 - NEEDS_RETRY
73 - ADD_TO_MLQUEUE
74 scmd is requeued to blk queue.
75
76 - otherwise
77 scsi_eh_scmd_add(scmd, 0) is invoked for the command. See
78 [1-3] for details of this funciton.
79
80
81[1-2-2] Completing a scmd w/ timeout
82
83 The timeout handler is scsi_times_out(). When a timeout occurs, this
84function
85
86 1. invokes optional hostt->eh_timedout() callback. Return value can
87 be one of
88
89 - EH_HANDLED
90 This indicates that eh_timedout() dealt with the timeout. The
91 scmd is passed to __scsi_done() and thus linked into per-cpu
92 scsi_done_q. Normal command completion described in [1-2-1]
93 follows.
94
95 - EH_RESET_TIMER
96 This indicates that more time is required to finish the
97 command. Timer is restarted. This action is counted as a
98 retry and only allowed scmd->allowed + 1(!) times. Once the
99 limit is reached, action for EH_NOT_HANDLED is taken instead.
100
101 *NOTE* This action is racy as the LLDD could finish the scmd
102 after the timeout has expired but before it's added back. In
103 such cases, scsi_done() would think that timeout has occurred
104 and return without doing anything. We lose completion and the
105 command will time out again.
106
107 - EH_NOT_HANDLED
108 This is the same as when eh_timedout() callback doesn't exist.
109 Step #2 is taken.
110
111 2. scsi_eh_scmd_add(scmd, SCSI_EH_CANCEL_CMD) is invoked for the
112 command. See [1-3] for more information.
113
114
115[1-3] How EH takes over
116
117 scmds enter EH via scsi_eh_scmd_add(), which does the following.
118
119 1. Turns on scmd->eh_eflags as requested. It's 0 for error
120 completions and SCSI_EH_CANCEL_CMD for timeouts.
121
122 2. Links scmd->eh_entry to shost->eh_cmd_q
123
124 3. Sets SHOST_RECOVERY bit in shost->shost_state
125
126 4. Increments shost->host_failed
127
128 5. Wakes up SCSI EH thread if shost->host_busy == shost->host_failed
129
130 As can be seen above, once any scmd is added to shost->eh_cmd_q,
131SHOST_RECOVERY shost_state bit is turned on. This prevents any new
132scmd to be issued from blk queue to the host; eventually, all scmds on
133the host either complete normally, fail and get added to eh_cmd_q, or
134time out and get added to shost->eh_cmd_q.
135
136 If all scmds either complete or fail, the number of in-flight scmds
137becomes equal to the number of failed scmds - i.e. shost->host_busy ==
138shost->host_failed. This wakes up SCSI EH thread. So, once woken up,
139SCSI EH thread can expect that all in-flight commands have failed and
140are linked on shost->eh_cmd_q.
141
142 Note that this does not mean lower layers are quiescent. If a LLDD
143completed a scmd with error status, the LLDD and lower layers are
144assumed to forget about the scmd at that point. However, if a scmd
145has timed out, unless hostt->eh_timedout() made lower layers forget
146about the scmd, which currently no LLDD does, the command is still
147active as long as lower layers are concerned and completion could
148occur at any time. Of course, all such completions are ignored as the
149timer has already expired.
150
151 We'll talk about how SCSI EH takes actions to abort - make LLDD
152forget about - timed out scmds later.
153
154
155[2] How SCSI EH works
156
157 LLDD's can implement SCSI EH actions in one of the following two
158ways.
159
160 - Fine-grained EH callbacks
161 LLDD can implement fine-grained EH callbacks and let SCSI
162 midlayer drive error handling and call appropriate callbacks.
163 This will be dicussed further in [2-1].
164
165 - eh_strategy_handler() callback
166 This is one big callback which should perform whole error
167 handling. As such, it should do all choirs SCSI midlayer
168 performs during recovery. This will be discussed in [2-2].
169
170 Once recovery is complete, SCSI EH resumes normal operation by
171calling scsi_restart_operations(), which
172
173 1. Checks if door locking is needed and locks door.
174
175 2. Clears SHOST_RECOVERY shost_state bit
176
177 3. Wakes up waiters on shost->host_wait. This occurs if someone
178 calls scsi_block_when_processing_errors() on the host.
179 (*QUESTION* why is it needed? All operations will be blocked
180 anyway after it reaches blk queue.)
181
182 4. Kicks queues in all devices on the host in the asses
183
184
185[2-1] EH through fine-grained callbacks
186
187[2-1-1] Overview
188
189 If eh_strategy_handler() is not present, SCSI midlayer takes charge
190of driving error handling. EH's goals are two - make LLDD, host and
191device forget about timed out scmds and make them ready for new
192commands. A scmd is said to be recovered if the scmd is forgotten by
193lower layers and lower layers are ready to process or fail the scmd
194again.
195
196 To achieve these goals, EH performs recovery actions with increasing
197severity. Some actions are performed by issueing SCSI commands and
198others are performed by invoking one of the following fine-grained
199hostt EH callbacks. Callbacks may be omitted and omitted ones are
200considered to fail always.
201
202int (* eh_abort_handler)(struct scsi_cmnd *);
203int (* eh_device_reset_handler)(struct scsi_cmnd *);
204int (* eh_bus_reset_handler)(struct scsi_cmnd *);
205int (* eh_host_reset_handler)(struct scsi_cmnd *);
206
207 Higher-severity actions are taken only when lower-severity actions
208cannot recover some of failed scmds. Also, note that failure of the
209highest-severity action means EH failure and results in offlining of
210all unrecovered devices.
211
212 During recovery, the following rules are followed
213
214 - Recovery actions are performed on failed scmds on the to do list,
215 eh_work_q. If a recovery action succeeds for a scmd, recovered
216 scmds are removed from eh_work_q.
217
218 Note that single recovery action on a scmd can recover multiple
219 scmds. e.g. resetting a device recovers all failed scmds on the
220 device.
221
222 - Higher severity actions are taken iff eh_work_q is not empty after
223 lower severity actions are complete.
224
225 - EH reuses failed scmds to issue commands for recovery. For
226 timed-out scmds, SCSI EH ensures that LLDD forgets about a scmd
227 before reusing it for EH commands.
228
229 When a scmd is recovered, the scmd is moved from eh_work_q to EH
230local eh_done_q using scsi_eh_finish_cmd(). After all scmds are
231recovered (eh_work_q is empty), scsi_eh_flush_done_q() is invoked to
232either retry or error-finish (notify upper layer of failure) recovered
233scmds.
234
235 scmds are retried iff its sdev is still online (not offlined during
236EH), REQ_FAILFAST is not set and ++scmd->retries is less than
237scmd->allowed.
238
239
240[2-1-2] Flow of scmds through EH
241
242 1. Error completion / time out
243 ACTION: scsi_eh_scmd_add() is invoked for scmd
244 - set scmd->eh_eflags
245 - add scmd to shost->eh_cmd_q
246 - set SHOST_RECOVERY
247 - shost->host_failed++
248 LOCKING: shost->host_lock
249
250 2. EH starts
251 ACTION: move all scmds to EH's local eh_work_q. shost->eh_cmd_q
252 is cleared.
253 LOCKING: shost->host_lock (not strictly necessary, just for
254 consistency)
255
256 3. scmd recovered
257 ACTION: scsi_eh_finish_cmd() is invoked to EH-finish scmd
258 - shost->host_failed--
259 - clear scmd->eh_eflags
260 - scsi_setup_cmd_retry()
261 - move from local eh_work_q to local eh_done_q
262 LOCKING: none
263
264 4. EH completes
265 ACTION: scsi_eh_flush_done_q() retries scmds or notifies upper
266 layer of failure.
267 - scmd is removed from eh_done_q and scmd->eh_entry is cleared
268 - if retry is necessary, scmd is requeued using
269 scsi_queue_insert()
270 - otherwise, scsi_finish_command() is invoked for scmd
271 LOCKING: queue or finish function performs appropriate locking
272
273
274[2-1-3] Flow of control
275
276 EH through fine-grained callbacks start from scsi_unjam_host().
277
278<<scsi_unjam_host>>
279
280 1. Lock shost->host_lock, splice_init shost->eh_cmd_q into local
281 eh_work_q and unlock host_lock. Note that shost->eh_cmd_q is
282 cleared by this action.
283
284 2. Invoke scsi_eh_get_sense.
285
286 <<scsi_eh_get_sense>>
287
288 This action is taken for each error-completed
289 (!SCSI_EH_CANCEL_CMD) commands without valid sense data. Most
290 SCSI transports/LLDDs automatically acquire sense data on
291 command failures (autosense). Autosense is recommended for
292 performance reasons and as sense information could get out of
293 sync inbetween occurrence of CHECK CONDITION and this action.
294
295 Note that if autosense is not supported, scmd->sense_buffer
296 contains invalid sense data when error-completing the scmd
297 with scsi_done(). scsi_decide_disposition() always returns
298 FAILED in such cases thus invoking SCSI EH. When the scmd
299 reaches here, sense data is acquired and
300 scsi_decide_disposition() is called again.
301
302 1. Invoke scsi_request_sense() which issues REQUEST_SENSE
303 command. If fails, no action. Note that taking no action
304 causes higher-severity recovery to be taken for the scmd.
305
306 2. Invoke scsi_decide_disposition() on the scmd
307
308 - SUCCESS
309 scmd->retries is set to scmd->allowed preventing
310 scsi_eh_flush_done_q() from retrying the scmd and
311 scsi_eh_finish_cmd() is invoked.
312
313 - NEEDS_RETRY
314 scsi_eh_finish_cmd() invoked
315
316 - otherwise
317 No action.
318
319 3. If !list_empty(&eh_work_q), invoke scsi_eh_abort_cmds().
320
321 <<scsi_eh_abort_cmds>>
322
323 This action is taken for each timed out command.
324 hostt->eh_abort_handler() is invoked for each scmd. The
325 handler returns SUCCESS if it has succeeded to make LLDD and
326 all related hardware forget about the scmd.
327
328 If a timedout scmd is successfully aborted and the sdev is
329 either offline or ready, scsi_eh_finish_cmd() is invoked for
330 the scmd. Otherwise, the scmd is left in eh_work_q for
331 higher-severity actions.
332
333 Note that both offline and ready status mean that the sdev is
334 ready to process new scmds, where processing also implies
335 immediate failing; thus, if a sdev is in one of the two
336 states, no further recovery action is needed.
337
338 Device readiness is tested using scsi_eh_tur() which issues
339 TEST_UNIT_READY command. Note that the scmd must have been
340 aborted successfully before reusing it for TEST_UNIT_READY.
341
342 4. If !list_empty(&eh_work_q), invoke scsi_eh_ready_devs()
343
344 <<scsi_eh_ready_devs>>
345
346 This function takes four increasingly more severe measures to
347 make failed sdevs ready for new commands.
348
349 1. Invoke scsi_eh_stu()
350
351 <<scsi_eh_stu>>
352
353 For each sdev which has failed scmds with valid sense data
354 of which scsi_check_sense()'s verdict is FAILED,
355 START_STOP_UNIT command is issued w/ start=1. Note that
356 as we explicitly choose error-completed scmds, it is known
357 that lower layers have forgotten about the scmd and we can
358 reuse it for STU.
359
360 If STU succeeds and the sdev is either offline or ready,
361 all failed scmds on the sdev are EH-finished with
362 scsi_eh_finish_cmd().
363
364 *NOTE* If hostt->eh_abort_handler() isn't implemented or
365 failed, we may still have timed out scmds at this point
366 and STU doesn't make lower layers forget about those
367 scmds. Yet, this function EH-finish all scmds on the sdev
368 if STU succeeds leaving lower layers in an inconsistent
369 state. It seems that STU action should be taken only when
370 a sdev has no timed out scmd.
371
372 2. If !list_empty(&eh_work_q), invoke scsi_eh_bus_device_reset().
373
374 <<scsi_eh_bus_device_reset>>
375
376 This action is very similar to scsi_eh_stu() except that,
377 instead of issuing STU, hostt->eh_device_reset_handler()
378 is used. Also, as we're not issuing SCSI commands and
379 resetting clears all scmds on the sdev, there is no need
380 to choose error-completed scmds.
381
382 3. If !list_empty(&eh_work_q), invoke scsi_eh_bus_reset()
383
384 <<scsi_eh_bus_reset>>
385
386 hostt->eh_bus_reset_handler() is invoked for each channel
387 with failed scmds. If bus reset succeeds, all failed
388 scmds on all ready or offline sdevs on the channel are
389 EH-finished.
390
391 4. If !list_empty(&eh_work_q), invoke scsi_eh_host_reset()
392
393 <<scsi_eh_host_reset>>
394
395 This is the last resort. hostt->eh_host_reset_handler()
396 is invoked. If host reset succeeds, all failed scmds on
397 all ready or offline sdevs on the host are EH-finished.
398
399 5. If !list_empty(&eh_work_q), invoke scsi_eh_offline_sdevs()
400
401 <<scsi_eh_offline_sdevs>>
402
403 Take all sdevs which still have unrecovered scmds offline
404 and EH-finish the scmds.
405
406 5. Invoke scsi_eh_flush_done_q().
407
408 <<scsi_eh_flush_done_q>>
409
410 At this point all scmds are recovered (or given up) and
411 put on eh_done_q by scsi_eh_finish_cmd(). This function
412 flushes eh_done_q by either retrying or notifying upper
413 layer of failure of the scmds.
414
415
416[2-2] EH through hostt->eh_strategy_handler()
417
418 hostt->eh_strategy_handler() is invoked in the place of
419scsi_unjam_host() and it is responsible for whole recovery process.
420On completion, the handler should have made lower layers forget about
421all failed scmds and either ready for new commands or offline. Also,
422it should perform SCSI EH maintenance choirs to maintain integrity of
423SCSI midlayer. IOW, of the steps described in [2-1-2], all steps
424except for #1 must be implemented by eh_strategy_handler().
425
426
427[2-2-1] Pre hostt->eh_strategy_handler() SCSI midlayer conditions
428
429 The following conditions are true on entry to the handler.
430
431 - Each failed scmd's eh_flags field is set appropriately.
432
433 - Each failed scmd is linked on scmd->eh_cmd_q by scmd->eh_entry.
434
435 - SHOST_RECOVERY is set.
436
437 - shost->host_failed == shost->host_busy
438
439
440[2-2-2] Post hostt->eh_strategy_handler() SCSI midlayer conditions
441
442 The following conditions must be true on exit from the handler.
443
444 - shost->host_failed is zero.
445
446 - Each scmd's eh_eflags field is cleared.
447
448 - Each scmd is in such a state that scsi_setup_cmd_retry() on the
449 scmd doesn't make any difference.
450
451 - shost->eh_cmd_q is cleared.
452
453 - Each scmd->eh_entry is cleared.
454
455 - Either scsi_queue_insert() or scsi_finish_command() is called on
456 each scmd. Note that the handler is free to use scmd->retries and
457 ->allowed to limit the number of retries.
458
459
460[2-2-3] Things to consider
461
462 - Know that timed out scmds are still active on lower layers. Make
463 lower layers forget about them before doing anything else with
464 those scmds.
465
466 - For consistency, when accessing/modifying shost data structure,
467 grab shost->host_lock.
468
469 - On completion, each failed sdev must have forgotten about all
470 active scmds.
471
472 - On completion, each failed sdev must be ready for new commands or
473 offline.
474
475
476--
477Tejun Heo
478htejun@gmail.com
47911th September 2005
diff --git a/Documentation/usb/proc_usb_info.txt b/Documentation/usb/proc_usb_info.txt
index 729c72d34c89..f86550fe38ee 100644
--- a/Documentation/usb/proc_usb_info.txt
+++ b/Documentation/usb/proc_usb_info.txt
@@ -20,7 +20,7 @@ the /proc/bus/usb/BBB/DDD files.
20 20
21 to /etc/fstab. This will mount usbfs at each reboot. 21 to /etc/fstab. This will mount usbfs at each reboot.
22 You can then issue `cat /proc/bus/usb/devices` to extract 22 You can then issue `cat /proc/bus/usb/devices` to extract
23 USB device information, and user mode drivers can use usbfs 23 USB device information, and user mode drivers can use usbfs
24 to interact with USB devices. 24 to interact with USB devices.
25 25
26 There are a number of mount options supported by usbfs. 26 There are a number of mount options supported by usbfs.
@@ -32,7 +32,7 @@ the /proc/bus/usb/BBB/DDD files.
32 still see references to the older "usbdevfs" name. 32 still see references to the older "usbdevfs" name.
33 33
34For more information on mounting the usbfs file system, see the 34For more information on mounting the usbfs file system, see the
35"USB Device Filesystem" section of the USB Guide. The latest copy 35"USB Device Filesystem" section of the USB Guide. The latest copy
36of the USB Guide can be found at http://www.linux-usb.org/ 36of the USB Guide can be found at http://www.linux-usb.org/
37 37
38 38
@@ -133,7 +133,7 @@ B: Alloc=ddd/ddd us (xx%), #Int=ddd, #Iso=ddd
133 are the only transfers that reserve bandwidth. Control and bulk 133 are the only transfers that reserve bandwidth. Control and bulk
134 transfers use all other bandwidth, including reserved bandwidth that 134 transfers use all other bandwidth, including reserved bandwidth that
135 is not used for transfers (such as for short packets). 135 is not used for transfers (such as for short packets).
136 136
137 The percentage is how much of the "reserved" bandwidth is scheduled by 137 The percentage is how much of the "reserved" bandwidth is scheduled by
138 those transfers. For a low or full speed bus (loosely, "USB 1.1"), 138 those transfers. For a low or full speed bus (loosely, "USB 1.1"),
139 90% of the bus bandwidth is reserved. For a high speed bus (loosely, 139 90% of the bus bandwidth is reserved. For a high speed bus (loosely,
@@ -197,7 +197,7 @@ C:* #Ifs=dd Cfg#=dd Atr=xx MPwr=dddmA
197| | |__NumberOfInterfaces 197| | |__NumberOfInterfaces
198| |__ "*" indicates the active configuration (others are " ") 198| |__ "*" indicates the active configuration (others are " ")
199|__Config info tag 199|__Config info tag
200 200
201 USB devices may have multiple configurations, each of which act 201 USB devices may have multiple configurations, each of which act
202 rather differently. For example, a bus-powered configuration 202 rather differently. For example, a bus-powered configuration
203 might be much less capable than one that is self-powered. Only 203 might be much less capable than one that is self-powered. Only
@@ -228,7 +228,7 @@ I: If#=dd Alt=dd #EPs=dd Cls=xx(sssss) Sub=xx Prot=xx Driver=ssss
228 For example, default settings may not use more than a small 228 For example, default settings may not use more than a small
229 amount of periodic bandwidth. To use significant fractions 229 amount of periodic bandwidth. To use significant fractions
230 of bus bandwidth, drivers must select a non-default altsetting. 230 of bus bandwidth, drivers must select a non-default altsetting.
231 231
232 Only one setting for an interface may be active at a time, and 232 Only one setting for an interface may be active at a time, and
233 only one driver may bind to an interface at a time. Most devices 233 only one driver may bind to an interface at a time. Most devices
234 have only one alternate setting per interface. 234 have only one alternate setting per interface.
@@ -297,18 +297,21 @@ S: SerialNumber=dce0
297C:* #Ifs= 1 Cfg#= 1 Atr=40 MxPwr= 0mA 297C:* #Ifs= 1 Cfg#= 1 Atr=40 MxPwr= 0mA
298I: If#= 0 Alt= 0 #EPs= 1 Cls=09(hub ) Sub=00 Prot=00 Driver=hub 298I: If#= 0 Alt= 0 #EPs= 1 Cls=09(hub ) Sub=00 Prot=00 Driver=hub
299E: Ad=81(I) Atr=03(Int.) MxPS= 8 Ivl=255ms 299E: Ad=81(I) Atr=03(Int.) MxPS= 8 Ivl=255ms
300
300T: Bus=00 Lev=01 Prnt=01 Port=00 Cnt=01 Dev#= 2 Spd=12 MxCh= 4 301T: Bus=00 Lev=01 Prnt=01 Port=00 Cnt=01 Dev#= 2 Spd=12 MxCh= 4
301D: Ver= 1.00 Cls=09(hub ) Sub=00 Prot=00 MxPS= 8 #Cfgs= 1 302D: Ver= 1.00 Cls=09(hub ) Sub=00 Prot=00 MxPS= 8 #Cfgs= 1
302P: Vendor=0451 ProdID=1446 Rev= 1.00 303P: Vendor=0451 ProdID=1446 Rev= 1.00
303C:* #Ifs= 1 Cfg#= 1 Atr=e0 MxPwr=100mA 304C:* #Ifs= 1 Cfg#= 1 Atr=e0 MxPwr=100mA
304I: If#= 0 Alt= 0 #EPs= 1 Cls=09(hub ) Sub=00 Prot=00 Driver=hub 305I: If#= 0 Alt= 0 #EPs= 1 Cls=09(hub ) Sub=00 Prot=00 Driver=hub
305E: Ad=81(I) Atr=03(Int.) MxPS= 1 Ivl=255ms 306E: Ad=81(I) Atr=03(Int.) MxPS= 1 Ivl=255ms
307
306T: Bus=00 Lev=02 Prnt=02 Port=00 Cnt=01 Dev#= 3 Spd=1.5 MxCh= 0 308T: Bus=00 Lev=02 Prnt=02 Port=00 Cnt=01 Dev#= 3 Spd=1.5 MxCh= 0
307D: Ver= 1.00 Cls=00(>ifc ) Sub=00 Prot=00 MxPS= 8 #Cfgs= 1 309D: Ver= 1.00 Cls=00(>ifc ) Sub=00 Prot=00 MxPS= 8 #Cfgs= 1
308P: Vendor=04b4 ProdID=0001 Rev= 0.00 310P: Vendor=04b4 ProdID=0001 Rev= 0.00
309C:* #Ifs= 1 Cfg#= 1 Atr=80 MxPwr=100mA 311C:* #Ifs= 1 Cfg#= 1 Atr=80 MxPwr=100mA
310I: If#= 0 Alt= 0 #EPs= 1 Cls=03(HID ) Sub=01 Prot=02 Driver=mouse 312I: If#= 0 Alt= 0 #EPs= 1 Cls=03(HID ) Sub=01 Prot=02 Driver=mouse
311E: Ad=81(I) Atr=03(Int.) MxPS= 3 Ivl= 10ms 313E: Ad=81(I) Atr=03(Int.) MxPS= 3 Ivl= 10ms
314
312T: Bus=00 Lev=02 Prnt=02 Port=02 Cnt=02 Dev#= 4 Spd=12 MxCh= 0 315T: Bus=00 Lev=02 Prnt=02 Port=02 Cnt=02 Dev#= 4 Spd=12 MxCh= 0
313D: Ver= 1.00 Cls=00(>ifc ) Sub=00 Prot=00 MxPS= 8 #Cfgs= 1 316D: Ver= 1.00 Cls=00(>ifc ) Sub=00 Prot=00 MxPS= 8 #Cfgs= 1
314P: Vendor=0565 ProdID=0001 Rev= 1.08 317P: Vendor=0565 ProdID=0001 Rev= 1.08
diff --git a/Documentation/x86_64/boot-options.txt b/Documentation/x86_64/boot-options.txt
index 678e8f192db2..ffe1c062088b 100644
--- a/Documentation/x86_64/boot-options.txt
+++ b/Documentation/x86_64/boot-options.txt
@@ -11,6 +11,11 @@ Machine check
11 If your BIOS doesn't do that it's a good idea to enable though 11 If your BIOS doesn't do that it's a good idea to enable though
12 to make sure you log even machine check events that result 12 to make sure you log even machine check events that result
13 in a reboot. 13 in a reboot.
14 mce=tolerancelevel (number)
15 0: always panic, 1: panic if deadlock possible,
16 2: try to avoid panic, 3: never panic or exit (for testing)
17 default is 1
18 Can be also set using sysfs which is preferable.
14 19
15 nomce (for compatibility with i386): same as mce=off 20 nomce (for compatibility with i386): same as mce=off
16 21