diff options
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/DocBook/kernel-api.tmpl | 2 | ||||
-rw-r--r-- | Documentation/devices.txt | 2 | ||||
-rw-r--r-- | Documentation/feature-removal-schedule.txt | 3 | ||||
-rw-r--r-- | Documentation/filesystems/knfsd-stats.txt | 159 | ||||
-rw-r--r-- | Documentation/filesystems/nfs41-server.txt | 161 | ||||
-rw-r--r-- | Documentation/kernel-parameters.txt | 481 | ||||
-rw-r--r-- | Documentation/powerpc/dts-bindings/fsl/upm-nand.txt | 39 | ||||
-rw-r--r-- | Documentation/powerpc/dts-bindings/gpio/led.txt | 46 | ||||
-rw-r--r-- | Documentation/scsi/aacraid.txt | 15 |
9 files changed, 628 insertions, 280 deletions
diff --git a/Documentation/DocBook/kernel-api.tmpl b/Documentation/DocBook/kernel-api.tmpl index 58c194572c76..d6ac5d61820e 100644 --- a/Documentation/DocBook/kernel-api.tmpl +++ b/Documentation/DocBook/kernel-api.tmpl | |||
@@ -259,7 +259,7 @@ X!Earch/x86/kernel/mca_32.c | |||
259 | !Eblock/blk-tag.c | 259 | !Eblock/blk-tag.c |
260 | !Iblock/blk-tag.c | 260 | !Iblock/blk-tag.c |
261 | !Eblock/blk-integrity.c | 261 | !Eblock/blk-integrity.c |
262 | !Iblock/blktrace.c | 262 | !Ikernel/trace/blktrace.c |
263 | !Iblock/genhd.c | 263 | !Iblock/genhd.c |
264 | !Eblock/genhd.c | 264 | !Eblock/genhd.c |
265 | </chapter> | 265 | </chapter> |
diff --git a/Documentation/devices.txt b/Documentation/devices.txt index 327de1624759..4d70df63d1d3 100644 --- a/Documentation/devices.txt +++ b/Documentation/devices.txt | |||
@@ -3,7 +3,7 @@ | |||
3 | 3 | ||
4 | Maintained by Alan Cox <device@lanana.org> | 4 | Maintained by Alan Cox <device@lanana.org> |
5 | 5 | ||
6 | Last revised: 29 November 2006 | 6 | Last revised: 6th April 2009 |
7 | 7 | ||
8 | This list is the Linux Device List, the official registry of allocated | 8 | This list is the Linux Device List, the official registry of allocated |
9 | device numbers and /dev directory nodes for the Linux operating | 9 | device numbers and /dev directory nodes for the Linux operating |
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt index 39246fc11257..7e2af10e8264 100644 --- a/Documentation/feature-removal-schedule.txt +++ b/Documentation/feature-removal-schedule.txt | |||
@@ -354,7 +354,8 @@ Who: Krzysztof Piotr Oledzki <ole@ans.pl> | |||
354 | 354 | ||
355 | --------------------------- | 355 | --------------------------- |
356 | 356 | ||
357 | What: i2c_attach_client(), i2c_detach_client(), i2c_driver->detach_client() | 357 | What: i2c_attach_client(), i2c_detach_client(), i2c_driver->detach_client(), |
358 | i2c_adapter->client_register(), i2c_adapter->client_unregister | ||
358 | When: 2.6.30 | 359 | When: 2.6.30 |
359 | Check: i2c_attach_client i2c_detach_client | 360 | Check: i2c_attach_client i2c_detach_client |
360 | Why: Deprecated by the new (standard) device driver binding model. Use | 361 | Why: Deprecated by the new (standard) device driver binding model. Use |
diff --git a/Documentation/filesystems/knfsd-stats.txt b/Documentation/filesystems/knfsd-stats.txt new file mode 100644 index 000000000000..64ced5149d37 --- /dev/null +++ b/Documentation/filesystems/knfsd-stats.txt | |||
@@ -0,0 +1,159 @@ | |||
1 | |||
2 | Kernel NFS Server Statistics | ||
3 | ============================ | ||
4 | |||
5 | This document describes the format and semantics of the statistics | ||
6 | which the kernel NFS server makes available to userspace. These | ||
7 | statistics are available in several text form pseudo files, each of | ||
8 | which is described separately below. | ||
9 | |||
10 | In most cases you don't need to know these formats, as the nfsstat(8) | ||
11 | program from the nfs-utils distribution provides a helpful command-line | ||
12 | interface for extracting and printing them. | ||
13 | |||
14 | All the files described here are formatted as a sequence of text lines, | ||
15 | separated by newline '\n' characters. Lines beginning with a hash | ||
16 | '#' character are comments intended for humans and should be ignored | ||
17 | by parsing routines. All other lines contain a sequence of fields | ||
18 | separated by whitespace. | ||
19 | |||
20 | /proc/fs/nfsd/pool_stats | ||
21 | ------------------------ | ||
22 | |||
23 | This file is available in kernels from 2.6.30 onwards, if the | ||
24 | /proc/fs/nfsd filesystem is mounted (it almost always should be). | ||
25 | |||
26 | The first line is a comment which describes the fields present in | ||
27 | all the other lines. The other lines present the following data as | ||
28 | a sequence of unsigned decimal numeric fields. One line is shown | ||
29 | for each NFS thread pool. | ||
30 | |||
31 | All counters are 64 bits wide and wrap naturally. There is no way | ||
32 | to zero these counters, instead applications should do their own | ||
33 | rate conversion. | ||
34 | |||
35 | pool | ||
36 | The id number of the NFS thread pool to which this line applies. | ||
37 | This number does not change. | ||
38 | |||
39 | Thread pool ids are a contiguous set of small integers starting | ||
40 | at zero. The maximum value depends on the thread pool mode, but | ||
41 | currently cannot be larger than the number of CPUs in the system. | ||
42 | Note that in the default case there will be a single thread pool | ||
43 | which contains all the nfsd threads and all the CPUs in the system, | ||
44 | and thus this file will have a single line with a pool id of "0". | ||
45 | |||
46 | packets-arrived | ||
47 | Counts how many NFS packets have arrived. More precisely, this | ||
48 | is the number of times that the network stack has notified the | ||
49 | sunrpc server layer that new data may be available on a transport | ||
50 | (e.g. an NFS or UDP socket or an NFS/RDMA endpoint). | ||
51 | |||
52 | Depending on the NFS workload patterns and various network stack | ||
53 | effects (such as Large Receive Offload) which can combine packets | ||
54 | on the wire, this may be either more or less than the number | ||
55 | of NFS calls received (which statistic is available elsewhere). | ||
56 | However this is a more accurate and less workload-dependent measure | ||
57 | of how much CPU load is being placed on the sunrpc server layer | ||
58 | due to NFS network traffic. | ||
59 | |||
60 | sockets-enqueued | ||
61 | Counts how many times an NFS transport is enqueued to wait for | ||
62 | an nfsd thread to service it, i.e. no nfsd thread was considered | ||
63 | available. | ||
64 | |||
65 | The circumstance this statistic tracks indicates that there was NFS | ||
66 | network-facing work to be done but it couldn't be done immediately, | ||
67 | thus introducing a small delay in servicing NFS calls. The ideal | ||
68 | rate of change for this counter is zero; significantly non-zero | ||
69 | values may indicate a performance limitation. | ||
70 | |||
71 | This can happen either because there are too few nfsd threads in the | ||
72 | thread pool for the NFS workload (the workload is thread-limited), | ||
73 | or because the NFS workload needs more CPU time than is available in | ||
74 | the thread pool (the workload is CPU-limited). In the former case, | ||
75 | configuring more nfsd threads will probably improve the performance | ||
76 | of the NFS workload. In the latter case, the sunrpc server layer is | ||
77 | already choosing not to wake idle nfsd threads because there are too | ||
78 | many nfsd threads which want to run but cannot, so configuring more | ||
79 | nfsd threads will make no difference whatsoever. The overloads-avoided | ||
80 | statistic (see below) can be used to distinguish these cases. | ||
81 | |||
82 | threads-woken | ||
83 | Counts how many times an idle nfsd thread is woken to try to | ||
84 | receive some data from an NFS transport. | ||
85 | |||
86 | This statistic tracks the circumstance where incoming | ||
87 | network-facing NFS work is being handled quickly, which is a good | ||
88 | thing. The ideal rate of change for this counter will be close | ||
89 | to but less than the rate of change of the packets-arrived counter. | ||
90 | |||
91 | overloads-avoided | ||
92 | Counts how many times the sunrpc server layer chose not to wake an | ||
93 | nfsd thread, despite the presence of idle nfsd threads, because | ||
94 | too many nfsd threads had been recently woken but could not get | ||
95 | enough CPU time to actually run. | ||
96 | |||
97 | This statistic counts a circumstance where the sunrpc layer | ||
98 | heuristically avoids overloading the CPU scheduler with too many | ||
99 | runnable nfsd threads. The ideal rate of change for this counter | ||
100 | is zero. Significant non-zero values indicate that the workload | ||
101 | is CPU limited. Usually this is associated with heavy CPU usage | ||
102 | on all the CPUs in the nfsd thread pool. | ||
103 | |||
104 | If a sustained large overloads-avoided rate is detected on a pool, | ||
105 | the top(1) utility should be used to check for the following | ||
106 | pattern of CPU usage on all the CPUs associated with the given | ||
107 | nfsd thread pool. | ||
108 | |||
109 | - %us ~= 0 (as you're *NOT* running applications on your NFS server) | ||
110 | |||
111 | - %wa ~= 0 | ||
112 | |||
113 | - %id ~= 0 | ||
114 | |||
115 | - %sy + %hi + %si ~= 100 | ||
116 | |||
117 | If this pattern is seen, configuring more nfsd threads will *not* | ||
118 | improve the performance of the workload. If this patten is not | ||
119 | seen, then something more subtle is wrong. | ||
120 | |||
121 | threads-timedout | ||
122 | Counts how many times an nfsd thread triggered an idle timeout, | ||
123 | i.e. was not woken to handle any incoming network packets for | ||
124 | some time. | ||
125 | |||
126 | This statistic counts a circumstance where there are more nfsd | ||
127 | threads configured than can be used by the NFS workload. This is | ||
128 | a clue that the number of nfsd threads can be reduced without | ||
129 | affecting performance. Unfortunately, it's only a clue and not | ||
130 | a strong indication, for a couple of reasons: | ||
131 | |||
132 | - Currently the rate at which the counter is incremented is quite | ||
133 | slow; the idle timeout is 60 minutes. Unless the NFS workload | ||
134 | remains constant for hours at a time, this counter is unlikely | ||
135 | to be providing information that is still useful. | ||
136 | |||
137 | - It is usually a wise policy to provide some slack, | ||
138 | i.e. configure a few more nfsds than are currently needed, | ||
139 | to allow for future spikes in load. | ||
140 | |||
141 | |||
142 | Note that incoming packets on NFS transports will be dealt with in | ||
143 | one of three ways. An nfsd thread can be woken (threads-woken counts | ||
144 | this case), or the transport can be enqueued for later attention | ||
145 | (sockets-enqueued counts this case), or the packet can be temporarily | ||
146 | deferred because the transport is currently being used by an nfsd | ||
147 | thread. This last case is not very interesting and is not explicitly | ||
148 | counted, but can be inferred from the other counters thus: | ||
149 | |||
150 | packets-deferred = packets-arrived - ( sockets-enqueued + threads-woken ) | ||
151 | |||
152 | |||
153 | More | ||
154 | ---- | ||
155 | Descriptions of the other statistics file should go here. | ||
156 | |||
157 | |||
158 | Greg Banks <gnb@sgi.com> | ||
159 | 26 Mar 2009 | ||
diff --git a/Documentation/filesystems/nfs41-server.txt b/Documentation/filesystems/nfs41-server.txt new file mode 100644 index 000000000000..05d81cbcb2e1 --- /dev/null +++ b/Documentation/filesystems/nfs41-server.txt | |||
@@ -0,0 +1,161 @@ | |||
1 | NFSv4.1 Server Implementation | ||
2 | |||
3 | Server support for minorversion 1 can be controlled using the | ||
4 | /proc/fs/nfsd/versions control file. The string output returned | ||
5 | by reading this file will contain either "+4.1" or "-4.1" | ||
6 | correspondingly. | ||
7 | |||
8 | Currently, server support for minorversion 1 is disabled by default. | ||
9 | It can be enabled at run time by writing the string "+4.1" to | ||
10 | the /proc/fs/nfsd/versions control file. Note that to write this | ||
11 | control file, the nfsd service must be taken down. Use your user-mode | ||
12 | nfs-utils to set this up; see rpc.nfsd(8) | ||
13 | |||
14 | The NFSv4 minorversion 1 (NFSv4.1) implementation in nfsd is based | ||
15 | on the latest NFSv4.1 Internet Draft: | ||
16 | http://tools.ietf.org/html/draft-ietf-nfsv4-minorversion1-29 | ||
17 | |||
18 | From the many new features in NFSv4.1 the current implementation | ||
19 | focuses on the mandatory-to-implement NFSv4.1 Sessions, providing | ||
20 | "exactly once" semantics and better control and throttling of the | ||
21 | resources allocated for each client. | ||
22 | |||
23 | Other NFSv4.1 features, Parallel NFS operations in particular, | ||
24 | are still under development out of tree. | ||
25 | See http://wiki.linux-nfs.org/wiki/index.php/PNFS_prototype_design | ||
26 | for more information. | ||
27 | |||
28 | The table below, taken from the NFSv4.1 document, lists | ||
29 | the operations that are mandatory to implement (REQ), optional | ||
30 | (OPT), and NFSv4.0 operations that are required not to implement (MNI) | ||
31 | in minor version 1. The first column indicates the operations that | ||
32 | are not supported yet by the linux server implementation. | ||
33 | |||
34 | The OPTIONAL features identified and their abbreviations are as follows: | ||
35 | pNFS Parallel NFS | ||
36 | FDELG File Delegations | ||
37 | DDELG Directory Delegations | ||
38 | |||
39 | The following abbreviations indicate the linux server implementation status. | ||
40 | I Implemented NFSv4.1 operations. | ||
41 | NS Not Supported. | ||
42 | NS* unimplemented optional feature. | ||
43 | P pNFS features implemented out of tree. | ||
44 | PNS pNFS features that are not supported yet (out of tree). | ||
45 | |||
46 | Operations | ||
47 | |||
48 | +----------------------+------------+--------------+----------------+ | ||
49 | | Operation | REQ, REC, | Feature | Definition | | ||
50 | | | OPT, or | (REQ, REC, | | | ||
51 | | | MNI | or OPT) | | | ||
52 | +----------------------+------------+--------------+----------------+ | ||
53 | | ACCESS | REQ | | Section 18.1 | | ||
54 | NS | BACKCHANNEL_CTL | REQ | | Section 18.33 | | ||
55 | NS | BIND_CONN_TO_SESSION | REQ | | Section 18.34 | | ||
56 | | CLOSE | REQ | | Section 18.2 | | ||
57 | | COMMIT | REQ | | Section 18.3 | | ||
58 | | CREATE | REQ | | Section 18.4 | | ||
59 | I | CREATE_SESSION | REQ | | Section 18.36 | | ||
60 | NS*| DELEGPURGE | OPT | FDELG (REQ) | Section 18.5 | | ||
61 | | DELEGRETURN | OPT | FDELG, | Section 18.6 | | ||
62 | | | | DDELG, pNFS | | | ||
63 | | | | (REQ) | | | ||
64 | NS | DESTROY_CLIENTID | REQ | | Section 18.50 | | ||
65 | I | DESTROY_SESSION | REQ | | Section 18.37 | | ||
66 | I | EXCHANGE_ID | REQ | | Section 18.35 | | ||
67 | NS | FREE_STATEID | REQ | | Section 18.38 | | ||
68 | | GETATTR | REQ | | Section 18.7 | | ||
69 | P | GETDEVICEINFO | OPT | pNFS (REQ) | Section 18.40 | | ||
70 | P | GETDEVICELIST | OPT | pNFS (OPT) | Section 18.41 | | ||
71 | | GETFH | REQ | | Section 18.8 | | ||
72 | NS*| GET_DIR_DELEGATION | OPT | DDELG (REQ) | Section 18.39 | | ||
73 | P | LAYOUTCOMMIT | OPT | pNFS (REQ) | Section 18.42 | | ||
74 | P | LAYOUTGET | OPT | pNFS (REQ) | Section 18.43 | | ||
75 | P | LAYOUTRETURN | OPT | pNFS (REQ) | Section 18.44 | | ||
76 | | LINK | OPT | | Section 18.9 | | ||
77 | | LOCK | REQ | | Section 18.10 | | ||
78 | | LOCKT | REQ | | Section 18.11 | | ||
79 | | LOCKU | REQ | | Section 18.12 | | ||
80 | | LOOKUP | REQ | | Section 18.13 | | ||
81 | | LOOKUPP | REQ | | Section 18.14 | | ||
82 | | NVERIFY | REQ | | Section 18.15 | | ||
83 | | OPEN | REQ | | Section 18.16 | | ||
84 | NS*| OPENATTR | OPT | | Section 18.17 | | ||
85 | | OPEN_CONFIRM | MNI | | N/A | | ||
86 | | OPEN_DOWNGRADE | REQ | | Section 18.18 | | ||
87 | | PUTFH | REQ | | Section 18.19 | | ||
88 | | PUTPUBFH | REQ | | Section 18.20 | | ||
89 | | PUTROOTFH | REQ | | Section 18.21 | | ||
90 | | READ | REQ | | Section 18.22 | | ||
91 | | READDIR | REQ | | Section 18.23 | | ||
92 | | READLINK | OPT | | Section 18.24 | | ||
93 | NS | RECLAIM_COMPLETE | REQ | | Section 18.51 | | ||
94 | | RELEASE_LOCKOWNER | MNI | | N/A | | ||
95 | | REMOVE | REQ | | Section 18.25 | | ||
96 | | RENAME | REQ | | Section 18.26 | | ||
97 | | RENEW | MNI | | N/A | | ||
98 | | RESTOREFH | REQ | | Section 18.27 | | ||
99 | | SAVEFH | REQ | | Section 18.28 | | ||
100 | | SECINFO | REQ | | Section 18.29 | | ||
101 | NS | SECINFO_NO_NAME | REC | pNFS files | Section 18.45, | | ||
102 | | | | layout (REQ) | Section 13.12 | | ||
103 | I | SEQUENCE | REQ | | Section 18.46 | | ||
104 | | SETATTR | REQ | | Section 18.30 | | ||
105 | | SETCLIENTID | MNI | | N/A | | ||
106 | | SETCLIENTID_CONFIRM | MNI | | N/A | | ||
107 | NS | SET_SSV | REQ | | Section 18.47 | | ||
108 | NS | TEST_STATEID | REQ | | Section 18.48 | | ||
109 | | VERIFY | REQ | | Section 18.31 | | ||
110 | NS*| WANT_DELEGATION | OPT | FDELG (OPT) | Section 18.49 | | ||
111 | | WRITE | REQ | | Section 18.32 | | ||
112 | |||
113 | Callback Operations | ||
114 | |||
115 | +-------------------------+-----------+-------------+---------------+ | ||
116 | | Operation | REQ, REC, | Feature | Definition | | ||
117 | | | OPT, or | (REQ, REC, | | | ||
118 | | | MNI | or OPT) | | | ||
119 | +-------------------------+-----------+-------------+---------------+ | ||
120 | | CB_GETATTR | OPT | FDELG (REQ) | Section 20.1 | | ||
121 | P | CB_LAYOUTRECALL | OPT | pNFS (REQ) | Section 20.3 | | ||
122 | NS*| CB_NOTIFY | OPT | DDELG (REQ) | Section 20.4 | | ||
123 | P | CB_NOTIFY_DEVICEID | OPT | pNFS (OPT) | Section 20.12 | | ||
124 | NS*| CB_NOTIFY_LOCK | OPT | | Section 20.11 | | ||
125 | NS*| CB_PUSH_DELEG | OPT | FDELG (OPT) | Section 20.5 | | ||
126 | | CB_RECALL | OPT | FDELG, | Section 20.2 | | ||
127 | | | | DDELG, pNFS | | | ||
128 | | | | (REQ) | | | ||
129 | NS*| CB_RECALL_ANY | OPT | FDELG, | Section 20.6 | | ||
130 | | | | DDELG, pNFS | | | ||
131 | | | | (REQ) | | | ||
132 | NS | CB_RECALL_SLOT | REQ | | Section 20.8 | | ||
133 | NS*| CB_RECALLABLE_OBJ_AVAIL | OPT | DDELG, pNFS | Section 20.7 | | ||
134 | | | | (REQ) | | | ||
135 | I | CB_SEQUENCE | OPT | FDELG, | Section 20.9 | | ||
136 | | | | DDELG, pNFS | | | ||
137 | | | | (REQ) | | | ||
138 | NS*| CB_WANTS_CANCELLED | OPT | FDELG, | Section 20.10 | | ||
139 | | | | DDELG, pNFS | | | ||
140 | | | | (REQ) | | | ||
141 | +-------------------------+-----------+-------------+---------------+ | ||
142 | |||
143 | Implementation notes: | ||
144 | |||
145 | EXCHANGE_ID: | ||
146 | * only SP4_NONE state protection supported | ||
147 | * implementation ids are ignored | ||
148 | |||
149 | CREATE_SESSION: | ||
150 | * backchannel attributes are ignored | ||
151 | * backchannel security parameters are ignored | ||
152 | |||
153 | SEQUENCE: | ||
154 | * no support for dynamic slot table renegotiation (optional) | ||
155 | |||
156 | nfsv4.1 COMPOUND rules: | ||
157 | The following cases aren't supported yet: | ||
158 | * Enforcing of NFS4ERR_NOT_ONLY_OP for: BIND_CONN_TO_SESSION, CREATE_SESSION, | ||
159 | DESTROY_CLIENTID, DESTROY_SESSION, EXCHANGE_ID. | ||
160 | * DESTROY_SESSION MUST be the final operation in the COMPOUND request. | ||
161 | |||
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 2895ce29dea5..6172e4360f60 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt | |||
@@ -153,60 +153,6 @@ and is between 256 and 4096 characters. It is defined in the file | |||
153 | 1,0: use 1st APIC table | 153 | 1,0: use 1st APIC table |
154 | default: 0 | 154 | default: 0 |
155 | 155 | ||
156 | acpi_sleep= [HW,ACPI] Sleep options | ||
157 | Format: { s3_bios, s3_mode, s3_beep, s4_nohwsig, | ||
158 | old_ordering, s4_nonvs } | ||
159 | See Documentation/power/video.txt for information on | ||
160 | s3_bios and s3_mode. | ||
161 | s3_beep is for debugging; it makes the PC's speaker beep | ||
162 | as soon as the kernel's real-mode entry point is called. | ||
163 | s4_nohwsig prevents ACPI hardware signature from being | ||
164 | used during resume from hibernation. | ||
165 | old_ordering causes the ACPI 1.0 ordering of the _PTS | ||
166 | control method, with respect to putting devices into | ||
167 | low power states, to be enforced (the ACPI 2.0 ordering | ||
168 | of _PTS is used by default). | ||
169 | s4_nonvs prevents the kernel from saving/restoring the | ||
170 | ACPI NVS memory during hibernation. | ||
171 | |||
172 | acpi_sci= [HW,ACPI] ACPI System Control Interrupt trigger mode | ||
173 | Format: { level | edge | high | low } | ||
174 | |||
175 | acpi_irq_balance [HW,ACPI] | ||
176 | ACPI will balance active IRQs | ||
177 | default in APIC mode | ||
178 | |||
179 | acpi_irq_nobalance [HW,ACPI] | ||
180 | ACPI will not move active IRQs (default) | ||
181 | default in PIC mode | ||
182 | |||
183 | acpi_irq_pci= [HW,ACPI] If irq_balance, clear listed IRQs for | ||
184 | use by PCI | ||
185 | Format: <irq>,<irq>... | ||
186 | |||
187 | acpi_irq_isa= [HW,ACPI] If irq_balance, mark listed IRQs used by ISA | ||
188 | Format: <irq>,<irq>... | ||
189 | |||
190 | acpi_no_auto_ssdt [HW,ACPI] Disable automatic loading of SSDT | ||
191 | |||
192 | acpi_os_name= [HW,ACPI] Tell ACPI BIOS the name of the OS | ||
193 | Format: To spoof as Windows 98: ="Microsoft Windows" | ||
194 | |||
195 | acpi_osi= [HW,ACPI] Modify list of supported OS interface strings | ||
196 | acpi_osi="string1" # add string1 -- only one string | ||
197 | acpi_osi="!string2" # remove built-in string2 | ||
198 | acpi_osi= # disable all strings | ||
199 | |||
200 | acpi_serialize [HW,ACPI] force serialization of AML methods | ||
201 | |||
202 | acpi_skip_timer_override [HW,ACPI] | ||
203 | Recognize and ignore IRQ0/pin2 Interrupt Override. | ||
204 | For broken nForce2 BIOS resulting in XT-PIC timer. | ||
205 | acpi_use_timer_override [HW,ACPI] | ||
206 | Use timer override. For some broken Nvidia NF5 boards | ||
207 | that require a timer override, but don't have | ||
208 | HPET | ||
209 | |||
210 | acpi_backlight= [HW,ACPI] | 156 | acpi_backlight= [HW,ACPI] |
211 | acpi_backlight=vendor | 157 | acpi_backlight=vendor |
212 | acpi_backlight=video | 158 | acpi_backlight=video |
@@ -214,11 +160,6 @@ and is between 256 and 4096 characters. It is defined in the file | |||
214 | (e.g. thinkpad_acpi, sony_acpi, etc.) instead | 160 | (e.g. thinkpad_acpi, sony_acpi, etc.) instead |
215 | of the ACPI video.ko driver. | 161 | of the ACPI video.ko driver. |
216 | 162 | ||
217 | acpi_display_output= [HW,ACPI] | ||
218 | acpi_display_output=vendor | ||
219 | acpi_display_output=video | ||
220 | See above. | ||
221 | |||
222 | acpi.debug_layer= [HW,ACPI,ACPI_DEBUG] | 163 | acpi.debug_layer= [HW,ACPI,ACPI_DEBUG] |
223 | acpi.debug_level= [HW,ACPI,ACPI_DEBUG] | 164 | acpi.debug_level= [HW,ACPI,ACPI_DEBUG] |
224 | Format: <int> | 165 | Format: <int> |
@@ -247,6 +188,41 @@ and is between 256 and 4096 characters. It is defined in the file | |||
247 | unusable. The "log_buf_len" parameter may be useful | 188 | unusable. The "log_buf_len" parameter may be useful |
248 | if you need to capture more output. | 189 | if you need to capture more output. |
249 | 190 | ||
191 | acpi_display_output= [HW,ACPI] | ||
192 | acpi_display_output=vendor | ||
193 | acpi_display_output=video | ||
194 | See above. | ||
195 | |||
196 | acpi_irq_balance [HW,ACPI] | ||
197 | ACPI will balance active IRQs | ||
198 | default in APIC mode | ||
199 | |||
200 | acpi_irq_nobalance [HW,ACPI] | ||
201 | ACPI will not move active IRQs (default) | ||
202 | default in PIC mode | ||
203 | |||
204 | acpi_irq_isa= [HW,ACPI] If irq_balance, mark listed IRQs used by ISA | ||
205 | Format: <irq>,<irq>... | ||
206 | |||
207 | acpi_irq_pci= [HW,ACPI] If irq_balance, clear listed IRQs for | ||
208 | use by PCI | ||
209 | Format: <irq>,<irq>... | ||
210 | |||
211 | acpi_no_auto_ssdt [HW,ACPI] Disable automatic loading of SSDT | ||
212 | |||
213 | acpi_os_name= [HW,ACPI] Tell ACPI BIOS the name of the OS | ||
214 | Format: To spoof as Windows 98: ="Microsoft Windows" | ||
215 | |||
216 | acpi_osi= [HW,ACPI] Modify list of supported OS interface strings | ||
217 | acpi_osi="string1" # add string1 -- only one string | ||
218 | acpi_osi="!string2" # remove built-in string2 | ||
219 | acpi_osi= # disable all strings | ||
220 | |||
221 | acpi_pm_good [X86-32,X86-64] | ||
222 | Override the pmtimer bug detection: force the kernel | ||
223 | to assume that this machine's pmtimer latches its value | ||
224 | and always returns good values. | ||
225 | |||
250 | acpi.power_nocheck= [HW,ACPI] | 226 | acpi.power_nocheck= [HW,ACPI] |
251 | Format: 1/0 enable/disable the check of power state. | 227 | Format: 1/0 enable/disable the check of power state. |
252 | On some bogus BIOS the _PSC object/_STA object of | 228 | On some bogus BIOS the _PSC object/_STA object of |
@@ -255,11 +231,6 @@ and is between 256 and 4096 characters. It is defined in the file | |||
255 | power state again in power transition. | 231 | power state again in power transition. |
256 | 1 : disable the power state check | 232 | 1 : disable the power state check |
257 | 233 | ||
258 | acpi_pm_good [X86-32,X86-64] | ||
259 | Override the pmtimer bug detection: force the kernel | ||
260 | to assume that this machine's pmtimer latches its value | ||
261 | and always returns good values. | ||
262 | |||
263 | acpi_enforce_resources= [ACPI] | 234 | acpi_enforce_resources= [ACPI] |
264 | { strict | lax | no } | 235 | { strict | lax | no } |
265 | Check for resource conflicts between native drivers | 236 | Check for resource conflicts between native drivers |
@@ -276,22 +247,6 @@ and is between 256 and 4096 characters. It is defined in the file | |||
276 | no: ACPI OperationRegions are not marked as reserved, | 247 | no: ACPI OperationRegions are not marked as reserved, |
277 | no further checks are performed. | 248 | no further checks are performed. |
278 | 249 | ||
279 | agp= [AGP] | ||
280 | { off | try_unsupported } | ||
281 | off: disable AGP support | ||
282 | try_unsupported: try to drive unsupported chipsets | ||
283 | (may crash computer or cause data corruption) | ||
284 | |||
285 | enable_timer_pin_1 [i386,x86-64] | ||
286 | Enable PIN 1 of APIC timer | ||
287 | Can be useful to work around chipset bugs | ||
288 | (in particular on some ATI chipsets). | ||
289 | The kernel tries to set a reasonable default. | ||
290 | |||
291 | disable_timer_pin_1 [i386,x86-64] | ||
292 | Disable PIN 1 of APIC timer | ||
293 | Can be useful to work around chipset bugs. | ||
294 | |||
295 | ad1848= [HW,OSS] | 250 | ad1848= [HW,OSS] |
296 | Format: <io>,<irq>,<dma>,<dma2>,<type> | 251 | Format: <io>,<irq>,<dma>,<dma2>,<type> |
297 | 252 | ||
@@ -305,6 +260,12 @@ and is between 256 and 4096 characters. It is defined in the file | |||
305 | Format: <io>,<irq>,<dma>,<mss_io>,<mpu_io>,<mpu_irq> | 260 | Format: <io>,<irq>,<dma>,<mss_io>,<mpu_io>,<mpu_irq> |
306 | See also header of sound/oss/aedsp16.c. | 261 | See also header of sound/oss/aedsp16.c. |
307 | 262 | ||
263 | agp= [AGP] | ||
264 | { off | try_unsupported } | ||
265 | off: disable AGP support | ||
266 | try_unsupported: try to drive unsupported chipsets | ||
267 | (may crash computer or cause data corruption) | ||
268 | |||
308 | aha152x= [HW,SCSI] | 269 | aha152x= [HW,SCSI] |
309 | See Documentation/scsi/aha152x.txt. | 270 | See Documentation/scsi/aha152x.txt. |
310 | 271 | ||
@@ -432,12 +393,6 @@ and is between 256 and 4096 characters. It is defined in the file | |||
432 | possible to determine what the correct size should be. | 393 | possible to determine what the correct size should be. |
433 | This option provides an override for these situations. | 394 | This option provides an override for these situations. |
434 | 395 | ||
435 | security= [SECURITY] Choose a security module to enable at boot. | ||
436 | If this boot parameter is not specified, only the first | ||
437 | security module asking for security registration will be | ||
438 | loaded. An invalid security module name will be treated | ||
439 | as if no module has been chosen. | ||
440 | |||
441 | capability.disable= | 396 | capability.disable= |
442 | [SECURITY] Disable capabilities. This would normally | 397 | [SECURITY] Disable capabilities. This would normally |
443 | be used only if an alternative security model is to be | 398 | be used only if an alternative security model is to be |
@@ -509,24 +464,6 @@ and is between 256 and 4096 characters. It is defined in the file | |||
509 | Range: 0 - 8192 | 464 | Range: 0 - 8192 |
510 | Default: 64 | 465 | Default: 64 |
511 | 466 | ||
512 | dma_debug=off If the kernel is compiled with DMA_API_DEBUG support | ||
513 | this option disables the debugging code at boot. | ||
514 | |||
515 | dma_debug_entries=<number> | ||
516 | This option allows to tune the number of preallocated | ||
517 | entries for DMA-API debugging code. One entry is | ||
518 | required per DMA-API allocation. Use this if the | ||
519 | DMA-API debugging code disables itself because the | ||
520 | architectural default is too low. | ||
521 | |||
522 | hpet= [X86-32,HPET] option to control HPET usage | ||
523 | Format: { enable (default) | disable | force | | ||
524 | verbose } | ||
525 | disable: disable HPET and use PIT instead | ||
526 | force: allow force enabled of undocumented chips (ICH4, | ||
527 | VIA, nVidia) | ||
528 | verbose: show contents of HPET registers during setup | ||
529 | |||
530 | com20020= [HW,NET] ARCnet - COM20020 chipset | 467 | com20020= [HW,NET] ARCnet - COM20020 chipset |
531 | Format: | 468 | Format: |
532 | <io>[,<irq>[,<nodeID>[,<backplane>[,<ckp>[,<timeout>]]]]] | 469 | <io>[,<irq>[,<nodeID>[,<backplane>[,<ckp>[,<timeout>]]]]] |
@@ -570,23 +507,6 @@ and is between 256 and 4096 characters. It is defined in the file | |||
570 | console=brl,ttyS0 | 507 | console=brl,ttyS0 |
571 | For now, only VisioBraille is supported. | 508 | For now, only VisioBraille is supported. |
572 | 509 | ||
573 | earlycon= [KNL] Output early console device and options. | ||
574 | uart[8250],io,<addr>[,options] | ||
575 | uart[8250],mmio,<addr>[,options] | ||
576 | Start an early, polled-mode console on the 8250/16550 | ||
577 | UART at the specified I/O port or MMIO address. | ||
578 | The options are the same as for ttyS, above. | ||
579 | |||
580 | no_console_suspend | ||
581 | [HW] Never suspend the console | ||
582 | Disable suspending of consoles during suspend and | ||
583 | hibernate operations. Once disabled, debugging | ||
584 | messages can reach various consoles while the rest | ||
585 | of the system is being put to sleep (ie, while | ||
586 | debugging driver suspend/resume hooks). This may | ||
587 | not work reliably with all consoles, but is known | ||
588 | to work with serial and VGA consoles. | ||
589 | |||
590 | coredump_filter= | 510 | coredump_filter= |
591 | [KNL] Change the default value for | 511 | [KNL] Change the default value for |
592 | /proc/<pid>/coredump_filter. | 512 | /proc/<pid>/coredump_filter. |
@@ -643,30 +563,13 @@ and is between 256 and 4096 characters. It is defined in the file | |||
643 | Format: <area>[,<node>] | 563 | Format: <area>[,<node>] |
644 | See also Documentation/networking/decnet.txt. | 564 | See also Documentation/networking/decnet.txt. |
645 | 565 | ||
646 | vt.default_blu= [VT] | 566 | default_hugepagesz= |
647 | Format: <blue0>,<blue1>,<blue2>,...,<blue15> | 567 | [same as hugepagesz=] The size of the default |
648 | Change the default blue palette of the console. | 568 | HugeTLB page size. This is the size represented by |
649 | This is a 16-member array composed of values | 569 | the legacy /proc/ hugepages APIs, used for SHM, and |
650 | ranging from 0-255. | 570 | default size when mounting hugetlbfs filesystems. |
651 | 571 | Defaults to the default architecture's huge page size | |
652 | vt.default_grn= [VT] | 572 | if not specified. |
653 | Format: <green0>,<green1>,<green2>,...,<green15> | ||
654 | Change the default green palette of the console. | ||
655 | This is a 16-member array composed of values | ||
656 | ranging from 0-255. | ||
657 | |||
658 | vt.default_red= [VT] | ||
659 | Format: <red0>,<red1>,<red2>,...,<red15> | ||
660 | Change the default red palette of the console. | ||
661 | This is a 16-member array composed of values | ||
662 | ranging from 0-255. | ||
663 | |||
664 | vt.default_utf8= | ||
665 | [VT] | ||
666 | Format=<0|1> | ||
667 | Set system-wide default UTF-8 mode for all tty's. | ||
668 | Default is 1, i.e. UTF-8 mode is enabled for all | ||
669 | newly opened terminals. | ||
670 | 573 | ||
671 | dhash_entries= [KNL] | 574 | dhash_entries= [KNL] |
672 | Set number of hash buckets for dentry cache. | 575 | Set number of hash buckets for dentry cache. |
@@ -679,27 +582,9 @@ and is between 256 and 4096 characters. It is defined in the file | |||
679 | Documentation/serial/digiepca.txt. | 582 | Documentation/serial/digiepca.txt. |
680 | 583 | ||
681 | disable_mtrr_cleanup [X86] | 584 | disable_mtrr_cleanup [X86] |
682 | enable_mtrr_cleanup [X86] | ||
683 | The kernel tries to adjust MTRR layout from continuous | 585 | The kernel tries to adjust MTRR layout from continuous |
684 | to discrete, to make X server driver able to add WB | 586 | to discrete, to make X server driver able to add WB |
685 | entry later. This parameter enables/disables that. | 587 | entry later. This parameter disables that. |
686 | |||
687 | mtrr_chunk_size=nn[KMG] [X86] | ||
688 | used for mtrr cleanup. It is largest continous chunk | ||
689 | that could hold holes aka. UC entries. | ||
690 | |||
691 | mtrr_gran_size=nn[KMG] [X86] | ||
692 | Used for mtrr cleanup. It is granularity of mtrr block. | ||
693 | Default is 1. | ||
694 | Large value could prevent small alignment from | ||
695 | using up MTRRs. | ||
696 | |||
697 | mtrr_spare_reg_nr=n [X86] | ||
698 | Format: <integer> | ||
699 | Range: 0,7 : spare reg number | ||
700 | Default : 1 | ||
701 | Used for mtrr cleanup. It is spare mtrr entries number. | ||
702 | Set to 2 or more if your graphical card needs more. | ||
703 | 588 | ||
704 | disable_mtrr_trim [X86, Intel and AMD only] | 589 | disable_mtrr_trim [X86, Intel and AMD only] |
705 | By default the kernel will trim any uncacheable | 590 | By default the kernel will trim any uncacheable |
@@ -707,12 +592,38 @@ and is between 256 and 4096 characters. It is defined in the file | |||
707 | MTRR settings. This parameter disables that behavior, | 592 | MTRR settings. This parameter disables that behavior, |
708 | possibly causing your machine to run very slowly. | 593 | possibly causing your machine to run very slowly. |
709 | 594 | ||
595 | disable_timer_pin_1 [i386,x86-64] | ||
596 | Disable PIN 1 of APIC timer | ||
597 | Can be useful to work around chipset bugs. | ||
598 | |||
710 | dmasound= [HW,OSS] Sound subsystem buffers | 599 | dmasound= [HW,OSS] Sound subsystem buffers |
711 | 600 | ||
601 | dma_debug=off If the kernel is compiled with DMA_API_DEBUG support, | ||
602 | this option disables the debugging code at boot. | ||
603 | |||
604 | dma_debug_entries=<number> | ||
605 | This option allows to tune the number of preallocated | ||
606 | entries for DMA-API debugging code. One entry is | ||
607 | required per DMA-API allocation. Use this if the | ||
608 | DMA-API debugging code disables itself because the | ||
609 | architectural default is too low. | ||
610 | |||
712 | dscc4.setup= [NET] | 611 | dscc4.setup= [NET] |
713 | 612 | ||
714 | dtc3181e= [HW,SCSI] | 613 | dtc3181e= [HW,SCSI] |
715 | 614 | ||
615 | dynamic_printk Enables pr_debug()/dev_dbg() calls if | ||
616 | CONFIG_DYNAMIC_PRINTK_DEBUG has been enabled. | ||
617 | These can also be switched on/off via | ||
618 | <debugfs>/dynamic_printk/modules | ||
619 | |||
620 | earlycon= [KNL] Output early console device and options. | ||
621 | uart[8250],io,<addr>[,options] | ||
622 | uart[8250],mmio,<addr>[,options] | ||
623 | Start an early, polled-mode console on the 8250/16550 | ||
624 | UART at the specified I/O port or MMIO address. | ||
625 | The options are the same as for ttyS, above. | ||
626 | |||
716 | earlyprintk= [X86-32,X86-64,SH,BLACKFIN] | 627 | earlyprintk= [X86-32,X86-64,SH,BLACKFIN] |
717 | earlyprintk=vga | 628 | earlyprintk=vga |
718 | earlyprintk=serial[,ttySn[,baudrate]] | 629 | earlyprintk=serial[,ttySn[,baudrate]] |
@@ -754,6 +665,17 @@ and is between 256 and 4096 characters. It is defined in the file | |||
754 | pass this option to capture kernel. | 665 | pass this option to capture kernel. |
755 | See Documentation/kdump/kdump.txt for details. | 666 | See Documentation/kdump/kdump.txt for details. |
756 | 667 | ||
668 | enable_mtrr_cleanup [X86] | ||
669 | The kernel tries to adjust MTRR layout from continuous | ||
670 | to discrete, to make X server driver able to add WB | ||
671 | entry later. This parameter enables that. | ||
672 | |||
673 | enable_timer_pin_1 [i386,x86-64] | ||
674 | Enable PIN 1 of APIC timer | ||
675 | Can be useful to work around chipset bugs | ||
676 | (in particular on some ATI chipsets). | ||
677 | The kernel tries to set a reasonable default. | ||
678 | |||
757 | enforcing [SELINUX] Set initial enforcing status. | 679 | enforcing [SELINUX] Set initial enforcing status. |
758 | Format: {"0" | "1"} | 680 | Format: {"0" | "1"} |
759 | See security/selinux/Kconfig help text. | 681 | See security/selinux/Kconfig help text. |
@@ -841,6 +763,16 @@ and is between 256 and 4096 characters. It is defined in the file | |||
841 | hisax= [HW,ISDN] | 763 | hisax= [HW,ISDN] |
842 | See Documentation/isdn/README.HiSax. | 764 | See Documentation/isdn/README.HiSax. |
843 | 765 | ||
766 | hlt [BUGS=ARM,SH] | ||
767 | |||
768 | hpet= [X86-32,HPET] option to control HPET usage | ||
769 | Format: { enable (default) | disable | force | | ||
770 | verbose } | ||
771 | disable: disable HPET and use PIT instead | ||
772 | force: allow force enabled of undocumented chips (ICH4, | ||
773 | VIA, nVidia) | ||
774 | verbose: show contents of HPET registers during setup | ||
775 | |||
844 | hugepages= [HW,X86-32,IA-64] HugeTLB pages to allocate at boot. | 776 | hugepages= [HW,X86-32,IA-64] HugeTLB pages to allocate at boot. |
845 | hugepagesz= [HW,IA-64,PPC,X86-64] The size of the HugeTLB pages. | 777 | hugepagesz= [HW,IA-64,PPC,X86-64] The size of the HugeTLB pages. |
846 | On x86-64 and powerpc, this option can be specified | 778 | On x86-64 and powerpc, this option can be specified |
@@ -850,15 +782,6 @@ and is between 256 and 4096 characters. It is defined in the file | |||
850 | (when the CPU supports the "pdpe1gb" cpuinfo flag) | 782 | (when the CPU supports the "pdpe1gb" cpuinfo flag) |
851 | Note that 1GB pages can only be allocated at boot time | 783 | Note that 1GB pages can only be allocated at boot time |
852 | using hugepages= and not freed afterwards. | 784 | using hugepages= and not freed afterwards. |
853 | default_hugepagesz= | ||
854 | [same as hugepagesz=] The size of the default | ||
855 | HugeTLB page size. This is the size represented by | ||
856 | the legacy /proc/ hugepages APIs, used for SHM, and | ||
857 | default size when mounting hugetlbfs filesystems. | ||
858 | Defaults to the default architecture's huge page size | ||
859 | if not specified. | ||
860 | |||
861 | hlt [BUGS=ARM,SH] | ||
862 | 785 | ||
863 | hvc_iucv= [S390] Number of z/VM IUCV hypervisor console (HVC) | 786 | hvc_iucv= [S390] Number of z/VM IUCV hypervisor console (HVC) |
864 | terminal devices. Valid values: 0..8 | 787 | terminal devices. Valid values: 0..8 |
@@ -919,6 +842,9 @@ and is between 256 and 4096 characters. It is defined in the file | |||
919 | idebus= [HW] (E)IDE subsystem - VLB/PCI bus speed | 842 | idebus= [HW] (E)IDE subsystem - VLB/PCI bus speed |
920 | See Documentation/ide/ide.txt. | 843 | See Documentation/ide/ide.txt. |
921 | 844 | ||
845 | ide-pci-generic.all-generic-ide [HW] (E)IDE subsystem | ||
846 | Claim all unknown PCI IDE storage controllers. | ||
847 | |||
922 | idle= [X86] | 848 | idle= [X86] |
923 | Format: idle=poll, idle=mwait, idle=halt, idle=nomwait | 849 | Format: idle=poll, idle=mwait, idle=halt, idle=nomwait |
924 | Poll forces a polling idle loop that can slightly | 850 | Poll forces a polling idle loop that can slightly |
@@ -934,9 +860,6 @@ and is between 256 and 4096 characters. It is defined in the file | |||
934 | In such case C2/C3 won't be used again. | 860 | In such case C2/C3 won't be used again. |
935 | idle=nomwait: Disable mwait for CPU C-states | 861 | idle=nomwait: Disable mwait for CPU C-states |
936 | 862 | ||
937 | ide-pci-generic.all-generic-ide [HW] (E)IDE subsystem | ||
938 | Claim all unknown PCI IDE storage controllers. | ||
939 | |||
940 | ignore_loglevel [KNL] | 863 | ignore_loglevel [KNL] |
941 | Ignore loglevel setting - this will print /all/ | 864 | Ignore loglevel setting - this will print /all/ |
942 | kernel messages to the console. Useful for debugging. | 865 | kernel messages to the console. Useful for debugging. |
@@ -970,25 +893,6 @@ and is between 256 and 4096 characters. It is defined in the file | |||
970 | inport.irq= [HW] Inport (ATI XL and Microsoft) busmouse driver | 893 | inport.irq= [HW] Inport (ATI XL and Microsoft) busmouse driver |
971 | Format: <irq> | 894 | Format: <irq> |
972 | 895 | ||
973 | inttest= [IA64] | ||
974 | |||
975 | iomem= Disable strict checking of access to MMIO memory | ||
976 | strict regions from userspace. | ||
977 | relaxed | ||
978 | |||
979 | iommu= [x86] | ||
980 | off | ||
981 | force | ||
982 | noforce | ||
983 | biomerge | ||
984 | panic | ||
985 | nopanic | ||
986 | merge | ||
987 | nomerge | ||
988 | forcesac | ||
989 | soft | ||
990 | |||
991 | |||
992 | intel_iommu= [DMAR] Intel IOMMU driver (DMAR) option | 896 | intel_iommu= [DMAR] Intel IOMMU driver (DMAR) option |
993 | on | 897 | on |
994 | Enable intel iommu driver. | 898 | Enable intel iommu driver. |
@@ -1012,6 +916,28 @@ and is between 256 and 4096 characters. It is defined in the file | |||
1012 | result in a hardware IOTLB flush operation as opposed | 916 | result in a hardware IOTLB flush operation as opposed |
1013 | to batching them for performance. | 917 | to batching them for performance. |
1014 | 918 | ||
919 | inttest= [IA64] | ||
920 | |||
921 | iomem= Disable strict checking of access to MMIO memory | ||
922 | strict regions from userspace. | ||
923 | relaxed | ||
924 | |||
925 | iommu= [x86] | ||
926 | off | ||
927 | force | ||
928 | noforce | ||
929 | biomerge | ||
930 | panic | ||
931 | nopanic | ||
932 | merge | ||
933 | nomerge | ||
934 | forcesac | ||
935 | soft | ||
936 | |||
937 | io7= [HW] IO7 for Marvel based alpha systems | ||
938 | See comment before marvel_specify_io7 in | ||
939 | arch/alpha/kernel/core_marvel.c. | ||
940 | |||
1015 | io_delay= [X86-32,X86-64] I/O delay method | 941 | io_delay= [X86-32,X86-64] I/O delay method |
1016 | 0x80 | 942 | 0x80 |
1017 | Standard port 0x80 based delay | 943 | Standard port 0x80 based delay |
@@ -1022,10 +948,6 @@ and is between 256 and 4096 characters. It is defined in the file | |||
1022 | none | 948 | none |
1023 | No delay | 949 | No delay |
1024 | 950 | ||
1025 | io7= [HW] IO7 for Marvel based alpha systems | ||
1026 | See comment before marvel_specify_io7 in | ||
1027 | arch/alpha/kernel/core_marvel.c. | ||
1028 | |||
1029 | ip= [IP_PNP] | 951 | ip= [IP_PNP] |
1030 | See Documentation/filesystems/nfsroot.txt. | 952 | See Documentation/filesystems/nfsroot.txt. |
1031 | 953 | ||
@@ -1036,12 +958,6 @@ and is between 256 and 4096 characters. It is defined in the file | |||
1036 | ips= [HW,SCSI] Adaptec / IBM ServeRAID controller | 958 | ips= [HW,SCSI] Adaptec / IBM ServeRAID controller |
1037 | See header of drivers/scsi/ips.c. | 959 | See header of drivers/scsi/ips.c. |
1038 | 960 | ||
1039 | ports= [IP_VS_FTP] IPVS ftp helper module | ||
1040 | Default is 21. | ||
1041 | Up to 8 (IP_VS_APP_MAX_PORTS) ports | ||
1042 | may be specified. | ||
1043 | Format: <port>,<port>.... | ||
1044 | |||
1045 | irqfixup [HW] | 961 | irqfixup [HW] |
1046 | When an interrupt is not handled search all handlers | 962 | When an interrupt is not handled search all handlers |
1047 | for it. Intended to get systems with badly broken | 963 | for it. Intended to get systems with badly broken |
@@ -1082,6 +998,8 @@ and is between 256 and 4096 characters. It is defined in the file | |||
1082 | js= [HW,JOY] Analog joystick | 998 | js= [HW,JOY] Analog joystick |
1083 | See Documentation/input/joystick.txt. | 999 | See Documentation/input/joystick.txt. |
1084 | 1000 | ||
1001 | keepinitrd [HW,ARM] | ||
1002 | |||
1085 | kernelcore=nn[KMG] [KNL,X86-32,IA-64,PPC,X86-64] This parameter | 1003 | kernelcore=nn[KMG] [KNL,X86-32,IA-64,PPC,X86-64] This parameter |
1086 | specifies the amount of memory usable by the kernel | 1004 | specifies the amount of memory usable by the kernel |
1087 | for non-movable allocations. The requested amount is | 1005 | for non-movable allocations. The requested amount is |
@@ -1107,21 +1025,6 @@ and is between 256 and 4096 characters. It is defined in the file | |||
1107 | higher than default (KMEMTRACE_N_SUBBUFS in code) if | 1025 | higher than default (KMEMTRACE_N_SUBBUFS in code) if |
1108 | you experience buffer overruns. | 1026 | you experience buffer overruns. |
1109 | 1027 | ||
1110 | movablecore=nn[KMG] [KNL,X86-32,IA-64,PPC,X86-64] This parameter | ||
1111 | is similar to kernelcore except it specifies the | ||
1112 | amount of memory used for migratable allocations. | ||
1113 | If both kernelcore and movablecore is specified, | ||
1114 | then kernelcore will be at *least* the specified | ||
1115 | value but may be more. If movablecore on its own | ||
1116 | is specified, the administrator must be careful | ||
1117 | that the amount of memory usable for all allocations | ||
1118 | is not too small. | ||
1119 | |||
1120 | keepinitrd [HW,ARM] | ||
1121 | |||
1122 | kstack=N [X86-32,X86-64] Print N words from the kernel stack | ||
1123 | in oops dumps. | ||
1124 | |||
1125 | kgdboc= [HW] kgdb over consoles. | 1028 | kgdboc= [HW] kgdb over consoles. |
1126 | Requires a tty driver that supports console polling. | 1029 | Requires a tty driver that supports console polling. |
1127 | (only serial suported for now) | 1030 | (only serial suported for now) |
@@ -1131,6 +1034,9 @@ and is between 256 and 4096 characters. It is defined in the file | |||
1131 | Configure the RouterBoard 532 series on-chip | 1034 | Configure the RouterBoard 532 series on-chip |
1132 | Ethernet adapter MAC address. | 1035 | Ethernet adapter MAC address. |
1133 | 1036 | ||
1037 | kstack=N [X86-32,X86-64] Print N words from the kernel stack | ||
1038 | in oops dumps. | ||
1039 | |||
1134 | l2cr= [PPC] | 1040 | l2cr= [PPC] |
1135 | 1041 | ||
1136 | l3cr= [PPC] | 1042 | l3cr= [PPC] |
@@ -1276,9 +1182,8 @@ and is between 256 and 4096 characters. It is defined in the file | |||
1276 | (machvec) in a generic kernel. | 1182 | (machvec) in a generic kernel. |
1277 | Example: machvec=hpzx1_swiotlb | 1183 | Example: machvec=hpzx1_swiotlb |
1278 | 1184 | ||
1279 | max_loop= [LOOP] Maximum number of loopback devices that can | 1185 | max_addr=nn[KMG] [KNL,BOOT,ia64] All physical memory greater |
1280 | be mounted | 1186 | than or equal to this physical address is ignored. |
1281 | Format: <1-256> | ||
1282 | 1187 | ||
1283 | maxcpus= [SMP] Maximum number of processors that an SMP kernel | 1188 | maxcpus= [SMP] Maximum number of processors that an SMP kernel |
1284 | should make use of. maxcpus=n : n >= 0 limits the | 1189 | should make use of. maxcpus=n : n >= 0 limits the |
@@ -1286,8 +1191,9 @@ and is between 256 and 4096 characters. It is defined in the file | |||
1286 | it is equivalent to "nosmp", which also disables | 1191 | it is equivalent to "nosmp", which also disables |
1287 | the IO APIC. | 1192 | the IO APIC. |
1288 | 1193 | ||
1289 | max_addr=nn[KMG] [KNL,BOOT,ia64] All physical memory greater than | 1194 | max_loop= [LOOP] Maximum number of loopback devices that can |
1290 | or equal to this physical address is ignored. | 1195 | be mounted |
1196 | Format: <1-256> | ||
1291 | 1197 | ||
1292 | max_luns= [SCSI] Maximum number of LUNs to probe. | 1198 | max_luns= [SCSI] Maximum number of LUNs to probe. |
1293 | Should be between 1 and 2^32-1. | 1199 | Should be between 1 and 2^32-1. |
@@ -1414,6 +1320,16 @@ and is between 256 and 4096 characters. It is defined in the file | |||
1414 | mousedev.yres= [MOUSE] Vertical screen resolution, used for devices | 1320 | mousedev.yres= [MOUSE] Vertical screen resolution, used for devices |
1415 | reporting absolute coordinates, such as tablets | 1321 | reporting absolute coordinates, such as tablets |
1416 | 1322 | ||
1323 | movablecore=nn[KMG] [KNL,X86-32,IA-64,PPC,X86-64] This parameter | ||
1324 | is similar to kernelcore except it specifies the | ||
1325 | amount of memory used for migratable allocations. | ||
1326 | If both kernelcore and movablecore is specified, | ||
1327 | then kernelcore will be at *least* the specified | ||
1328 | value but may be more. If movablecore on its own | ||
1329 | is specified, the administrator must be careful | ||
1330 | that the amount of memory usable for all allocations | ||
1331 | is not too small. | ||
1332 | |||
1417 | mpu401= [HW,OSS] | 1333 | mpu401= [HW,OSS] |
1418 | Format: <io>,<irq> | 1334 | Format: <io>,<irq> |
1419 | 1335 | ||
@@ -1435,6 +1351,23 @@ and is between 256 and 4096 characters. It is defined in the file | |||
1435 | [HW] Make the MicroTouch USB driver use raw coordinates | 1351 | [HW] Make the MicroTouch USB driver use raw coordinates |
1436 | ('y', default) or cooked coordinates ('n') | 1352 | ('y', default) or cooked coordinates ('n') |
1437 | 1353 | ||
1354 | mtrr_chunk_size=nn[KMG] [X86] | ||
1355 | used for mtrr cleanup. It is largest continous chunk | ||
1356 | that could hold holes aka. UC entries. | ||
1357 | |||
1358 | mtrr_gran_size=nn[KMG] [X86] | ||
1359 | Used for mtrr cleanup. It is granularity of mtrr block. | ||
1360 | Default is 1. | ||
1361 | Large value could prevent small alignment from | ||
1362 | using up MTRRs. | ||
1363 | |||
1364 | mtrr_spare_reg_nr=n [X86] | ||
1365 | Format: <integer> | ||
1366 | Range: 0,7 : spare reg number | ||
1367 | Default : 1 | ||
1368 | Used for mtrr cleanup. It is spare mtrr entries number. | ||
1369 | Set to 2 or more if your graphical card needs more. | ||
1370 | |||
1438 | n2= [NET] SDL Inc. RISCom/N2 synchronous serial card | 1371 | n2= [NET] SDL Inc. RISCom/N2 synchronous serial card |
1439 | 1372 | ||
1440 | NCR_D700= [HW,SCSI] | 1373 | NCR_D700= [HW,SCSI] |
@@ -1495,11 +1428,13 @@ and is between 256 and 4096 characters. It is defined in the file | |||
1495 | 0 - turn nmi_watchdog off | 1428 | 0 - turn nmi_watchdog off |
1496 | 1 - use the IO-APIC timer for the NMI watchdog | 1429 | 1 - use the IO-APIC timer for the NMI watchdog |
1497 | 2 - use the local APIC for the NMI watchdog using | 1430 | 2 - use the local APIC for the NMI watchdog using |
1498 | a performance counter. Note: This will use one performance | 1431 | a performance counter. Note: This will use one |
1499 | counter and the local APIC's performance vector. | 1432 | performance counter and the local APIC's performance |
1500 | When panic is specified panic when an NMI watchdog timeout occurs. | 1433 | vector. |
1501 | This is useful when you use a panic=... timeout and need the box | 1434 | When panic is specified, panic when an NMI watchdog |
1502 | quickly up again. | 1435 | timeout occurs. |
1436 | This is useful when you use a panic=... timeout and | ||
1437 | need the box quickly up again. | ||
1503 | Instead of 1 and 2 it is possible to use the following | 1438 | Instead of 1 and 2 it is possible to use the following |
1504 | symbolic names: lapic and ioapic | 1439 | symbolic names: lapic and ioapic |
1505 | Example: nmi_watchdog=2 or nmi_watchdog=panic,lapic | 1440 | Example: nmi_watchdog=2 or nmi_watchdog=panic,lapic |
@@ -1508,6 +1443,16 @@ and is between 256 and 4096 characters. It is defined in the file | |||
1508 | emulation library even if a 387 maths coprocessor | 1443 | emulation library even if a 387 maths coprocessor |
1509 | is present. | 1444 | is present. |
1510 | 1445 | ||
1446 | no_console_suspend | ||
1447 | [HW] Never suspend the console | ||
1448 | Disable suspending of consoles during suspend and | ||
1449 | hibernate operations. Once disabled, debugging | ||
1450 | messages can reach various consoles while the rest | ||
1451 | of the system is being put to sleep (ie, while | ||
1452 | debugging driver suspend/resume hooks). This may | ||
1453 | not work reliably with all consoles, but is known | ||
1454 | to work with serial and VGA consoles. | ||
1455 | |||
1511 | noaliencache [MM, NUMA, SLAB] Disables the allocation of alien | 1456 | noaliencache [MM, NUMA, SLAB] Disables the allocation of alien |
1512 | caches in the slab allocator. Saves per-node memory, | 1457 | caches in the slab allocator. Saves per-node memory, |
1513 | but will impact performance. | 1458 | but will impact performance. |
@@ -1522,6 +1467,8 @@ and is between 256 and 4096 characters. It is defined in the file | |||
1522 | 1467 | ||
1523 | nocache [ARM] | 1468 | nocache [ARM] |
1524 | 1469 | ||
1470 | noclflush [BUGS=X86] Don't use the CLFLUSH instruction | ||
1471 | |||
1525 | nodelayacct [KNL] Disable per-task delay accounting | 1472 | nodelayacct [KNL] Disable per-task delay accounting |
1526 | 1473 | ||
1527 | nodisconnect [HW,SCSI,M68K] Disables SCSI disconnects. | 1474 | nodisconnect [HW,SCSI,M68K] Disables SCSI disconnects. |
@@ -1550,8 +1497,6 @@ and is between 256 and 4096 characters. It is defined in the file | |||
1550 | register save and restore. The kernel will only save | 1497 | register save and restore. The kernel will only save |
1551 | legacy floating-point registers on task switch. | 1498 | legacy floating-point registers on task switch. |
1552 | 1499 | ||
1553 | noclflush [BUGS=X86] Don't use the CLFLUSH instruction | ||
1554 | |||
1555 | nohlt [BUGS=ARM,SH] Tells the kernel that the sleep(SH) or | 1500 | nohlt [BUGS=ARM,SH] Tells the kernel that the sleep(SH) or |
1556 | wfi(ARM) instruction doesn't work correctly and not to | 1501 | wfi(ARM) instruction doesn't work correctly and not to |
1557 | use it. This is also useful when using JTAG debugger. | 1502 | use it. This is also useful when using JTAG debugger. |
@@ -1596,12 +1541,6 @@ and is between 256 and 4096 characters. It is defined in the file | |||
1596 | 1541 | ||
1597 | nolapic_timer [X86-32,APIC] Do not use the local APIC timer. | 1542 | nolapic_timer [X86-32,APIC] Do not use the local APIC timer. |
1598 | 1543 | ||
1599 | nox2apic [X86-64,APIC] Do not enable x2APIC mode. | ||
1600 | |||
1601 | x2apic_phys [X86-64,APIC] Use x2apic physical mode instead of | ||
1602 | default x2apic cluster mode on platforms | ||
1603 | supporting x2apic. | ||
1604 | |||
1605 | noltlbs [PPC] Do not use large page/tlb entries for kernel | 1544 | noltlbs [PPC] Do not use large page/tlb entries for kernel |
1606 | lowmem mapping on PPC40x. | 1545 | lowmem mapping on PPC40x. |
1607 | 1546 | ||
@@ -1612,6 +1551,9 @@ and is between 256 and 4096 characters. It is defined in the file | |||
1612 | nomfgpt [X86-32] Disable Multi-Function General Purpose | 1551 | nomfgpt [X86-32] Disable Multi-Function General Purpose |
1613 | Timer usage (for AMD Geode machines). | 1552 | Timer usage (for AMD Geode machines). |
1614 | 1553 | ||
1554 | norandmaps Don't use address space randomization. Equivalent to | ||
1555 | echo 0 > /proc/sys/kernel/randomize_va_space | ||
1556 | |||
1615 | noreplace-paravirt [X86-32,PV_OPS] Don't patch paravirt_ops | 1557 | noreplace-paravirt [X86-32,PV_OPS] Don't patch paravirt_ops |
1616 | 1558 | ||
1617 | noreplace-smp [X86-32,SMP] Don't replace SMP instructions | 1559 | noreplace-smp [X86-32,SMP] Don't replace SMP instructions |
@@ -1650,13 +1592,13 @@ and is between 256 and 4096 characters. It is defined in the file | |||
1650 | purges which is reported from either PAL_VM_SUMMARY or | 1592 | purges which is reported from either PAL_VM_SUMMARY or |
1651 | SAL PALO. | 1593 | SAL PALO. |
1652 | 1594 | ||
1595 | nr_uarts= [SERIAL] maximum number of UARTs to be registered. | ||
1596 | |||
1653 | numa_zonelist_order= [KNL, BOOT] Select zonelist order for NUMA. | 1597 | numa_zonelist_order= [KNL, BOOT] Select zonelist order for NUMA. |
1654 | one of ['zone', 'node', 'default'] can be specified | 1598 | one of ['zone', 'node', 'default'] can be specified |
1655 | This can be set from sysctl after boot. | 1599 | This can be set from sysctl after boot. |
1656 | See Documentation/sysctl/vm.txt for details. | 1600 | See Documentation/sysctl/vm.txt for details. |
1657 | 1601 | ||
1658 | nr_uarts= [SERIAL] maximum number of UARTs to be registered. | ||
1659 | |||
1660 | ohci1394_dma=early [HW] enable debugging via the ohci1394 driver. | 1602 | ohci1394_dma=early [HW] enable debugging via the ohci1394 driver. |
1661 | See Documentation/debugging-via-ohci1394.txt for more | 1603 | See Documentation/debugging-via-ohci1394.txt for more |
1662 | info. | 1604 | info. |
@@ -1905,6 +1847,14 @@ and is between 256 and 4096 characters. It is defined in the file | |||
1905 | printk.time= Show timing data prefixed to each printk message line | 1847 | printk.time= Show timing data prefixed to each printk message line |
1906 | Format: <bool> (1/Y/y=enable, 0/N/n=disable) | 1848 | Format: <bool> (1/Y/y=enable, 0/N/n=disable) |
1907 | 1849 | ||
1850 | processor.max_cstate= [HW,ACPI] | ||
1851 | Limit processor to maximum C-state | ||
1852 | max_cstate=9 overrides any DMI blacklist limit. | ||
1853 | |||
1854 | processor.nocst [HW,ACPI] | ||
1855 | Ignore the _CST method to determine C-states, | ||
1856 | instead using the legacy FADT method | ||
1857 | |||
1908 | profile= [KNL] Enable kernel profiling via /proc/profile | 1858 | profile= [KNL] Enable kernel profiling via /proc/profile |
1909 | Format: [schedule,]<number> | 1859 | Format: [schedule,]<number> |
1910 | Param: "schedule" - profile schedule points. | 1860 | Param: "schedule" - profile schedule points. |
@@ -1914,14 +1864,6 @@ and is between 256 and 4096 characters. It is defined in the file | |||
1914 | Requires CONFIG_SCHEDSTATS | 1864 | Requires CONFIG_SCHEDSTATS |
1915 | Param: "kvm" - profile VM exits. | 1865 | Param: "kvm" - profile VM exits. |
1916 | 1866 | ||
1917 | processor.max_cstate= [HW,ACPI] | ||
1918 | Limit processor to maximum C-state | ||
1919 | max_cstate=9 overrides any DMI blacklist limit. | ||
1920 | |||
1921 | processor.nocst [HW,ACPI] | ||
1922 | Ignore the _CST method to determine C-states, | ||
1923 | instead using the legacy FADT method | ||
1924 | |||
1925 | prompt_ramdisk= [RAM] List of RAM disks to prompt for floppy disk | 1867 | prompt_ramdisk= [RAM] List of RAM disks to prompt for floppy disk |
1926 | before loading. | 1868 | before loading. |
1927 | See Documentation/blockdev/ramdisk.txt. | 1869 | See Documentation/blockdev/ramdisk.txt. |
@@ -2075,7 +2017,13 @@ and is between 256 and 4096 characters. It is defined in the file | |||
2075 | allowing boot to proceed. none ignores them, expecting | 2017 | allowing boot to proceed. none ignores them, expecting |
2076 | user space to do the scan. | 2018 | user space to do the scan. |
2077 | 2019 | ||
2078 | selinux [SELINUX] Disable or enable SELinux at boot time. | 2020 | security= [SECURITY] Choose a security module to enable at boot. |
2021 | If this boot parameter is not specified, only the first | ||
2022 | security module asking for security registration will be | ||
2023 | loaded. An invalid security module name will be treated | ||
2024 | as if no module has been chosen. | ||
2025 | |||
2026 | selinux= [SELINUX] Disable or enable SELinux at boot time. | ||
2079 | Format: { "0" | "1" } | 2027 | Format: { "0" | "1" } |
2080 | See security/selinux/Kconfig help text. | 2028 | See security/selinux/Kconfig help text. |
2081 | 0 -- disable. | 2029 | 0 -- disable. |
@@ -2499,9 +2447,6 @@ and is between 256 and 4096 characters. It is defined in the file | |||
2499 | medium is write-protected). | 2447 | medium is write-protected). |
2500 | Example: quirks=0419:aaf5:rl,0421:0433:rc | 2448 | Example: quirks=0419:aaf5:rl,0421:0433:rc |
2501 | 2449 | ||
2502 | add_efi_memmap [EFI; x86-32,X86-64] Include EFI memory map in | ||
2503 | kernel's map of available physical RAM. | ||
2504 | |||
2505 | vdso= [X86-32,SH,x86-64] | 2450 | vdso= [X86-32,SH,x86-64] |
2506 | vdso=2: enable compat VDSO (default with COMPAT_VDSO) | 2451 | vdso=2: enable compat VDSO (default with COMPAT_VDSO) |
2507 | vdso=1: enable VDSO (default) | 2452 | vdso=1: enable VDSO (default) |
@@ -2540,6 +2485,31 @@ and is between 256 and 4096 characters. It is defined in the file | |||
2540 | vmpoff= [KNL,S390] Perform z/VM CP command after power off. | 2485 | vmpoff= [KNL,S390] Perform z/VM CP command after power off. |
2541 | Format: <command> | 2486 | Format: <command> |
2542 | 2487 | ||
2488 | vt.default_blu= [VT] | ||
2489 | Format: <blue0>,<blue1>,<blue2>,...,<blue15> | ||
2490 | Change the default blue palette of the console. | ||
2491 | This is a 16-member array composed of values | ||
2492 | ranging from 0-255. | ||
2493 | |||
2494 | vt.default_grn= [VT] | ||
2495 | Format: <green0>,<green1>,<green2>,...,<green15> | ||
2496 | Change the default green palette of the console. | ||
2497 | This is a 16-member array composed of values | ||
2498 | ranging from 0-255. | ||
2499 | |||
2500 | vt.default_red= [VT] | ||
2501 | Format: <red0>,<red1>,<red2>,...,<red15> | ||
2502 | Change the default red palette of the console. | ||
2503 | This is a 16-member array composed of values | ||
2504 | ranging from 0-255. | ||
2505 | |||
2506 | vt.default_utf8= | ||
2507 | [VT] | ||
2508 | Format=<0|1> | ||
2509 | Set system-wide default UTF-8 mode for all tty's. | ||
2510 | Default is 1, i.e. UTF-8 mode is enabled for all | ||
2511 | newly opened terminals. | ||
2512 | |||
2543 | waveartist= [HW,OSS] | 2513 | waveartist= [HW,OSS] |
2544 | Format: <io>,<irq>,<dma>,<dma2> | 2514 | Format: <io>,<irq>,<dma>,<dma2> |
2545 | 2515 | ||
@@ -2552,6 +2522,10 @@ and is between 256 and 4096 characters. It is defined in the file | |||
2552 | wdt= [WDT] Watchdog | 2522 | wdt= [WDT] Watchdog |
2553 | See Documentation/watchdog/wdt.txt. | 2523 | See Documentation/watchdog/wdt.txt. |
2554 | 2524 | ||
2525 | x2apic_phys [X86-64,APIC] Use x2apic physical mode instead of | ||
2526 | default x2apic cluster mode on platforms | ||
2527 | supporting x2apic. | ||
2528 | |||
2555 | xd= [HW,XT] Original XT pre-IDE (RLL encoded) disks. | 2529 | xd= [HW,XT] Original XT pre-IDE (RLL encoded) disks. |
2556 | xd_geo= See header of drivers/block/xd.c. | 2530 | xd_geo= See header of drivers/block/xd.c. |
2557 | 2531 | ||
@@ -2559,9 +2533,6 @@ and is between 256 and 4096 characters. It is defined in the file | |||
2559 | Format: | 2533 | Format: |
2560 | <irq>,<irq_mask>,<io>,<full_duplex>,<do_sound>,<lockup_hack>[,<irq2>[,<irq3>[,<irq4>]]] | 2534 | <irq>,<irq_mask>,<io>,<full_duplex>,<do_sound>,<lockup_hack>[,<irq2>[,<irq3>[,<irq4>]]] |
2561 | 2535 | ||
2562 | norandmaps Don't use address space randomization. Equivalent to | ||
2563 | echo 0 > /proc/sys/kernel/randomize_va_space | ||
2564 | |||
2565 | ______________________________________________________________________ | 2536 | ______________________________________________________________________ |
2566 | 2537 | ||
2567 | TODO: | 2538 | TODO: |
diff --git a/Documentation/powerpc/dts-bindings/fsl/upm-nand.txt b/Documentation/powerpc/dts-bindings/fsl/upm-nand.txt index 84a04d5eb8e6..a48b2cadc7f0 100644 --- a/Documentation/powerpc/dts-bindings/fsl/upm-nand.txt +++ b/Documentation/powerpc/dts-bindings/fsl/upm-nand.txt | |||
@@ -5,9 +5,21 @@ Required properties: | |||
5 | - reg : should specify localbus chip select and size used for the chip. | 5 | - reg : should specify localbus chip select and size used for the chip. |
6 | - fsl,upm-addr-offset : UPM pattern offset for the address latch. | 6 | - fsl,upm-addr-offset : UPM pattern offset for the address latch. |
7 | - fsl,upm-cmd-offset : UPM pattern offset for the command latch. | 7 | - fsl,upm-cmd-offset : UPM pattern offset for the command latch. |
8 | - gpios : may specify optional GPIO connected to the Ready-Not-Busy pin. | ||
9 | 8 | ||
10 | Example: | 9 | Optional properties: |
10 | - fsl,upm-wait-flags : add chip-dependent short delays after running the | ||
11 | UPM pattern (0x1), after writing a data byte (0x2) or after | ||
12 | writing out a buffer (0x4). | ||
13 | - fsl,upm-addr-line-cs-offsets : address offsets for multi-chip support. | ||
14 | The corresponding address lines are used to select the chip. | ||
15 | - gpios : may specify optional GPIOs connected to the Ready-Not-Busy pins | ||
16 | (R/B#). For multi-chip devices, "n" GPIO definitions are required | ||
17 | according to the number of chips. | ||
18 | - chip-delay : chip dependent delay for transfering data from array to | ||
19 | read registers (tR). Required if property "gpios" is not used | ||
20 | (R/B# pins not connected). | ||
21 | |||
22 | Examples: | ||
11 | 23 | ||
12 | upm@1,0 { | 24 | upm@1,0 { |
13 | compatible = "fsl,upm-nand"; | 25 | compatible = "fsl,upm-nand"; |
@@ -26,3 +38,26 @@ upm@1,0 { | |||
26 | }; | 38 | }; |
27 | }; | 39 | }; |
28 | }; | 40 | }; |
41 | |||
42 | upm@3,0 { | ||
43 | #address-cells = <0>; | ||
44 | #size-cells = <0>; | ||
45 | compatible = "tqc,tqm8548-upm-nand", "fsl,upm-nand"; | ||
46 | reg = <3 0x0 0x800>; | ||
47 | fsl,upm-addr-offset = <0x10>; | ||
48 | fsl,upm-cmd-offset = <0x08>; | ||
49 | /* Multi-chip NAND device */ | ||
50 | fsl,upm-addr-line-cs-offsets = <0x0 0x200>; | ||
51 | fsl,upm-wait-flags = <0x5>; | ||
52 | chip-delay = <25>; // in micro-seconds | ||
53 | |||
54 | nand@0 { | ||
55 | #address-cells = <1>; | ||
56 | #size-cells = <1>; | ||
57 | |||
58 | partition@0 { | ||
59 | label = "fs"; | ||
60 | reg = <0x00000000 0x10000000>; | ||
61 | }; | ||
62 | }; | ||
63 | }; | ||
diff --git a/Documentation/powerpc/dts-bindings/gpio/led.txt b/Documentation/powerpc/dts-bindings/gpio/led.txt index ff51f4c0fa9d..4fe14deedc0a 100644 --- a/Documentation/powerpc/dts-bindings/gpio/led.txt +++ b/Documentation/powerpc/dts-bindings/gpio/led.txt | |||
@@ -1,15 +1,43 @@ | |||
1 | LED connected to GPIO | 1 | LEDs connected to GPIO lines |
2 | 2 | ||
3 | Required properties: | 3 | Required properties: |
4 | - compatible : should be "gpio-led". | 4 | - compatible : should be "gpio-leds". |
5 | - label : (optional) the label for this LED. If omitted, the label is | 5 | |
6 | Each LED is represented as a sub-node of the gpio-leds device. Each | ||
7 | node's name represents the name of the corresponding LED. | ||
8 | |||
9 | LED sub-node properties: | ||
10 | - gpios : Should specify the LED's GPIO, see "Specifying GPIO information | ||
11 | for devices" in Documentation/powerpc/booting-without-of.txt. Active | ||
12 | low LEDs should be indicated using flags in the GPIO specifier. | ||
13 | - label : (optional) The label for this LED. If omitted, the label is | ||
6 | taken from the node name (excluding the unit address). | 14 | taken from the node name (excluding the unit address). |
7 | - gpios : should specify LED GPIO. | 15 | - linux,default-trigger : (optional) This parameter, if present, is a |
16 | string defining the trigger assigned to the LED. Current triggers are: | ||
17 | "backlight" - LED will act as a back-light, controlled by the framebuffer | ||
18 | system | ||
19 | "default-on" - LED will turn on | ||
20 | "heartbeat" - LED "double" flashes at a load average based rate | ||
21 | "ide-disk" - LED indicates disk activity | ||
22 | "timer" - LED flashes at a fixed, configurable rate | ||
8 | 23 | ||
9 | Example: | 24 | Examples: |
10 | 25 | ||
11 | led@0 { | 26 | leds { |
12 | compatible = "gpio-led"; | 27 | compatible = "gpio-leds"; |
13 | label = "hdd"; | 28 | hdd { |
14 | gpios = <&mcu_pio 0 1>; | 29 | label = "IDE Activity"; |
30 | gpios = <&mcu_pio 0 1>; /* Active low */ | ||
31 | linux,default-trigger = "ide-disk"; | ||
32 | }; | ||
15 | }; | 33 | }; |
34 | |||
35 | run-control { | ||
36 | compatible = "gpio-leds"; | ||
37 | red { | ||
38 | gpios = <&mpc8572 6 0>; | ||
39 | }; | ||
40 | green { | ||
41 | gpios = <&mpc8572 7 0>; | ||
42 | }; | ||
43 | } | ||
diff --git a/Documentation/scsi/aacraid.txt b/Documentation/scsi/aacraid.txt index ddace3afc83b..30f643f611b2 100644 --- a/Documentation/scsi/aacraid.txt +++ b/Documentation/scsi/aacraid.txt | |||
@@ -60,17 +60,9 @@ Supported Cards/Chipsets | |||
60 | 9005:0285:9005:02d5 Adaptec ASR-2405 (Voodoo40 Lite) | 60 | 9005:0285:9005:02d5 Adaptec ASR-2405 (Voodoo40 Lite) |
61 | 9005:0285:9005:02d6 Adaptec ASR-2445 (Voodoo44 Lite) | 61 | 9005:0285:9005:02d6 Adaptec ASR-2445 (Voodoo44 Lite) |
62 | 9005:0285:9005:02d7 Adaptec ASR-2805 (Voodoo80 Lite) | 62 | 9005:0285:9005:02d7 Adaptec ASR-2805 (Voodoo80 Lite) |
63 | 9005:0285:9005:02d8 Adaptec 5405G (Voodoo40 PM) | 63 | 9005:0285:9005:02d8 Adaptec 5405Z (Voodoo40 BLBU) |
64 | 9005:0285:9005:02d9 Adaptec 5445G (Voodoo44 PM) | 64 | 9005:0285:9005:02d9 Adaptec 5445Z (Voodoo44 BLBU) |
65 | 9005:0285:9005:02da Adaptec 5805G (Voodoo80 PM) | 65 | 9005:0285:9005:02da Adaptec 5805Z (Voodoo80 BLBU) |
66 | 9005:0285:9005:02db Adaptec 5085G (Voodoo08 PM) | ||
67 | 9005:0285:9005:02dc Adaptec 51245G (Voodoo124 PM) | ||
68 | 9005:0285:9005:02dd Adaptec 51645G (Voodoo164 PM) | ||
69 | 9005:0285:9005:02de Adaptec 52445G (Voodoo244 PM) | ||
70 | 9005:0285:9005:02df Adaptec ASR-2045G (Voodoo04 Lite PM) | ||
71 | 9005:0285:9005:02e0 Adaptec ASR-2405G (Voodoo40 Lite PM) | ||
72 | 9005:0285:9005:02e1 Adaptec ASR-2445G (Voodoo44 Lite PM) | ||
73 | 9005:0285:9005:02e2 Adaptec ASR-2805G (Voodoo80 Lite PM) | ||
74 | 1011:0046:9005:0364 Adaptec 5400S (Mustang) | 66 | 1011:0046:9005:0364 Adaptec 5400S (Mustang) |
75 | 1011:0046:9005:0365 Adaptec 5400S (Mustang) | 67 | 1011:0046:9005:0365 Adaptec 5400S (Mustang) |
76 | 9005:0287:9005:0800 Adaptec Themisto (Jupiter) | 68 | 9005:0287:9005:0800 Adaptec Themisto (Jupiter) |
@@ -140,6 +132,7 @@ Deanna Bonds (non-DASD support, PAE fibs and 64 bit, | |||
140 | where fibs that go to the hardware are consistently called hw_fibs and | 132 | where fibs that go to the hardware are consistently called hw_fibs and |
141 | not just fibs like the name of the driver tracking structure) | 133 | not just fibs like the name of the driver tracking structure) |
142 | Mark Salyzyn <Mark_Salyzyn@adaptec.com> Fixed panic issues and added some new product ids for upcoming hbas. Performance tuning, card failover and bug mitigations. | 134 | Mark Salyzyn <Mark_Salyzyn@adaptec.com> Fixed panic issues and added some new product ids for upcoming hbas. Performance tuning, card failover and bug mitigations. |
135 | Achim Leubner <Achim_Leubner@adaptec.com> | ||
143 | 136 | ||
144 | Original Driver | 137 | Original Driver |
145 | ------------------------- | 138 | ------------------------- |