diff options
author | Mauro Carvalho Chehab <mchehab+samsung@kernel.org> | 2019-06-12 13:52:47 -0400 |
---|---|---|
committer | Jonathan Corbet <corbet@lwn.net> | 2019-06-14 16:21:18 -0400 |
commit | d7b461c5e82fc5f5e4261f3b0228ecda58eb9f1a (patch) | |
tree | ed0279bbecdc0cc31652ea25d8e6d403a6a73880 | |
parent | c220a1fae6c5df52ed3a02f88b86a27830ea0210 (diff) |
docs: ide: convert docs to ReST and rename to *.rst
The conversion is actually:
- add blank lines and identation in order to identify paragraphs;
- fix tables markups;
- add some lists markups;
- mark literal blocks;
- adjust title markups.
At its new index.rst, let's add a :orphan: while this is not linked to
the main index.rst file, in order to avoid build warnings.
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Jonathan Corbet <corbet@lwn.net>
-rw-r--r-- | Documentation/admin-guide/kernel-parameters.txt | 2 | ||||
-rw-r--r-- | Documentation/cdrom/ide-cd.rst | 18 | ||||
-rw-r--r-- | Documentation/ide/changelogs.rst | 17 | ||||
-rw-r--r-- | Documentation/ide/ide-tape.rst (renamed from Documentation/ide/ide-tape.txt) | 23 | ||||
-rw-r--r-- | Documentation/ide/ide.rst (renamed from Documentation/ide/ide.txt) | 147 | ||||
-rw-r--r-- | Documentation/ide/index.rst | 21 | ||||
-rw-r--r-- | Documentation/ide/warm-plug-howto.rst (renamed from Documentation/ide/warm-plug-howto.txt) | 10 | ||||
-rw-r--r-- | arch/m68k/q40/README | 2 | ||||
-rw-r--r-- | drivers/ide/Kconfig | 20 |
9 files changed, 155 insertions, 105 deletions
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index 83d6560f10f0..81c168b25b20 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt | |||
@@ -1504,7 +1504,7 @@ | |||
1504 | Format: =0.0 to prevent dma on hda, =0.1 hdb =1.0 hdc | 1504 | Format: =0.0 to prevent dma on hda, =0.1 hdb =1.0 hdc |
1505 | .vlb_clock .pci_clock .noflush .nohpa .noprobe .nowerr | 1505 | .vlb_clock .pci_clock .noflush .nohpa .noprobe .nowerr |
1506 | .cdrom .chs .ignore_cable are additional options | 1506 | .cdrom .chs .ignore_cable are additional options |
1507 | See Documentation/ide/ide.txt. | 1507 | See Documentation/ide/ide.rst. |
1508 | 1508 | ||
1509 | ide-generic.probe-mask= [HW] (E)IDE subsystem | 1509 | ide-generic.probe-mask= [HW] (E)IDE subsystem |
1510 | Format: <int> | 1510 | Format: <int> |
diff --git a/Documentation/cdrom/ide-cd.rst b/Documentation/cdrom/ide-cd.rst index dadc94ef6b6c..bdccb74fc92d 100644 --- a/Documentation/cdrom/ide-cd.rst +++ b/Documentation/cdrom/ide-cd.rst | |||
@@ -47,7 +47,7 @@ This driver provides the following features: | |||
47 | --------------- | 47 | --------------- |
48 | 48 | ||
49 | 0. The ide-cd relies on the ide disk driver. See | 49 | 0. The ide-cd relies on the ide disk driver. See |
50 | Documentation/ide/ide.txt for up-to-date information on the ide | 50 | Documentation/ide/ide.rst for up-to-date information on the ide |
51 | driver. | 51 | driver. |
52 | 52 | ||
53 | 1. Make sure that the ide and ide-cd drivers are compiled into the | 53 | 1. Make sure that the ide and ide-cd drivers are compiled into the |
@@ -62,7 +62,7 @@ This driver provides the following features: | |||
62 | 62 | ||
63 | Depending on what type of IDE interface you have, you may need to | 63 | Depending on what type of IDE interface you have, you may need to |
64 | specify additional configuration options. See | 64 | specify additional configuration options. See |
65 | Documentation/ide/ide.txt. | 65 | Documentation/ide/ide.rst. |
66 | 66 | ||
67 | 2. You should also ensure that the iso9660 filesystem is either | 67 | 2. You should also ensure that the iso9660 filesystem is either |
68 | compiled into the kernel or available as a loadable module. You | 68 | compiled into the kernel or available as a loadable module. You |
@@ -82,7 +82,7 @@ This driver provides the following features: | |||
82 | on the primary IDE interface are called `hda` and `hdb`, | 82 | on the primary IDE interface are called `hda` and `hdb`, |
83 | respectively. The drives on the secondary interface are called | 83 | respectively. The drives on the secondary interface are called |
84 | `hdc` and `hdd`. (Interfaces at other locations get other letters | 84 | `hdc` and `hdd`. (Interfaces at other locations get other letters |
85 | in the third position; see Documentation/ide/ide.txt.) | 85 | in the third position; see Documentation/ide/ide.rst.) |
86 | 86 | ||
87 | If you want your CDROM drive to be found automatically by the | 87 | If you want your CDROM drive to be found automatically by the |
88 | driver, you should make sure your IDE interface uses either the | 88 | driver, you should make sure your IDE interface uses either the |
@@ -91,7 +91,7 @@ This driver provides the following features: | |||
91 | be jumpered as `master`. (If for some reason you cannot configure | 91 | be jumpered as `master`. (If for some reason you cannot configure |
92 | your system in this manner, you can probably still use the driver. | 92 | your system in this manner, you can probably still use the driver. |
93 | You may have to pass extra configuration information to the kernel | 93 | You may have to pass extra configuration information to the kernel |
94 | when you boot, however. See Documentation/ide/ide.txt for more | 94 | when you boot, however. See Documentation/ide/ide.rst for more |
95 | information.) | 95 | information.) |
96 | 96 | ||
97 | 4. Boot the system. If the drive is recognized, you should see a | 97 | 4. Boot the system. If the drive is recognized, you should see a |
@@ -163,7 +163,7 @@ to change. If the slot number is -1, the drive is unloaded. | |||
163 | This section discusses some common problems encountered when trying to | 163 | This section discusses some common problems encountered when trying to |
164 | use the driver, and some possible solutions. Note that if you are | 164 | use the driver, and some possible solutions. Note that if you are |
165 | experiencing problems, you should probably also review | 165 | experiencing problems, you should probably also review |
166 | Documentation/ide/ide.txt for current information about the underlying | 166 | Documentation/ide/ide.rst for current information about the underlying |
167 | IDE support code. Some of these items apply only to earlier versions | 167 | IDE support code. Some of these items apply only to earlier versions |
168 | of the driver, but are mentioned here for completeness. | 168 | of the driver, but are mentioned here for completeness. |
169 | 169 | ||
@@ -173,7 +173,7 @@ from the driver. | |||
173 | a. Drive is not detected during booting. | 173 | a. Drive is not detected during booting. |
174 | 174 | ||
175 | - Review the configuration instructions above and in | 175 | - Review the configuration instructions above and in |
176 | Documentation/ide/ide.txt, and check how your hardware is | 176 | Documentation/ide/ide.rst, and check how your hardware is |
177 | configured. | 177 | configured. |
178 | 178 | ||
179 | - If your drive is the only device on an IDE interface, it should | 179 | - If your drive is the only device on an IDE interface, it should |
@@ -181,7 +181,7 @@ a. Drive is not detected during booting. | |||
181 | 181 | ||
182 | - If your IDE interface is not at the standard addresses of 0x170 | 182 | - If your IDE interface is not at the standard addresses of 0x170 |
183 | or 0x1f0, you'll need to explicitly inform the driver using a | 183 | or 0x1f0, you'll need to explicitly inform the driver using a |
184 | lilo option. See Documentation/ide/ide.txt. (This feature was | 184 | lilo option. See Documentation/ide/ide.rst. (This feature was |
185 | added around kernel version 1.3.30.) | 185 | added around kernel version 1.3.30.) |
186 | 186 | ||
187 | - If the autoprobing is not finding your drive, you can tell the | 187 | - If the autoprobing is not finding your drive, you can tell the |
@@ -207,7 +207,7 @@ a. Drive is not detected during booting. | |||
207 | Support for some interfaces needing extra initialization is | 207 | Support for some interfaces needing extra initialization is |
208 | provided in later 1.3.x kernels. You may need to turn on | 208 | provided in later 1.3.x kernels. You may need to turn on |
209 | additional kernel configuration options to get them to work; | 209 | additional kernel configuration options to get them to work; |
210 | see Documentation/ide/ide.txt. | 210 | see Documentation/ide/ide.rst. |
211 | 211 | ||
212 | Even if support is not available for your interface, you may be | 212 | Even if support is not available for your interface, you may be |
213 | able to get it to work with the following procedure. First boot | 213 | able to get it to work with the following procedure. First boot |
@@ -261,7 +261,7 @@ c. System hangups. | |||
261 | be worked around by specifying the `serialize` option when | 261 | be worked around by specifying the `serialize` option when |
262 | booting. Recent kernels should be able to detect the need for | 262 | booting. Recent kernels should be able to detect the need for |
263 | this automatically in most cases, but the detection is not | 263 | this automatically in most cases, but the detection is not |
264 | foolproof. See Documentation/ide/ide.txt for more information | 264 | foolproof. See Documentation/ide/ide.rst for more information |
265 | about the `serialize` option and the CMD640B. | 265 | about the `serialize` option and the CMD640B. |
266 | 266 | ||
267 | - Note that many MS-DOS CDROM drivers will work with such buggy | 267 | - Note that many MS-DOS CDROM drivers will work with such buggy |
diff --git a/Documentation/ide/changelogs.rst b/Documentation/ide/changelogs.rst new file mode 100644 index 000000000000..fdf9d0fb8027 --- /dev/null +++ b/Documentation/ide/changelogs.rst | |||
@@ -0,0 +1,17 @@ | |||
1 | Changelog for ide cd | ||
2 | -------------------- | ||
3 | |||
4 | .. include:: ChangeLog.ide-cd.1994-2004 | ||
5 | :literal: | ||
6 | |||
7 | Changelog for ide floppy | ||
8 | ------------------------ | ||
9 | |||
10 | .. include:: ChangeLog.ide-floppy.1996-2002 | ||
11 | :literal: | ||
12 | |||
13 | Changelog for ide tape | ||
14 | ---------------------- | ||
15 | |||
16 | .. include:: ChangeLog.ide-tape.1995-2002 | ||
17 | :literal: | ||
diff --git a/Documentation/ide/ide-tape.txt b/Documentation/ide/ide-tape.rst index 3f348a0b21d8..3e061d9c0e38 100644 --- a/Documentation/ide/ide-tape.txt +++ b/Documentation/ide/ide-tape.rst | |||
@@ -1,4 +1,6 @@ | |||
1 | IDE ATAPI streaming tape driver. | 1 | =============================== |
2 | IDE ATAPI streaming tape driver | ||
3 | =============================== | ||
2 | 4 | ||
3 | This driver is a part of the Linux ide driver. | 5 | This driver is a part of the Linux ide driver. |
4 | 6 | ||
@@ -10,14 +12,14 @@ to the request-list of the block device, and waits for their completion. | |||
10 | The block device major and minor numbers are determined from the | 12 | The block device major and minor numbers are determined from the |
11 | tape's relative position in the ide interfaces, as explained in ide.c. | 13 | tape's relative position in the ide interfaces, as explained in ide.c. |
12 | 14 | ||
13 | The character device interface consists of the following devices: | 15 | The character device interface consists of the following devices:: |
14 | 16 | ||
15 | ht0 major 37, minor 0 first IDE tape, rewind on close. | 17 | ht0 major 37, minor 0 first IDE tape, rewind on close. |
16 | ht1 major 37, minor 1 second IDE tape, rewind on close. | 18 | ht1 major 37, minor 1 second IDE tape, rewind on close. |
17 | ... | 19 | ... |
18 | nht0 major 37, minor 128 first IDE tape, no rewind on close. | 20 | nht0 major 37, minor 128 first IDE tape, no rewind on close. |
19 | nht1 major 37, minor 129 second IDE tape, no rewind on close. | 21 | nht1 major 37, minor 129 second IDE tape, no rewind on close. |
20 | ... | 22 | ... |
21 | 23 | ||
22 | The general magnetic tape commands compatible interface, as defined by | 24 | The general magnetic tape commands compatible interface, as defined by |
23 | include/linux/mtio.h, is accessible through the character device. | 25 | include/linux/mtio.h, is accessible through the character device. |
@@ -40,9 +42,10 @@ Testing was done with a 2 GB CONNER CTMA 4000 IDE ATAPI Streaming Tape Drive. | |||
40 | Here are some words from the first releases of hd.c, which are quoted | 42 | Here are some words from the first releases of hd.c, which are quoted |
41 | in ide.c and apply here as well: | 43 | in ide.c and apply here as well: |
42 | 44 | ||
43 | | Special care is recommended. Have Fun! | 45 | * Special care is recommended. Have Fun! |
44 | 46 | ||
45 | Possible improvements: | 47 | Possible improvements |
48 | ===================== | ||
46 | 49 | ||
47 | 1. Support for the ATAPI overlap protocol. | 50 | 1. Support for the ATAPI overlap protocol. |
48 | 51 | ||
diff --git a/Documentation/ide/ide.txt b/Documentation/ide/ide.rst index 7aca987c23d9..88bdcba92f7d 100644 --- a/Documentation/ide/ide.txt +++ b/Documentation/ide/ide.rst | |||
@@ -1,41 +1,43 @@ | |||
1 | 1 | ============================================ | |
2 | Information regarding the Enhanced IDE drive in Linux 2.6 | 2 | Information regarding the Enhanced IDE drive |
3 | 3 | ============================================ | |
4 | ============================================================================== | ||
5 | |||
6 | 4 | ||
7 | The hdparm utility can be used to control various IDE features on a | 5 | The hdparm utility can be used to control various IDE features on a |
8 | running system. It is packaged separately. Please Look for it on popular | 6 | running system. It is packaged separately. Please Look for it on popular |
9 | linux FTP sites. | 7 | linux FTP sites. |
10 | 8 | ||
9 | ------------------------------------------------------------------------------- | ||
10 | |||
11 | .. important:: | ||
12 | |||
13 | BUGGY IDE CHIPSETS CAN CORRUPT DATA!! | ||
14 | |||
15 | PCI versions of the CMD640 and RZ1000 interfaces are now detected | ||
16 | automatically at startup when PCI BIOS support is configured. | ||
17 | |||
18 | Linux disables the "prefetch" ("readahead") mode of the RZ1000 | ||
19 | to prevent data corruption possible due to hardware design flaws. | ||
20 | |||
21 | For the CMD640, linux disables "IRQ unmasking" (hdparm -u1) on any | ||
22 | drive for which the "prefetch" mode of the CMD640 is turned on. | ||
23 | If "prefetch" is disabled (hdparm -p8), then "IRQ unmasking" can be | ||
24 | used again. | ||
25 | |||
26 | For the CMD640, linux disables "32bit I/O" (hdparm -c1) on any drive | ||
27 | for which the "prefetch" mode of the CMD640 is turned off. | ||
28 | If "prefetch" is enabled (hdparm -p9), then "32bit I/O" can be | ||
29 | used again. | ||
30 | |||
31 | The CMD640 is also used on some Vesa Local Bus (VLB) cards, and is *NOT* | ||
32 | automatically detected by Linux. For safe, reliable operation with such | ||
33 | interfaces, one *MUST* use the "cmd640.probe_vlb" kernel option. | ||
34 | |||
35 | Use of the "serialize" option is no longer necessary. | ||
11 | 36 | ||
37 | ------------------------------------------------------------------------------- | ||
12 | 38 | ||
13 | *** IMPORTANT NOTICES: BUGGY IDE CHIPSETS CAN CORRUPT DATA!! | 39 | Common pitfalls |
14 | *** ================= | 40 | =============== |
15 | *** PCI versions of the CMD640 and RZ1000 interfaces are now detected | ||
16 | *** automatically at startup when PCI BIOS support is configured. | ||
17 | *** | ||
18 | *** Linux disables the "prefetch" ("readahead") mode of the RZ1000 | ||
19 | *** to prevent data corruption possible due to hardware design flaws. | ||
20 | *** | ||
21 | *** For the CMD640, linux disables "IRQ unmasking" (hdparm -u1) on any | ||
22 | *** drive for which the "prefetch" mode of the CMD640 is turned on. | ||
23 | *** If "prefetch" is disabled (hdparm -p8), then "IRQ unmasking" can be | ||
24 | *** used again. | ||
25 | *** | ||
26 | *** For the CMD640, linux disables "32bit I/O" (hdparm -c1) on any drive | ||
27 | *** for which the "prefetch" mode of the CMD640 is turned off. | ||
28 | *** If "prefetch" is enabled (hdparm -p9), then "32bit I/O" can be | ||
29 | *** used again. | ||
30 | *** | ||
31 | *** The CMD640 is also used on some Vesa Local Bus (VLB) cards, and is *NOT* | ||
32 | *** automatically detected by Linux. For safe, reliable operation with such | ||
33 | *** interfaces, one *MUST* use the "cmd640.probe_vlb" kernel option. | ||
34 | *** | ||
35 | *** Use of the "serialize" option is no longer necessary. | ||
36 | |||
37 | ================================================================================ | ||
38 | Common pitfalls: | ||
39 | 41 | ||
40 | - 40-conductor IDE cables are capable of transferring data in DMA modes up to | 42 | - 40-conductor IDE cables are capable of transferring data in DMA modes up to |
41 | udma2, but no faster. | 43 | udma2, but no faster. |
@@ -49,19 +51,18 @@ Common pitfalls: | |||
49 | - Even better try to stick to the same vendor and device type on the same | 51 | - Even better try to stick to the same vendor and device type on the same |
50 | cable. | 52 | cable. |
51 | 53 | ||
52 | ================================================================================ | 54 | This is the multiple IDE interface driver, as evolved from hd.c |
53 | 55 | =============================================================== | |
54 | This is the multiple IDE interface driver, as evolved from hd.c. | ||
55 | 56 | ||
56 | It supports up to 9 IDE interfaces per default, on one or more IRQs (usually | 57 | It supports up to 9 IDE interfaces per default, on one or more IRQs (usually |
57 | 14 & 15). There can be up to two drives per interface, as per the ATA-6 spec. | 58 | 14 & 15). There can be up to two drives per interface, as per the ATA-6 spec.:: |
58 | 59 | ||
59 | Primary: ide0, port 0x1f0; major=3; hda is minor=0; hdb is minor=64 | 60 | Primary: ide0, port 0x1f0; major=3; hda is minor=0; hdb is minor=64 |
60 | Secondary: ide1, port 0x170; major=22; hdc is minor=0; hdd is minor=64 | 61 | Secondary: ide1, port 0x170; major=22; hdc is minor=0; hdd is minor=64 |
61 | Tertiary: ide2, port 0x1e8; major=33; hde is minor=0; hdf is minor=64 | 62 | Tertiary: ide2, port 0x1e8; major=33; hde is minor=0; hdf is minor=64 |
62 | Quaternary: ide3, port 0x168; major=34; hdg is minor=0; hdh is minor=64 | 63 | Quaternary: ide3, port 0x168; major=34; hdg is minor=0; hdh is minor=64 |
63 | fifth.. ide4, usually PCI, probed | 64 | fifth.. ide4, usually PCI, probed |
64 | sixth.. ide5, usually PCI, probed | 65 | sixth.. ide5, usually PCI, probed |
65 | 66 | ||
66 | To access devices on interfaces > ide0, device entries please make sure that | 67 | To access devices on interfaces > ide0, device entries please make sure that |
67 | device files for them are present in /dev. If not, please create such | 68 | device files for them are present in /dev. If not, please create such |
@@ -80,12 +81,15 @@ seldom occurs. Be careful, and if in doubt, don't do it! | |||
80 | 81 | ||
81 | Drives are normally found by auto-probing and/or examining the CMOS/BIOS data. | 82 | Drives are normally found by auto-probing and/or examining the CMOS/BIOS data. |
82 | For really weird situations, the apparent (fdisk) geometry can also be specified | 83 | For really weird situations, the apparent (fdisk) geometry can also be specified |
83 | on the kernel "command line" using LILO. The format of such lines is: | 84 | on the kernel "command line" using LILO. The format of such lines is:: |
84 | 85 | ||
85 | ide_core.chs=[interface_number.device_number]:cyls,heads,sects | 86 | ide_core.chs=[interface_number.device_number]:cyls,heads,sects |
86 | or ide_core.cdrom=[interface_number.device_number] | ||
87 | 87 | ||
88 | For example: | 88 | or:: |
89 | |||
90 | ide_core.cdrom=[interface_number.device_number] | ||
91 | |||
92 | For example:: | ||
89 | 93 | ||
90 | ide_core.chs=1.0:1050,32,64 ide_core.cdrom=1.1 | 94 | ide_core.chs=1.0:1050,32,64 ide_core.cdrom=1.1 |
91 | 95 | ||
@@ -96,10 +100,12 @@ geometry for partitioning purposes (fdisk). | |||
96 | If the auto-probing during boot time confuses a drive (ie. the drive works | 100 | If the auto-probing during boot time confuses a drive (ie. the drive works |
97 | with hd.c but not with ide.c), then an command line option may be specified | 101 | with hd.c but not with ide.c), then an command line option may be specified |
98 | for each drive for which you'd like the drive to skip the hardware | 102 | for each drive for which you'd like the drive to skip the hardware |
99 | probe/identification sequence. For example: | 103 | probe/identification sequence. For example:: |
100 | 104 | ||
101 | ide_core.noprobe=0.1 | 105 | ide_core.noprobe=0.1 |
102 | or | 106 | |
107 | or:: | ||
108 | |||
103 | ide_core.chs=1.0:768,16,32 | 109 | ide_core.chs=1.0:768,16,32 |
104 | ide_core.noprobe=1.0 | 110 | ide_core.noprobe=1.0 |
105 | 111 | ||
@@ -115,22 +121,24 @@ Such drives will be identified at boot time, just like a hard disk. | |||
115 | 121 | ||
116 | If for some reason your cdrom drive is *not* found at boot time, you can force | 122 | If for some reason your cdrom drive is *not* found at boot time, you can force |
117 | the probe to look harder by supplying a kernel command line parameter | 123 | the probe to look harder by supplying a kernel command line parameter |
118 | via LILO, such as: | 124 | via LILO, such as::: |
119 | 125 | ||
120 | ide_core.cdrom=1.0 /* "master" on second interface (hdc) */ | 126 | ide_core.cdrom=1.0 /* "master" on second interface (hdc) */ |
121 | or | 127 | |
128 | or:: | ||
129 | |||
122 | ide_core.cdrom=1.1 /* "slave" on second interface (hdd) */ | 130 | ide_core.cdrom=1.1 /* "slave" on second interface (hdd) */ |
123 | 131 | ||
124 | For example, a GW2000 system might have a hard drive on the primary | 132 | For example, a GW2000 system might have a hard drive on the primary |
125 | interface (/dev/hda) and an IDE cdrom drive on the secondary interface | 133 | interface (/dev/hda) and an IDE cdrom drive on the secondary interface |
126 | (/dev/hdc). To mount a CD in the cdrom drive, one would use something like: | 134 | (/dev/hdc). To mount a CD in the cdrom drive, one would use something like:: |
127 | 135 | ||
128 | ln -sf /dev/hdc /dev/cdrom | 136 | ln -sf /dev/hdc /dev/cdrom |
129 | mkdir /mnt/cdrom | 137 | mkdir /mnt/cdrom |
130 | mount /dev/cdrom /mnt/cdrom -t iso9660 -o ro | 138 | mount /dev/cdrom /mnt/cdrom -t iso9660 -o ro |
131 | 139 | ||
132 | If, after doing all of the above, mount doesn't work and you see | 140 | If, after doing all of the above, mount doesn't work and you see |
133 | errors from the driver (with dmesg) complaining about `status=0xff', | 141 | errors from the driver (with dmesg) complaining about `status=0xff`, |
134 | this means that the hardware is not responding to the driver's attempts | 142 | this means that the hardware is not responding to the driver's attempts |
135 | to read it. One of the following is probably the problem: | 143 | to read it. One of the following is probably the problem: |
136 | 144 | ||
@@ -165,7 +173,7 @@ drivers can always be compiled as loadable modules, the chipset drivers | |||
165 | can only be compiled into the kernel, and the core code (ide.c) can be | 173 | can only be compiled into the kernel, and the core code (ide.c) can be |
166 | compiled as a loadable module provided no chipset support is needed. | 174 | compiled as a loadable module provided no chipset support is needed. |
167 | 175 | ||
168 | When using ide.c as a module in combination with kmod, add: | 176 | When using ide.c as a module in combination with kmod, add:: |
169 | 177 | ||
170 | alias block-major-3 ide-probe | 178 | alias block-major-3 ide-probe |
171 | 179 | ||
@@ -176,10 +184,8 @@ driver using the "options=" keyword to insmod, while replacing any ',' with | |||
176 | ';'. | 184 | ';'. |
177 | 185 | ||
178 | 186 | ||
179 | ================================================================================ | ||
180 | |||
181 | Summary of ide driver parameters for kernel command line | 187 | Summary of ide driver parameters for kernel command line |
182 | -------------------------------------------------------- | 188 | ======================================================== |
183 | 189 | ||
184 | For legacy IDE VLB host drivers (ali14xx/dtc2278/ht6560b/qd65xx/umc8672) | 190 | For legacy IDE VLB host drivers (ali14xx/dtc2278/ht6560b/qd65xx/umc8672) |
185 | you need to explicitly enable probing by using "probe" kernel parameter, | 191 | you need to explicitly enable probing by using "probe" kernel parameter, |
@@ -226,28 +232,31 @@ Other kernel parameters for ide_core are: | |||
226 | 232 | ||
227 | * "chs=[interface_number.device_number]" to force device as a disk (using CHS) | 233 | * "chs=[interface_number.device_number]" to force device as a disk (using CHS) |
228 | 234 | ||
229 | ================================================================================ | ||
230 | 235 | ||
231 | Some Terminology | 236 | Some Terminology |
232 | ---------------- | 237 | ================ |
233 | IDE = Integrated Drive Electronics, meaning that each drive has a built-in | ||
234 | controller, which is why an "IDE interface card" is not a "controller card". | ||
235 | 238 | ||
236 | ATA = AT (the old IBM 286 computer) Attachment Interface, a draft American | 239 | IDE |
237 | National Standard for connecting hard drives to PCs. This is the official | 240 | Integrated Drive Electronics, meaning that each drive has a built-in |
238 | name for "IDE". | 241 | controller, which is why an "IDE interface card" is not a "controller card". |
239 | 242 | ||
240 | The latest standards define some enhancements, known as the ATA-6 spec, | 243 | ATA |
241 | which grew out of vendor-specific "Enhanced IDE" (EIDE) implementations. | 244 | AT (the old IBM 286 computer) Attachment Interface, a draft American |
245 | National Standard for connecting hard drives to PCs. This is the official | ||
246 | name for "IDE". | ||
242 | 247 | ||
243 | ATAPI = ATA Packet Interface, a new protocol for controlling the drives, | 248 | The latest standards define some enhancements, known as the ATA-6 spec, |
244 | similar to SCSI protocols, created at the same time as the ATA2 standard. | 249 | which grew out of vendor-specific "Enhanced IDE" (EIDE) implementations. |
245 | ATAPI is currently used for controlling CDROM, TAPE and FLOPPY (ZIP or | 250 | |
246 | LS120/240) devices, removable R/W cartridges, and for high capacity hard disk | 251 | ATAPI |
247 | drives. | 252 | ATA Packet Interface, a new protocol for controlling the drives, |
253 | similar to SCSI protocols, created at the same time as the ATA2 standard. | ||
254 | ATAPI is currently used for controlling CDROM, TAPE and FLOPPY (ZIP or | ||
255 | LS120/240) devices, removable R/W cartridges, and for high capacity hard disk | ||
256 | drives. | ||
248 | 257 | ||
249 | mlord@pobox.com | 258 | mlord@pobox.com |
250 | -- | 259 | |
251 | 260 | ||
252 | Wed Apr 17 22:52:44 CEST 2002 edited by Marcin Dalecki, the current | 261 | Wed Apr 17 22:52:44 CEST 2002 edited by Marcin Dalecki, the current |
253 | maintainer. | 262 | maintainer. |
diff --git a/Documentation/ide/index.rst b/Documentation/ide/index.rst new file mode 100644 index 000000000000..45bc12d3957f --- /dev/null +++ b/Documentation/ide/index.rst | |||
@@ -0,0 +1,21 @@ | |||
1 | :orphan: | ||
2 | |||
3 | ================================== | ||
4 | Integrated Drive Electronics (IDE) | ||
5 | ================================== | ||
6 | |||
7 | .. toctree:: | ||
8 | :maxdepth: 1 | ||
9 | |||
10 | ide | ||
11 | ide-tape | ||
12 | warm-plug-howto | ||
13 | |||
14 | changelogs | ||
15 | |||
16 | .. only:: subproject and html | ||
17 | |||
18 | Indices | ||
19 | ======= | ||
20 | |||
21 | * :ref:`genindex` | ||
diff --git a/Documentation/ide/warm-plug-howto.txt b/Documentation/ide/warm-plug-howto.rst index 98152bcd515a..c245242ef2f1 100644 --- a/Documentation/ide/warm-plug-howto.txt +++ b/Documentation/ide/warm-plug-howto.rst | |||
@@ -1,14 +1,14 @@ | |||
1 | 1 | =================== | |
2 | IDE warm-plug HOWTO | 2 | IDE warm-plug HOWTO |
3 | =================== | 3 | =================== |
4 | 4 | ||
5 | To warm-plug devices on a port 'idex': | 5 | To warm-plug devices on a port 'idex':: |
6 | 6 | ||
7 | # echo -n "1" > /sys/class/ide_port/idex/delete_devices | 7 | # echo -n "1" > /sys/class/ide_port/idex/delete_devices |
8 | 8 | ||
9 | unplug old device(s) and plug new device(s) | 9 | unplug old device(s) and plug new device(s):: |
10 | 10 | ||
11 | # echo -n "1" > /sys/class/ide_port/idex/scan | 11 | # echo -n "1" > /sys/class/ide_port/idex/scan |
12 | 12 | ||
13 | done | 13 | done |
14 | 14 | ||
diff --git a/arch/m68k/q40/README b/arch/m68k/q40/README index 93f4c4cd3c45..a4991d2d8af6 100644 --- a/arch/m68k/q40/README +++ b/arch/m68k/q40/README | |||
@@ -31,7 +31,7 @@ drivers used by the Q40, apart from the very obvious (console etc.): | |||
31 | char/joystick/* # most of this should work, not | 31 | char/joystick/* # most of this should work, not |
32 | # in default config.in | 32 | # in default config.in |
33 | block/q40ide.c # startup for ide | 33 | block/q40ide.c # startup for ide |
34 | ide* # see Documentation/ide/ide.txt | 34 | ide* # see Documentation/ide/ide.rst |
35 | floppy.c # normal PC driver, DMA emu in asm/floppy.h | 35 | floppy.c # normal PC driver, DMA emu in asm/floppy.h |
36 | # and arch/m68k/kernel/entry.S | 36 | # and arch/m68k/kernel/entry.S |
37 | # see drivers/block/README.fd | 37 | # see drivers/block/README.fd |
diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig index fdd2a62f9d52..9eada392df15 100644 --- a/drivers/ide/Kconfig +++ b/drivers/ide/Kconfig | |||
@@ -25,13 +25,13 @@ menuconfig IDE | |||
25 | To compile this driver as a module, choose M here: the | 25 | To compile this driver as a module, choose M here: the |
26 | module will be called ide-core. | 26 | module will be called ide-core. |
27 | 27 | ||
28 | For further information, please read <file:Documentation/ide/ide.txt>. | 28 | For further information, please read <file:Documentation/ide/ide.rst>. |
29 | 29 | ||
30 | If unsure, say N. | 30 | If unsure, say N. |
31 | 31 | ||
32 | if IDE | 32 | if IDE |
33 | 33 | ||
34 | comment "Please see Documentation/ide/ide.txt for help/info on IDE drives" | 34 | comment "Please see Documentation/ide/ide.rst for help/info on IDE drives" |
35 | 35 | ||
36 | config IDE_XFER_MODE | 36 | config IDE_XFER_MODE |
37 | bool | 37 | bool |
@@ -163,7 +163,7 @@ config BLK_DEV_IDETAPE | |||
163 | along with other IDE devices, as "hdb" or "hdc", or something | 163 | along with other IDE devices, as "hdb" or "hdc", or something |
164 | similar, and will be mapped to a character device such as "ht0" | 164 | similar, and will be mapped to a character device such as "ht0" |
165 | (check the boot messages with dmesg). Be sure to consult the | 165 | (check the boot messages with dmesg). Be sure to consult the |
166 | <file:drivers/ide/ide-tape.c> and <file:Documentation/ide/ide.txt> | 166 | <file:drivers/ide/ide-tape.c> and <file:Documentation/ide/ide.rst> |
167 | files for usage information. | 167 | files for usage information. |
168 | 168 | ||
169 | To compile this driver as a module, choose M here: the | 169 | To compile this driver as a module, choose M here: the |
@@ -251,7 +251,7 @@ config BLK_DEV_CMD640 | |||
251 | 251 | ||
252 | The CMD640 chip is also used on add-in cards by Acculogic, and on | 252 | The CMD640 chip is also used on add-in cards by Acculogic, and on |
253 | the "CSA-6400E PCI to IDE controller" that some people have. For | 253 | the "CSA-6400E PCI to IDE controller" that some people have. For |
254 | details, read <file:Documentation/ide/ide.txt>. | 254 | details, read <file:Documentation/ide/ide.rst>. |
255 | 255 | ||
256 | config BLK_DEV_CMD640_ENHANCED | 256 | config BLK_DEV_CMD640_ENHANCED |
257 | bool "CMD640 enhanced support" | 257 | bool "CMD640 enhanced support" |
@@ -259,7 +259,7 @@ config BLK_DEV_CMD640_ENHANCED | |||
259 | help | 259 | help |
260 | This option includes support for setting/autotuning PIO modes and | 260 | This option includes support for setting/autotuning PIO modes and |
261 | prefetch on CMD640 IDE interfaces. For details, read | 261 | prefetch on CMD640 IDE interfaces. For details, read |
262 | <file:Documentation/ide/ide.txt>. If you have a CMD640 IDE interface | 262 | <file:Documentation/ide/ide.rst>. If you have a CMD640 IDE interface |
263 | and your BIOS does not already do this for you, then say Y here. | 263 | and your BIOS does not already do this for you, then say Y here. |
264 | Otherwise say N. | 264 | Otherwise say N. |
265 | 265 | ||
@@ -819,7 +819,7 @@ config BLK_DEV_ALI14XX | |||
819 | boot parameter. It enables support for the secondary IDE interface | 819 | boot parameter. It enables support for the secondary IDE interface |
820 | of the ALI M1439/1443/1445/1487/1489 chipsets, and permits faster | 820 | of the ALI M1439/1443/1445/1487/1489 chipsets, and permits faster |
821 | I/O speeds to be set as well. | 821 | I/O speeds to be set as well. |
822 | See the files <file:Documentation/ide/ide.txt> and | 822 | See the files <file:Documentation/ide/ide.rst> and |
823 | <file:drivers/ide/ali14xx.c> for more info. | 823 | <file:drivers/ide/ali14xx.c> for more info. |
824 | 824 | ||
825 | config BLK_DEV_DTC2278 | 825 | config BLK_DEV_DTC2278 |
@@ -830,7 +830,7 @@ config BLK_DEV_DTC2278 | |||
830 | This driver is enabled at runtime using the "dtc2278.probe" kernel | 830 | This driver is enabled at runtime using the "dtc2278.probe" kernel |
831 | boot parameter. It enables support for the secondary IDE interface | 831 | boot parameter. It enables support for the secondary IDE interface |
832 | of the DTC-2278 card, and permits faster I/O speeds to be set as | 832 | of the DTC-2278 card, and permits faster I/O speeds to be set as |
833 | well. See the <file:Documentation/ide/ide.txt> and | 833 | well. See the <file:Documentation/ide/ide.rst> and |
834 | <file:drivers/ide/dtc2278.c> files for more info. | 834 | <file:drivers/ide/dtc2278.c> files for more info. |
835 | 835 | ||
836 | config BLK_DEV_HT6560B | 836 | config BLK_DEV_HT6560B |
@@ -841,7 +841,7 @@ config BLK_DEV_HT6560B | |||
841 | This driver is enabled at runtime using the "ht6560b.probe" kernel | 841 | This driver is enabled at runtime using the "ht6560b.probe" kernel |
842 | boot parameter. It enables support for the secondary IDE interface | 842 | boot parameter. It enables support for the secondary IDE interface |
843 | of the Holtek card, and permits faster I/O speeds to be set as well. | 843 | of the Holtek card, and permits faster I/O speeds to be set as well. |
844 | See the <file:Documentation/ide/ide.txt> and | 844 | See the <file:Documentation/ide/ide.rst> and |
845 | <file:drivers/ide/ht6560b.c> files for more info. | 845 | <file:drivers/ide/ht6560b.c> files for more info. |
846 | 846 | ||
847 | config BLK_DEV_QD65XX | 847 | config BLK_DEV_QD65XX |
@@ -851,7 +851,7 @@ config BLK_DEV_QD65XX | |||
851 | help | 851 | help |
852 | This driver is enabled at runtime using the "qd65xx.probe" kernel | 852 | This driver is enabled at runtime using the "qd65xx.probe" kernel |
853 | boot parameter. It permits faster I/O speeds to be set. See the | 853 | boot parameter. It permits faster I/O speeds to be set. See the |
854 | <file:Documentation/ide/ide.txt> and <file:drivers/ide/qd65xx.c> | 854 | <file:Documentation/ide/ide.rst> and <file:drivers/ide/qd65xx.c> |
855 | for more info. | 855 | for more info. |
856 | 856 | ||
857 | config BLK_DEV_UMC8672 | 857 | config BLK_DEV_UMC8672 |
@@ -862,7 +862,7 @@ config BLK_DEV_UMC8672 | |||
862 | This driver is enabled at runtime using the "umc8672.probe" kernel | 862 | This driver is enabled at runtime using the "umc8672.probe" kernel |
863 | boot parameter. It enables support for the secondary IDE interface | 863 | boot parameter. It enables support for the secondary IDE interface |
864 | of the UMC-8672, and permits faster I/O speeds to be set as well. | 864 | of the UMC-8672, and permits faster I/O speeds to be set as well. |
865 | See the files <file:Documentation/ide/ide.txt> and | 865 | See the files <file:Documentation/ide/ide.rst> and |
866 | <file:drivers/ide/umc8672.c> for more info. | 866 | <file:drivers/ide/umc8672.c> for more info. |
867 | 867 | ||
868 | endif | 868 | endif |