aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-07-16 14:33:39 -0400
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-07-16 14:33:39 -0400
commit9ad540937554a3779c5fe7af13aa390b1d2aeb3e (patch)
tree9ed83a58e8fb0d57ebbfacb92c62d40db185a8a8
parent3e153cfb5e38ae237ff27a10a833946ac95db8a4 (diff)
ide: move PIO blacklist to ide-pio-blacklist.c
Move PIO blacklist to ide-pio-blacklist.c. While at it: - fix comment - fix whitespace damage There should be no functional changes caused by this patch. Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat
-rw-r--r--drivers/ide/Makefile3
-rw-r--r--drivers/ide/ide-lib.c96
-rw-r--r--drivers/ide/ide-pio-blacklist.c94
-rw-r--r--include/linux/ide.h2
4 files changed, 98 insertions, 97 deletions
diff --git a/drivers/ide/Makefile b/drivers/ide/Makefile
index cb1350684c9a..8605536ea18f 100644
--- a/drivers/ide/Makefile
+++ b/drivers/ide/Makefile
@@ -11,7 +11,8 @@
11 11
12EXTRA_CFLAGS += -Idrivers/ide 12EXTRA_CFLAGS += -Idrivers/ide
13 13
14ide-core-y += ide.o ide-io.o ide-iops.o ide-lib.o ide-probe.o ide-taskfile.o 14ide-core-y += ide.o ide-io.o ide-iops.o ide-lib.o ide-probe.o ide-taskfile.o \
15 ide-pio-blacklist.o
15 16
16# core IDE code 17# core IDE code
17ide-core-$(CONFIG_IDE_TIMINGS) += ide-timings.o 18ide-core-$(CONFIG_IDE_TIMINGS) += ide-timings.o
diff --git a/drivers/ide/ide-lib.c b/drivers/ide/ide-lib.c
index 3e12f229bd5f..13af72f09ec4 100644
--- a/drivers/ide/ide-lib.c
+++ b/drivers/ide/ide-lib.c
@@ -75,102 +75,6 @@ static u8 ide_rate_filter(ide_drive_t *drive, u8 speed)
75 return min(speed, mode); 75 return min(speed, mode);
76} 76}
77 77
78/*
79 * Shared data/functions for determining best PIO mode for an IDE drive.
80 * Most of this stuff originally lived in cmd640.c, and changes to the
81 * ide_pio_blacklist[] table should be made with EXTREME CAUTION to avoid
82 * breaking the fragile cmd640.c support.
83 */
84
85/*
86 * Black list. Some drives incorrectly report their maximal PIO mode,
87 * at least in respect to CMD640. Here we keep info on some known drives.
88 */
89static struct ide_pio_info {
90 const char *name;
91 int pio;
92} ide_pio_blacklist [] = {
93 { "Conner Peripherals 540MB - CFS540A", 3 },
94
95 { "WDC AC2700", 3 },
96 { "WDC AC2540", 3 },
97 { "WDC AC2420", 3 },
98 { "WDC AC2340", 3 },
99 { "WDC AC2250", 0 },
100 { "WDC AC2200", 0 },
101 { "WDC AC21200", 4 },
102 { "WDC AC2120", 0 },
103 { "WDC AC2850", 3 },
104 { "WDC AC1270", 3 },
105 { "WDC AC1170", 1 },
106 { "WDC AC1210", 1 },
107 { "WDC AC280", 0 },
108 { "WDC AC31000", 3 },
109 { "WDC AC31200", 3 },
110
111 { "Maxtor 7131 AT", 1 },
112 { "Maxtor 7171 AT", 1 },
113 { "Maxtor 7213 AT", 1 },
114 { "Maxtor 7245 AT", 1 },
115 { "Maxtor 7345 AT", 1 },
116 { "Maxtor 7546 AT", 3 },
117 { "Maxtor 7540 AV", 3 },
118
119 { "SAMSUNG SHD-3121A", 1 },
120 { "SAMSUNG SHD-3122A", 1 },
121 { "SAMSUNG SHD-3172A", 1 },
122
123 { "ST5660A", 3 },
124 { "ST3660A", 3 },
125 { "ST3630A", 3 },
126 { "ST3655A", 3 },
127 { "ST3391A", 3 },
128 { "ST3390A", 1 },
129 { "ST3600A", 1 },
130 { "ST3290A", 0 },
131 { "ST3144A", 0 },
132 { "ST3491A", 1 }, /* reports 3, should be 1 or 2 (depending on */
133 /* drive) according to Seagates FIND-ATA program */
134
135 { "QUANTUM ELS127A", 0 },
136 { "QUANTUM ELS170A", 0 },
137 { "QUANTUM LPS240A", 0 },
138 { "QUANTUM LPS210A", 3 },
139 { "QUANTUM LPS270A", 3 },
140 { "QUANTUM LPS365A", 3 },
141 { "QUANTUM LPS540A", 3 },
142 { "QUANTUM LIGHTNING 540A", 3 },
143 { "QUANTUM LIGHTNING 730A", 3 },
144
145 { "QUANTUM FIREBALL_540", 3 }, /* Older Quantum Fireballs don't work */
146 { "QUANTUM FIREBALL_640", 3 },
147 { "QUANTUM FIREBALL_1080", 3 },
148 { "QUANTUM FIREBALL_1280", 3 },
149 { NULL, 0 }
150};
151
152/**
153 * ide_scan_pio_blacklist - check for a blacklisted drive
154 * @model: Drive model string
155 *
156 * This routine searches the ide_pio_blacklist for an entry
157 * matching the start/whole of the supplied model name.
158 *
159 * Returns -1 if no match found.
160 * Otherwise returns the recommended PIO mode from ide_pio_blacklist[].
161 */
162
163static int ide_scan_pio_blacklist (char *model)
164{
165 struct ide_pio_info *p;
166
167 for (p = ide_pio_blacklist; p->name != NULL; p++) {
168 if (strncmp(p->name, model, strlen(p->name)) == 0)
169 return p->pio;
170 }
171 return -1;
172}
173
174/** 78/**
175 * ide_get_best_pio_mode - get PIO mode from drive 79 * ide_get_best_pio_mode - get PIO mode from drive
176 * @drive: drive to consider 80 * @drive: drive to consider
diff --git a/drivers/ide/ide-pio-blacklist.c b/drivers/ide/ide-pio-blacklist.c
new file mode 100644
index 000000000000..a8c2c8f8660a
--- /dev/null
+++ b/drivers/ide/ide-pio-blacklist.c
@@ -0,0 +1,94 @@
1/*
2 * PIO blacklist. Some drives incorrectly report their maximal PIO mode,
3 * at least in respect to CMD640. Here we keep info on some known drives.
4 *
5 * Changes to the ide_pio_blacklist[] should be made with EXTREME CAUTION
6 * to avoid breaking the fragile cmd640.c support.
7 */
8
9#include <linux/string.h>
10
11static struct ide_pio_info {
12 const char *name;
13 int pio;
14} ide_pio_blacklist [] = {
15 { "Conner Peripherals 540MB - CFS540A", 3 },
16
17 { "WDC AC2700", 3 },
18 { "WDC AC2540", 3 },
19 { "WDC AC2420", 3 },
20 { "WDC AC2340", 3 },
21 { "WDC AC2250", 0 },
22 { "WDC AC2200", 0 },
23 { "WDC AC21200", 4 },
24 { "WDC AC2120", 0 },
25 { "WDC AC2850", 3 },
26 { "WDC AC1270", 3 },
27 { "WDC AC1170", 1 },
28 { "WDC AC1210", 1 },
29 { "WDC AC280", 0 },
30 { "WDC AC31000", 3 },
31 { "WDC AC31200", 3 },
32
33 { "Maxtor 7131 AT", 1 },
34 { "Maxtor 7171 AT", 1 },
35 { "Maxtor 7213 AT", 1 },
36 { "Maxtor 7245 AT", 1 },
37 { "Maxtor 7345 AT", 1 },
38 { "Maxtor 7546 AT", 3 },
39 { "Maxtor 7540 AV", 3 },
40
41 { "SAMSUNG SHD-3121A", 1 },
42 { "SAMSUNG SHD-3122A", 1 },
43 { "SAMSUNG SHD-3172A", 1 },
44
45 { "ST5660A", 3 },
46 { "ST3660A", 3 },
47 { "ST3630A", 3 },
48 { "ST3655A", 3 },
49 { "ST3391A", 3 },
50 { "ST3390A", 1 },
51 { "ST3600A", 1 },
52 { "ST3290A", 0 },
53 { "ST3144A", 0 },
54 { "ST3491A", 1 }, /* reports 3, should be 1 or 2 (depending on drive)
55 according to Seagate's FIND-ATA program */
56
57 { "QUANTUM ELS127A", 0 },
58 { "QUANTUM ELS170A", 0 },
59 { "QUANTUM LPS240A", 0 },
60 { "QUANTUM LPS210A", 3 },
61 { "QUANTUM LPS270A", 3 },
62 { "QUANTUM LPS365A", 3 },
63 { "QUANTUM LPS540A", 3 },
64 { "QUANTUM LIGHTNING 540A", 3 },
65 { "QUANTUM LIGHTNING 730A", 3 },
66
67 { "QUANTUM FIREBALL_540", 3 }, /* Older Quantum Fireballs don't work */
68 { "QUANTUM FIREBALL_640", 3 },
69 { "QUANTUM FIREBALL_1080", 3 },
70 { "QUANTUM FIREBALL_1280", 3 },
71 { NULL, 0 }
72};
73
74/**
75 * ide_scan_pio_blacklist - check for a blacklisted drive
76 * @model: Drive model string
77 *
78 * This routine searches the ide_pio_blacklist for an entry
79 * matching the start/whole of the supplied model name.
80 *
81 * Returns -1 if no match found.
82 * Otherwise returns the recommended PIO mode from ide_pio_blacklist[].
83 */
84
85int ide_scan_pio_blacklist(char *model)
86{
87 struct ide_pio_info *p;
88
89 for (p = ide_pio_blacklist; p->name != NULL; p++) {
90 if (strncmp(p->name, model, strlen(p->name)) == 0)
91 return p->pio;
92 }
93 return -1;
94}
diff --git a/include/linux/ide.h b/include/linux/ide.h
index 4e44525fa5ca..535c439fd8f0 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -1305,6 +1305,8 @@ void ide_timing_merge(struct ide_timing *, struct ide_timing *,
1305 struct ide_timing *, unsigned int); 1305 struct ide_timing *, unsigned int);
1306int ide_timing_compute(ide_drive_t *, u8, struct ide_timing *, int, int); 1306int ide_timing_compute(ide_drive_t *, u8, struct ide_timing *, int, int);
1307 1307
1308int ide_scan_pio_blacklist(char *);
1309
1308u8 ide_get_best_pio_mode(ide_drive_t *, u8, u8); 1310u8 ide_get_best_pio_mode(ide_drive_t *, u8, u8);
1309 1311
1310int ide_set_pio_mode(ide_drive_t *, u8); 1312int ide_set_pio_mode(ide_drive_t *, u8);
generated by cgit v1.2.2 (git 2.25.0) at 2024-09-27 00:16:28 -0400