Diff markup
1 /* 1 /*
2 * Adaptec AIC7xxx device driver for Linux. 2 * Adaptec AIC7xxx device driver for Linux.
3 * 3 *
4 * $Id: //depot/aic7xxx/linux/drivers/scsi/aic 4 * $Id: //depot/aic7xxx/linux/drivers/scsi/aic7xxx/aic7xxx_osm.c#235 $
5 * 5 *
6 * Copyright (c) 1994 John Aycock 6 * Copyright (c) 1994 John Aycock
7 * The University of Calgary Department of C 7 * The University of Calgary Department of Computer Science.
8 * 8 *
9 * This program is free software; you can redi 9 * This program is free software; you can redistribute it and/or modify
10 * it under the terms of the GNU General Publi 10 * it under the terms of the GNU General Public License as published by
11 * the Free Software Foundation; either versio 11 * the Free Software Foundation; either version 2, or (at your option)
12 * any later version. 12 * any later version.
13 * 13 *
14 * This program is distributed in the hope tha 14 * This program is distributed in the hope that it will be useful,
15 * but WITHOUT ANY WARRANTY; without even the 15 * but WITHOUT ANY WARRANTY; without even the implied warranty of
16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR 16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17 * GNU General Public License for more details 17 * GNU General Public License for more details.
18 * 18 *
19 * You should have received a copy of the GNU 19 * You should have received a copy of the GNU General Public License
20 * along with this program; see the file COPYI 20 * along with this program; see the file COPYING. If not, write to
21 * the Free Software Foundation, 675 Mass Ave, 21 * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
22 * 22 *
23 * Sources include the Adaptec 1740 driver (ah 23 * Sources include the Adaptec 1740 driver (aha1740.c), the Ultrastor 24F
24 * driver (ultrastor.c), various Linux kernel 24 * driver (ultrastor.c), various Linux kernel source, the Adaptec EISA
25 * config file (!adp7771.cfg), the Adaptec AHA 25 * config file (!adp7771.cfg), the Adaptec AHA-2740A Series User's Guide,
26 * the Linux Kernel Hacker's Guide, Writing a 26 * the Linux Kernel Hacker's Guide, Writing a SCSI Device Driver for Linux,
27 * the Adaptec 1542 driver (aha1542.c), the Ad 27 * the Adaptec 1542 driver (aha1542.c), the Adaptec EISA overlay file
28 * (adp7770.ovl), the Adaptec AHA-2740 Series 28 * (adp7770.ovl), the Adaptec AHA-2740 Series Technical Reference Manual,
29 * the Adaptec AIC-7770 Data Book, the ANSI SC 29 * the Adaptec AIC-7770 Data Book, the ANSI SCSI specification, the
30 * ANSI SCSI-2 specification (draft 10c), ... 30 * ANSI SCSI-2 specification (draft 10c), ...
31 * 31 *
32 * ------------------------------------------- 32 * --------------------------------------------------------------------------
33 * 33 *
34 * Modifications by Daniel M. Eischen (deisch 34 * Modifications by Daniel M. Eischen (deischen@iworks.InterWorks.org):
35 * 35 *
36 * Substantially modified to include support 36 * Substantially modified to include support for wide and twin bus
37 * adapters, DMAing of SCBs, tagged queueing, 37 * adapters, DMAing of SCBs, tagged queueing, IRQ sharing, bug fixes,
38 * SCB paging, and other rework of the code. 38 * SCB paging, and other rework of the code.
39 * 39 *
40 * ------------------------------------------- 40 * --------------------------------------------------------------------------
41 * Copyright (c) 1994-2000 Justin T. Gibbs. 41 * Copyright (c) 1994-2000 Justin T. Gibbs.
42 * Copyright (c) 2000-2001 Adaptec Inc. 42 * Copyright (c) 2000-2001 Adaptec Inc.
43 * All rights reserved. 43 * All rights reserved.
44 * 44 *
45 * Redistribution and use in source and binary 45 * Redistribution and use in source and binary forms, with or without
46 * modification, are permitted provided that t 46 * modification, are permitted provided that the following conditions
47 * are met: 47 * are met:
48 * 1. Redistributions of source code must reta 48 * 1. Redistributions of source code must retain the above copyright
49 * notice, this list of conditions, and the 49 * notice, this list of conditions, and the following disclaimer,
50 * without modification. 50 * without modification.
51 * 2. Redistributions in binary form must repr 51 * 2. Redistributions in binary form must reproduce at minimum a disclaimer
52 * substantially similar to the "NO WARRANT 52 * substantially similar to the "NO WARRANTY" disclaimer below
53 * ("Disclaimer") and any redistribution mu 53 * ("Disclaimer") and any redistribution must be conditioned upon
54 * including a substantially similar Discla 54 * including a substantially similar Disclaimer requirement for further
55 * binary redistribution. 55 * binary redistribution.
56 * 3. Neither the names of the above-listed co 56 * 3. Neither the names of the above-listed copyright holders nor the names
57 * of any contributors may be used to endor 57 * of any contributors may be used to endorse or promote products derived
58 * from this software without specific prio 58 * from this software without specific prior written permission.
59 * 59 *
60 * Alternatively, this software may be distrib 60 * Alternatively, this software may be distributed under the terms of the
61 * GNU General Public License ("GPL") version 61 * GNU General Public License ("GPL") version 2 as published by the Free
62 * Software Foundation. 62 * Software Foundation.
63 * 63 *
64 * NO WARRANTY 64 * NO WARRANTY
65 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT 65 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
66 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTI 66 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
67 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCH 67 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
68 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO 68 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
69 * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECI 69 * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
70 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PRO 70 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
71 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; 71 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
72 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILI 72 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
73 * STRICT LIABILITY, OR TORT (INCLUDING NEGLIG 73 * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
74 * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, 74 * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
75 * POSSIBILITY OF SUCH DAMAGES. 75 * POSSIBILITY OF SUCH DAMAGES.
76 * 76 *
77 *-------------------------------------------- 77 *---------------------------------------------------------------------------
78 * 78 *
79 * Thanks also go to (in alphabetical order) 79 * Thanks also go to (in alphabetical order) the following:
80 * 80 *
81 * Rory Bolt - Sequencer bug fixes 81 * Rory Bolt - Sequencer bug fixes
82 * Jay Estabrook - Initial DEC Alpha suppor 82 * Jay Estabrook - Initial DEC Alpha support
83 * Doug Ledford - Much needed abort/reset 83 * Doug Ledford - Much needed abort/reset bug fixes
84 * Kai Makisara - DMAing of SCBs 84 * Kai Makisara - DMAing of SCBs
85 * 85 *
86 * A Boot time option was also added for not 86 * A Boot time option was also added for not resetting the scsi bus.
87 * 87 *
88 * Form: aic7xxx=extended 88 * Form: aic7xxx=extended
89 * aic7xxx=no_reset 89 * aic7xxx=no_reset
90 * aic7xxx=verbose 90 * aic7xxx=verbose
91 * 91 *
92 * Daniel M. Eischen, deischen@iworks.InterWo 92 * Daniel M. Eischen, deischen@iworks.InterWorks.org, 1/23/97
93 * 93 *
94 * Id: aic7xxx.c,v 4.1 1997/06/12 08:23:42 de 94 * Id: aic7xxx.c,v 4.1 1997/06/12 08:23:42 deang Exp
95 */ 95 */
96 96
97 /* 97 /*
98 * Further driver modifications made by Doug L 98 * Further driver modifications made by Doug Ledford <dledford@redhat.com>
99 * 99 *
100 * Copyright (c) 1997-1999 Doug Ledford 100 * Copyright (c) 1997-1999 Doug Ledford
101 * 101 *
102 * These changes are released under the same l 102 * These changes are released under the same licensing terms as the FreeBSD
103 * driver written by Justin Gibbs. Please see 103 * driver written by Justin Gibbs. Please see his Copyright notice above
104 * for the exact terms and conditions covering 104 * for the exact terms and conditions covering my changes as well as the
105 * warranty statement. 105 * warranty statement.
106 * 106 *
107 * Modifications made to the aic7xxx.c,v 4.1 d 107 * Modifications made to the aic7xxx.c,v 4.1 driver from Dan Eischen include
108 * but are not limited to: 108 * but are not limited to:
109 * 109 *
110 * 1: Import of the latest FreeBSD sequencer 110 * 1: Import of the latest FreeBSD sequencer code for this driver
111 * 2: Modification of kernel code to accommod 111 * 2: Modification of kernel code to accommodate different sequencer semantics
112 * 3: Extensive changes throughout kernel por 112 * 3: Extensive changes throughout kernel portion of driver to improve
113 * abort/reset processing and error hanndl 113 * abort/reset processing and error hanndling
114 * 4: Other work contributed by various peopl 114 * 4: Other work contributed by various people on the Internet
115 * 5: Changes to printk information and verbo 115 * 5: Changes to printk information and verbosity selection code
116 * 6: General reliability related changes, es 116 * 6: General reliability related changes, especially in IRQ management
117 * 7: Modifications to the default probe/atta 117 * 7: Modifications to the default probe/attach order for supported cards
118 * 8: SMP friendliness has been improved 118 * 8: SMP friendliness has been improved
119 * 119 *
120 */ 120 */
121 121
122 #include "aic7xxx_osm.h" 122 #include "aic7xxx_osm.h"
123 #include "aic7xxx_inline.h" 123 #include "aic7xxx_inline.h"
124 #include <scsi/scsicam.h> 124 #include <scsi/scsicam.h>
125 125
126 static struct scsi_transport_template *ahc_lin 126 static struct scsi_transport_template *ahc_linux_transport_template = NULL;
127 127
128 #include <linux/init.h> /* __setup */ 128 #include <linux/init.h> /* __setup */
129 #include <linux/mm.h> /* For fetchin 129 #include <linux/mm.h> /* For fetching system memory size */
130 #include <linux/blkdev.h> /* For 130 #include <linux/blkdev.h> /* For block_size() */
131 #include <linux/delay.h> /* For ssleep/ 131 #include <linux/delay.h> /* For ssleep/msleep */
132 132
133 133
134 /* 134 /*
135 * Set this to the delay in seconds after SCSI 135 * Set this to the delay in seconds after SCSI bus reset.
136 * Note, we honor this only for the initial bu 136 * Note, we honor this only for the initial bus reset.
137 * The scsi error recovery code performs its o 137 * The scsi error recovery code performs its own bus settle
138 * delay handling for error recovery actions. 138 * delay handling for error recovery actions.
139 */ 139 */
140 #ifdef CONFIG_AIC7XXX_RESET_DELAY_MS 140 #ifdef CONFIG_AIC7XXX_RESET_DELAY_MS
141 #define AIC7XXX_RESET_DELAY CONFIG_AIC7XXX_RES 141 #define AIC7XXX_RESET_DELAY CONFIG_AIC7XXX_RESET_DELAY_MS
142 #else 142 #else
143 #define AIC7XXX_RESET_DELAY 5000 143 #define AIC7XXX_RESET_DELAY 5000
144 #endif 144 #endif
145 145
146 /* 146 /*
147 * Control collection of SCSI transfer statist 147 * Control collection of SCSI transfer statistics for the /proc filesystem.
148 * 148 *
149 * NOTE: Do NOT enable this when running on ke 149 * NOTE: Do NOT enable this when running on kernels version 1.2.x and below.
150 * NOTE: This does affect performance since it 150 * NOTE: This does affect performance since it has to maintain statistics.
151 */ 151 */
152 #ifdef CONFIG_AIC7XXX_PROC_STATS 152 #ifdef CONFIG_AIC7XXX_PROC_STATS
153 #define AIC7XXX_PROC_STATS 153 #define AIC7XXX_PROC_STATS
154 #endif 154 #endif
155 155
156 /* 156 /*
157 * To change the default number of tagged tran 157 * To change the default number of tagged transactions allowed per-device,
158 * add a line to the lilo.conf file like: 158 * add a line to the lilo.conf file like:
159 * append="aic7xxx=verbose,tag_info:{{32,32,32 159 * append="aic7xxx=verbose,tag_info:{{32,32,32,32},{32,32,32,32}}"
160 * which will result in the first four devices 160 * which will result in the first four devices on the first two
161 * controllers being set to a tagged queue dep 161 * controllers being set to a tagged queue depth of 32.
162 * 162 *
163 * The tag_commands is an array of 16 to allow 163 * The tag_commands is an array of 16 to allow for wide and twin adapters.
164 * Twin adapters will use indexes 0-7 for chan 164 * Twin adapters will use indexes 0-7 for channel 0, and indexes 8-15
165 * for channel 1. 165 * for channel 1.
166 */ 166 */
167 typedef struct { 167 typedef struct {
168 uint8_t tag_commands[16]; /* All 168 uint8_t tag_commands[16]; /* Allow for wide/twin adapters. */
169 } adapter_tag_info_t; 169 } adapter_tag_info_t;
170 170
171 /* 171 /*
172 * Modify this as you see fit for your system. 172 * Modify this as you see fit for your system.
173 * 173 *
174 * 0 tagged queuing disable 174 * 0 tagged queuing disabled
175 * 1 <= n <= 253 n == max tags ever dis 175 * 1 <= n <= 253 n == max tags ever dispatched.
176 * 176 *
177 * The driver will throttle the number of comm 177 * The driver will throttle the number of commands dispatched to a
178 * device if it returns queue full. For devic 178 * device if it returns queue full. For devices with a fixed maximum
179 * queue depth, the driver will eventually det 179 * queue depth, the driver will eventually determine this depth and
180 * lock it in (a console message is printed to 180 * lock it in (a console message is printed to indicate that a lock
181 * has occurred). On some devices, queue full 181 * has occurred). On some devices, queue full is returned for a temporary
182 * resource shortage. These devices will retu 182 * resource shortage. These devices will return queue full at varying
183 * depths. The driver will throttle back when 183 * depths. The driver will throttle back when the queue fulls occur and
184 * attempt to slowly increase the depth over t 184 * attempt to slowly increase the depth over time as the device recovers
185 * from the resource shortage. 185 * from the resource shortage.
186 * 186 *
187 * In this example, the first line will disabl 187 * In this example, the first line will disable tagged queueing for all
188 * the devices on the first probed aic7xxx ada 188 * the devices on the first probed aic7xxx adapter.
189 * 189 *
190 * The second line enables tagged queueing wit 190 * The second line enables tagged queueing with 4 commands/LUN for IDs
191 * (0, 2-11, 13-15), disables tagged queueing 191 * (0, 2-11, 13-15), disables tagged queueing for ID 12, and tells the
192 * driver to attempt to use up to 64 tags for 192 * driver to attempt to use up to 64 tags for ID 1.
193 * 193 *
194 * The third line is the same as the first lin 194 * The third line is the same as the first line.
195 * 195 *
196 * The fourth line disables tagged queueing fo 196 * The fourth line disables tagged queueing for devices 0 and 3. It
197 * enables tagged queueing for the other IDs, 197 * enables tagged queueing for the other IDs, with 16 commands/LUN
198 * for IDs 1 and 4, 127 commands/LUN for ID 8, 198 * for IDs 1 and 4, 127 commands/LUN for ID 8, and 4 commands/LUN for
199 * IDs 2, 5-7, and 9-15. 199 * IDs 2, 5-7, and 9-15.
200 */ 200 */
201 201
202 /* 202 /*
203 * NOTE: The below structure is for reference 203 * NOTE: The below structure is for reference only, the actual structure
204 * to modify in order to change things i 204 * to modify in order to change things is just below this comment block.
205 adapter_tag_info_t aic7xxx_tag_info[] = 205 adapter_tag_info_t aic7xxx_tag_info[] =
206 { 206 {
207 {{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 207 {{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}},
208 {{4, 64, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 208 {{4, 64, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 0, 4, 4, 4}},
209 {{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 209 {{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}},
210 {{0, 16, 4, 0, 16, 4, 4, 4, 127, 4, 4, 210 {{0, 16, 4, 0, 16, 4, 4, 4, 127, 4, 4, 4, 4, 4, 4, 4}}
211 }; 211 };
212 */ 212 */
213 213
214 #ifdef CONFIG_AIC7XXX_CMDS_PER_DEVICE 214 #ifdef CONFIG_AIC7XXX_CMDS_PER_DEVICE
215 #define AIC7XXX_CMDS_PER_DEVICE CONFIG_AIC7XXX 215 #define AIC7XXX_CMDS_PER_DEVICE CONFIG_AIC7XXX_CMDS_PER_DEVICE
216 #else 216 #else
217 #define AIC7XXX_CMDS_PER_DEVICE AHC_MAX_QUEUE 217 #define AIC7XXX_CMDS_PER_DEVICE AHC_MAX_QUEUE
218 #endif 218 #endif
219 219
220 #define AIC7XXX_CONFIGED_TAG_COMMANDS { 220 #define AIC7XXX_CONFIGED_TAG_COMMANDS { \
221 AIC7XXX_CMDS_PER_DEVICE, AIC7XXX_CMDS_ 221 AIC7XXX_CMDS_PER_DEVICE, AIC7XXX_CMDS_PER_DEVICE, \
222 AIC7XXX_CMDS_PER_DEVICE, AIC7XXX_CMDS_ 222 AIC7XXX_CMDS_PER_DEVICE, AIC7XXX_CMDS_PER_DEVICE, \
223 AIC7XXX_CMDS_PER_DEVICE, AIC7XXX_CMDS_ 223 AIC7XXX_CMDS_PER_DEVICE, AIC7XXX_CMDS_PER_DEVICE, \
224 AIC7XXX_CMDS_PER_DEVICE, AIC7XXX_CMDS_ 224 AIC7XXX_CMDS_PER_DEVICE, AIC7XXX_CMDS_PER_DEVICE, \
225 AIC7XXX_CMDS_PER_DEVICE, AIC7XXX_CMDS_ 225 AIC7XXX_CMDS_PER_DEVICE, AIC7XXX_CMDS_PER_DEVICE, \
226 AIC7XXX_CMDS_PER_DEVICE, AIC7XXX_CMDS_ 226 AIC7XXX_CMDS_PER_DEVICE, AIC7XXX_CMDS_PER_DEVICE, \
227 AIC7XXX_CMDS_PER_DEVICE, AIC7XXX_CMDS_ 227 AIC7XXX_CMDS_PER_DEVICE, AIC7XXX_CMDS_PER_DEVICE, \
228 AIC7XXX_CMDS_PER_DEVICE, AIC7XXX_CMDS_ 228 AIC7XXX_CMDS_PER_DEVICE, AIC7XXX_CMDS_PER_DEVICE \
229 } 229 }
230 230
231 /* 231 /*
232 * By default, use the number of commands spec 232 * By default, use the number of commands specified by
233 * the users kernel configuration. 233 * the users kernel configuration.
234 */ 234 */
235 static adapter_tag_info_t aic7xxx_tag_info[] = 235 static adapter_tag_info_t aic7xxx_tag_info[] =
236 { 236 {
237 {AIC7XXX_CONFIGED_TAG_COMMANDS}, 237 {AIC7XXX_CONFIGED_TAG_COMMANDS},
238 {AIC7XXX_CONFIGED_TAG_COMMANDS}, 238 {AIC7XXX_CONFIGED_TAG_COMMANDS},
239 {AIC7XXX_CONFIGED_TAG_COMMANDS}, 239 {AIC7XXX_CONFIGED_TAG_COMMANDS},
240 {AIC7XXX_CONFIGED_TAG_COMMANDS}, 240 {AIC7XXX_CONFIGED_TAG_COMMANDS},
241 {AIC7XXX_CONFIGED_TAG_COMMANDS}, 241 {AIC7XXX_CONFIGED_TAG_COMMANDS},
242 {AIC7XXX_CONFIGED_TAG_COMMANDS}, 242 {AIC7XXX_CONFIGED_TAG_COMMANDS},
243 {AIC7XXX_CONFIGED_TAG_COMMANDS}, 243 {AIC7XXX_CONFIGED_TAG_COMMANDS},
244 {AIC7XXX_CONFIGED_TAG_COMMANDS}, 244 {AIC7XXX_CONFIGED_TAG_COMMANDS},
245 {AIC7XXX_CONFIGED_TAG_COMMANDS}, 245 {AIC7XXX_CONFIGED_TAG_COMMANDS},
246 {AIC7XXX_CONFIGED_TAG_COMMANDS}, 246 {AIC7XXX_CONFIGED_TAG_COMMANDS},
247 {AIC7XXX_CONFIGED_TAG_COMMANDS}, 247 {AIC7XXX_CONFIGED_TAG_COMMANDS},
248 {AIC7XXX_CONFIGED_TAG_COMMANDS}, 248 {AIC7XXX_CONFIGED_TAG_COMMANDS},
249 {AIC7XXX_CONFIGED_TAG_COMMANDS}, 249 {AIC7XXX_CONFIGED_TAG_COMMANDS},
250 {AIC7XXX_CONFIGED_TAG_COMMANDS}, 250 {AIC7XXX_CONFIGED_TAG_COMMANDS},
251 {AIC7XXX_CONFIGED_TAG_COMMANDS}, 251 {AIC7XXX_CONFIGED_TAG_COMMANDS},
252 {AIC7XXX_CONFIGED_TAG_COMMANDS} 252 {AIC7XXX_CONFIGED_TAG_COMMANDS}
253 }; 253 };
254 254
255 /* 255 /*
256 * There should be a specific return value for 256 * There should be a specific return value for this in scsi.h, but
257 * it seems that most drivers ignore it. 257 * it seems that most drivers ignore it.
258 */ 258 */
259 #define DID_UNDERFLOW DID_ERROR 259 #define DID_UNDERFLOW DID_ERROR
260 260
261 void 261 void
262 ahc_print_path(struct ahc_softc *ahc, struct s 262 ahc_print_path(struct ahc_softc *ahc, struct scb *scb)
263 { 263 {
264 printk("(scsi%d:%c:%d:%d): ", 264 printk("(scsi%d:%c:%d:%d): ",
265 ahc->platform_data->host->host_ 265 ahc->platform_data->host->host_no,
266 scb != NULL ? SCB_GET_CHANNEL(a 266 scb != NULL ? SCB_GET_CHANNEL(ahc, scb) : 'X',
267 scb != NULL ? SCB_GET_TARGET(ah 267 scb != NULL ? SCB_GET_TARGET(ahc, scb) : -1,
268 scb != NULL ? SCB_GET_LUN(scb) 268 scb != NULL ? SCB_GET_LUN(scb) : -1);
269 } 269 }
270 270
271 /* 271 /*
272 * XXX - these options apply unilaterally to _ 272 * XXX - these options apply unilaterally to _all_ 274x/284x/294x
273 * cards in the system. This should be 273 * cards in the system. This should be fixed. Exceptions to this
274 * rule are noted in the comments. 274 * rule are noted in the comments.
275 */ 275 */
276 276
277 /* 277 /*
278 * Skip the scsi bus reset. Non 0 make us ski 278 * Skip the scsi bus reset. Non 0 make us skip the reset at startup. This
279 * has no effect on any later resets that migh 279 * has no effect on any later resets that might occur due to things like
280 * SCSI bus timeouts. 280 * SCSI bus timeouts.
281 */ 281 */
282 static uint32_t aic7xxx_no_reset; 282 static uint32_t aic7xxx_no_reset;
283 283
284 /* 284 /*
285 * Should we force EXTENDED translation on a c 285 * Should we force EXTENDED translation on a controller.
286 * 0 == Use whatever is in the SEEPROM or 286 * 0 == Use whatever is in the SEEPROM or default to off
287 * 1 == Use whatever is in the SEEPROM or 287 * 1 == Use whatever is in the SEEPROM or default to on
288 */ 288 */
289 static uint32_t aic7xxx_extended; 289 static uint32_t aic7xxx_extended;
290 290
291 /* 291 /*
292 * PCI bus parity checking of the Adaptec cont 292 * PCI bus parity checking of the Adaptec controllers. This is somewhat
293 * dubious at best. To my knowledge, this opt 293 * dubious at best. To my knowledge, this option has never actually
294 * solved a PCI parity problem, but on certain 294 * solved a PCI parity problem, but on certain machines with broken PCI
295 * chipset configurations where stray PCI tran 295 * chipset configurations where stray PCI transactions with bad parity are
296 * the norm rather than the exception, the err 296 * the norm rather than the exception, the error messages can be overwelming.
297 * It's included in the driver for completenes 297 * It's included in the driver for completeness.
298 * 0 = Shut off PCI parity check 298 * 0 = Shut off PCI parity check
299 * non-0 = reverse polarity pci parity check 299 * non-0 = reverse polarity pci parity checking
300 */ 300 */
301 static uint32_t aic7xxx_pci_parity = ~0; 301 static uint32_t aic7xxx_pci_parity = ~0;
302 302
303 /* 303 /*
304 * There are lots of broken chipsets in the wo 304 * There are lots of broken chipsets in the world. Some of them will
305 * violate the PCI spec when we issue byte siz 305 * violate the PCI spec when we issue byte sized memory writes to our
306 * controller. I/O mapped register access, if 306 * controller. I/O mapped register access, if allowed by the given
307 * platform, will work in almost all cases. 307 * platform, will work in almost all cases.
308 */ 308 */
309 uint32_t aic7xxx_allow_memio = ~0; 309 uint32_t aic7xxx_allow_memio = ~0;
310 310
311 /* 311 /*
312 * So that we can set how long each device is 312 * So that we can set how long each device is given as a selection timeout.
313 * The table of values goes like this: 313 * The table of values goes like this:
314 * 0 - 256ms 314 * 0 - 256ms
315 * 1 - 128ms 315 * 1 - 128ms
316 * 2 - 64ms 316 * 2 - 64ms
317 * 3 - 32ms 317 * 3 - 32ms
318 * We default to 256ms because some older devi 318 * We default to 256ms because some older devices need a longer time
319 * to respond to initial selection. 319 * to respond to initial selection.
320 */ 320 */
321 static uint32_t aic7xxx_seltime; 321 static uint32_t aic7xxx_seltime;
322 322
323 /* 323 /*
324 * Certain devices do not perform any aging on 324 * Certain devices do not perform any aging on commands. Should the
325 * device be saturated by commands in one port 325 * device be saturated by commands in one portion of the disk, it is
326 * possible for transactions on far away secto 326 * possible for transactions on far away sectors to never be serviced.
327 * To handle these devices, we can periodicall 327 * To handle these devices, we can periodically send an ordered tag to
328 * force all outstanding transactions to be se 328 * force all outstanding transactions to be serviced prior to a new
329 * transaction. 329 * transaction.
330 */ 330 */
331 static uint32_t aic7xxx_periodic_otag; 331 static uint32_t aic7xxx_periodic_otag;
332 332
333 /* 333 /*
334 * Module information and settable options. 334 * Module information and settable options.
335 */ 335 */
336 static char *aic7xxx = NULL; 336 static char *aic7xxx = NULL;
337 337
338 MODULE_AUTHOR("Maintainer: Hannes Reinecke <ha 338 MODULE_AUTHOR("Maintainer: Hannes Reinecke <hare@suse.de>");
339 MODULE_DESCRIPTION("Adaptec AIC77XX/78XX SCSI 339 MODULE_DESCRIPTION("Adaptec AIC77XX/78XX SCSI Host Bus Adapter driver");
340 MODULE_LICENSE("Dual BSD/GPL"); 340 MODULE_LICENSE("Dual BSD/GPL");
341 MODULE_VERSION(AIC7XXX_DRIVER_VERSION); 341 MODULE_VERSION(AIC7XXX_DRIVER_VERSION);
342 module_param(aic7xxx, charp, 0444); 342 module_param(aic7xxx, charp, 0444);
343 MODULE_PARM_DESC(aic7xxx, 343 MODULE_PARM_DESC(aic7xxx,
344 "period-delimited options string:\n" 344 "period-delimited options string:\n"
345 " verbose Enable verbose 345 " verbose Enable verbose/diagnostic logging\n"
346 " allow_memio Allow device r 346 " allow_memio Allow device registers to be memory mapped\n"
347 " debug Bitmask of deb 347 " debug Bitmask of debug values to enable\n"
348 " no_probe Toggle EISA/VL 348 " no_probe Toggle EISA/VLB controller probing\n"
349 " probe_eisa_vl Toggle EISA/VL 349 " probe_eisa_vl Toggle EISA/VLB controller probing\n"
350 " no_reset Suppress initi 350 " no_reset Suppress initial bus resets\n"
351 " extended Enable extende 351 " extended Enable extended geometry on all controllers\n"
352 " periodic_otag Send an ordere 352 " periodic_otag Send an ordered tagged transaction\n"
353 " periodically t 353 " periodically to prevent tag starvation.\n"
354 " This may be re 354 " This may be required by some older disk\n"
355 " drives or RAID 355 " drives or RAID arrays.\n"
356 " tag_info:<tag_str> Set per-target 356 " tag_info:<tag_str> Set per-target tag depth\n"
357 " global_tag_depth:<int> Global tag dep 357 " global_tag_depth:<int> Global tag depth for every target\n"
358 " on every bus\n 358 " on every bus\n"
359 " seltime:<int> Selection Time 359 " seltime:<int> Selection Timeout\n"
360 " (0/256ms,1/128 360 " (0/256ms,1/128ms,2/64ms,3/32ms)\n"
361 "\n" 361 "\n"
362 " Sample /etc/modprobe.conf line:\n" 362 " Sample /etc/modprobe.conf line:\n"
363 " Toggle EISA/VLB probing\n" 363 " Toggle EISA/VLB probing\n"
364 " Set tag depth on Controller 1/ 364 " Set tag depth on Controller 1/Target 1 to 10 tags\n"
365 " Shorten the selection timeout 365 " Shorten the selection timeout to 128ms\n"
366 "\n" 366 "\n"
367 " options aic7xxx 'aic7xxx=probe_eisa_vl 367 " options aic7xxx 'aic7xxx=probe_eisa_vl.tag_info:{{}.{.10}}.seltime:1'\n"
368 ); 368 );
369 369
370 static void ahc_linux_handle_scsi_status(struc 370 static void ahc_linux_handle_scsi_status(struct ahc_softc *,
371 struc 371 struct scsi_device *,
372 struc 372 struct scb *);
373 static void ahc_linux_queue_cmd_complete(struc 373 static void ahc_linux_queue_cmd_complete(struct ahc_softc *ahc,
374 struc 374 struct scsi_cmnd *cmd);
375 static void ahc_linux_freeze_simq(struct ahc_s 375 static void ahc_linux_freeze_simq(struct ahc_softc *ahc);
376 static void ahc_linux_release_simq(struct ahc_ 376 static void ahc_linux_release_simq(struct ahc_softc *ahc);
377 static int ahc_linux_queue_recovery_cmd(struc 377 static int ahc_linux_queue_recovery_cmd(struct scsi_cmnd *cmd, scb_flag flag);
378 static void ahc_linux_initialize_scsi_bus(stru 378 static void ahc_linux_initialize_scsi_bus(struct ahc_softc *ahc);
379 static u_int ahc_linux_user_tagdepth(struct ah 379 static u_int ahc_linux_user_tagdepth(struct ahc_softc *ahc,
380 struct ah 380 struct ahc_devinfo *devinfo);
381 static void ahc_linux_device_queue_depth(struc 381 static void ahc_linux_device_queue_depth(struct scsi_device *);
382 static int ahc_linux_run_command(struct ahc_so 382 static int ahc_linux_run_command(struct ahc_softc*,
383 struct ahc_li 383 struct ahc_linux_device *,
384 struct scsi_c 384 struct scsi_cmnd *);
385 static void ahc_linux_setup_tag_info_global(ch 385 static void ahc_linux_setup_tag_info_global(char *p);
386 static int aic7xxx_setup(char *s); 386 static int aic7xxx_setup(char *s);
387 387
388 static int ahc_linux_unit; 388 static int ahc_linux_unit;
389 389
390 390
>> 391 /************************** OS Utility Wrappers *******************************/
>> 392 void
>> 393 ahc_delay(long usec)
>> 394 {
>> 395 /*
>> 396 * udelay on Linux can have problems for
>> 397 * multi-millisecond waits. Wait at most
>> 398 * 1024us per call.
>> 399 */
>> 400 while (usec > 0) {
>> 401 udelay(usec % 1024);
>> 402 usec -= 1024;
>> 403 }
>> 404 }
>> 405
>> 406 /***************************** Low Level I/O **********************************/
>> 407 uint8_t
>> 408 ahc_inb(struct ahc_softc * ahc, long port)
>> 409 {
>> 410 uint8_t x;
>> 411
>> 412 if (ahc->tag == BUS_SPACE_MEMIO) {
>> 413 x = readb(ahc->bsh.maddr + port);
>> 414 } else {
>> 415 x = inb(ahc->bsh.ioport + port);
>> 416 }
>> 417 mb();
>> 418 return (x);
>> 419 }
>> 420
>> 421 void
>> 422 ahc_outb(struct ahc_softc * ahc, long port, uint8_t val)
>> 423 {
>> 424 if (ahc->tag == BUS_SPACE_MEMIO) {
>> 425 writeb(val, ahc->bsh.maddr + port);
>> 426 } else {
>> 427 outb(val, ahc->bsh.ioport + port);
>> 428 }
>> 429 mb();
>> 430 }
>> 431
>> 432 void
>> 433 ahc_outsb(struct ahc_softc * ahc, long port, uint8_t *array, int count)
>> 434 {
>> 435 int i;
>> 436
>> 437 /*
>> 438 * There is probably a more efficient way to do this on Linux
>> 439 * but we don't use this for anything speed critical and this
>> 440 * should work.
>> 441 */
>> 442 for (i = 0; i < count; i++)
>> 443 ahc_outb(ahc, port, *array++);
>> 444 }
>> 445
>> 446 void
>> 447 ahc_insb(struct ahc_softc * ahc, long port, uint8_t *array, int count)
>> 448 {
>> 449 int i;
>> 450
>> 451 /*
>> 452 * There is probably a more efficient way to do this on Linux
>> 453 * but we don't use this for anything speed critical and this
>> 454 * should work.
>> 455 */
>> 456 for (i = 0; i < count; i++)
>> 457 *array++ = ahc_inb(ahc, port);
>> 458 }
>> 459
391 /********************************* Inlines *** 460 /********************************* Inlines ************************************/
392 static __inline void ahc_linux_unmap_scb(struc !! 461 static void ahc_linux_unmap_scb(struct ahc_softc*, struct scb*);
393 462
394 static __inline int ahc_linux_map_seg(struct a !! 463 static int ahc_linux_map_seg(struct ahc_softc *ahc, struct scb *scb,
395 struct a 464 struct ahc_dma_seg *sg,
396 dma_addr 465 dma_addr_t addr, bus_size_t len);
397 466
398 static __inline void !! 467 static void
399 ahc_linux_unmap_scb(struct ahc_softc *ahc, str 468 ahc_linux_unmap_scb(struct ahc_softc *ahc, struct scb *scb)
400 { 469 {
401 struct scsi_cmnd *cmd; 470 struct scsi_cmnd *cmd;
402 471
403 cmd = scb->io_ctx; 472 cmd = scb->io_ctx;
404 ahc_sync_sglist(ahc, scb, BUS_DMASYNC_ 473 ahc_sync_sglist(ahc, scb, BUS_DMASYNC_POSTWRITE);
405 474
406 scsi_dma_unmap(cmd); 475 scsi_dma_unmap(cmd);
407 } 476 }
408 477
409 static __inline int !! 478 static int
410 ahc_linux_map_seg(struct ahc_softc *ahc, struc 479 ahc_linux_map_seg(struct ahc_softc *ahc, struct scb *scb,
411 struct ahc_dma_seg *sg, dma_ 480 struct ahc_dma_seg *sg, dma_addr_t addr, bus_size_t len)
412 { 481 {
413 int consumed; 482 int consumed;
414 483
415 if ((scb->sg_count + 1) > AHC_NSEG) 484 if ((scb->sg_count + 1) > AHC_NSEG)
416 panic("Too few segs for dma ma 485 panic("Too few segs for dma mapping. "
417 "Increase AHC_NSEG\n"); 486 "Increase AHC_NSEG\n");
418 487
419 consumed = 1; 488 consumed = 1;
420 sg->addr = ahc_htole32(addr & 0xFFFFFF 489 sg->addr = ahc_htole32(addr & 0xFFFFFFFF);
421 scb->platform_data->xfer_len += len; 490 scb->platform_data->xfer_len += len;
422 491
423 if (sizeof(dma_addr_t) > 4 492 if (sizeof(dma_addr_t) > 4
424 && (ahc->flags & AHC_39BIT_ADDRESSING 493 && (ahc->flags & AHC_39BIT_ADDRESSING) != 0)
425 len |= (addr >> 8) & AHC_SG_HI 494 len |= (addr >> 8) & AHC_SG_HIGH_ADDR_MASK;
426 495
427 sg->len = ahc_htole32(len); 496 sg->len = ahc_htole32(len);
428 return (consumed); 497 return (consumed);
429 } 498 }
430 499
431 /* 500 /*
432 * Return a string describing the driver. 501 * Return a string describing the driver.
433 */ 502 */
434 static const char * 503 static const char *
435 ahc_linux_info(struct Scsi_Host *host) 504 ahc_linux_info(struct Scsi_Host *host)
436 { 505 {
437 static char buffer[512]; 506 static char buffer[512];
438 char ahc_info[256]; 507 char ahc_info[256];
439 char *bp; 508 char *bp;
440 struct ahc_softc *ahc; 509 struct ahc_softc *ahc;
441 510
442 bp = &buffer[0]; 511 bp = &buffer[0];
443 ahc = *(struct ahc_softc **)host->host 512 ahc = *(struct ahc_softc **)host->hostdata;
444 memset(bp, 0, sizeof(buffer)); 513 memset(bp, 0, sizeof(buffer));
445 strcpy(bp, "Adaptec AIC7XXX EISA/VLB/P !! 514 strcpy(bp, "Adaptec AIC7XXX EISA/VLB/PCI SCSI HBA DRIVER, Rev " AIC7XXX_DRIVER_VERSION "\n"
446 strcat(bp, AIC7XXX_DRIVER_VERSION); !! 515 " <");
447 strcat(bp, "\n"); <<
448 strcat(bp, " <"); <<
449 strcat(bp, ahc->description); 516 strcat(bp, ahc->description);
450 strcat(bp, ">\n"); !! 517 strcat(bp, ">\n"
451 strcat(bp, " "); !! 518 " ");
452 ahc_controller_info(ahc, ahc_info); 519 ahc_controller_info(ahc, ahc_info);
453 strcat(bp, ahc_info); 520 strcat(bp, ahc_info);
454 strcat(bp, "\n"); 521 strcat(bp, "\n");
455 522
456 return (bp); 523 return (bp);
457 } 524 }
458 525
459 /* 526 /*
460 * Queue an SCB to the controller. 527 * Queue an SCB to the controller.
461 */ 528 */
462 static int 529 static int
463 ahc_linux_queue(struct scsi_cmnd * cmd, void ( 530 ahc_linux_queue(struct scsi_cmnd * cmd, void (*scsi_done) (struct scsi_cmnd *))
464 { 531 {
465 struct ahc_softc *ahc; 532 struct ahc_softc *ahc;
466 struct ahc_linux_device *dev = scsi_ 533 struct ahc_linux_device *dev = scsi_transport_device_data(cmd->device);
467 int rtn = SCSI_MLQUEUE_HOST_BUSY; 534 int rtn = SCSI_MLQUEUE_HOST_BUSY;
468 unsigned long flags; 535 unsigned long flags;
469 536
470 ahc = *(struct ahc_softc **)cmd->devic 537 ahc = *(struct ahc_softc **)cmd->device->host->hostdata;
471 538
472 ahc_lock(ahc, &flags); 539 ahc_lock(ahc, &flags);
473 if (ahc->platform_data->qfrozen == 0) 540 if (ahc->platform_data->qfrozen == 0) {
474 cmd->scsi_done = scsi_done; 541 cmd->scsi_done = scsi_done;
475 cmd->result = CAM_REQ_INPROG < 542 cmd->result = CAM_REQ_INPROG << 16;
476 rtn = ahc_linux_run_command(ah 543 rtn = ahc_linux_run_command(ahc, dev, cmd);
477 } 544 }
478 ahc_unlock(ahc, &flags); 545 ahc_unlock(ahc, &flags);
479 546
480 return rtn; 547 return rtn;
481 } 548 }
482 549
483 static inline struct scsi_target ** 550 static inline struct scsi_target **
484 ahc_linux_target_in_softc(struct scsi_target * 551 ahc_linux_target_in_softc(struct scsi_target *starget)
485 { 552 {
486 struct ahc_softc *ahc = 553 struct ahc_softc *ahc =
487 *((struct ahc_softc **)dev_to_ 554 *((struct ahc_softc **)dev_to_shost(&starget->dev)->hostdata);
488 unsigned int target_offset; 555 unsigned int target_offset;
489 556
490 target_offset = starget->id; 557 target_offset = starget->id;
491 if (starget->channel != 0) 558 if (starget->channel != 0)
492 target_offset += 8; 559 target_offset += 8;
493 560
494 return &ahc->platform_data->starget[ta 561 return &ahc->platform_data->starget[target_offset];
495 } 562 }
496 563
497 static int 564 static int
498 ahc_linux_target_alloc(struct scsi_target *sta 565 ahc_linux_target_alloc(struct scsi_target *starget)
499 { 566 {
500 struct ahc_softc *ahc = 567 struct ahc_softc *ahc =
501 *((struct ahc_softc **)dev_to_ 568 *((struct ahc_softc **)dev_to_shost(&starget->dev)->hostdata);
502 struct seeprom_config *sc = ahc->seep_ 569 struct seeprom_config *sc = ahc->seep_config;
503 unsigned long flags; 570 unsigned long flags;
504 struct scsi_target **ahc_targp = ahc_l 571 struct scsi_target **ahc_targp = ahc_linux_target_in_softc(starget);
505 unsigned short scsirate; 572 unsigned short scsirate;
506 struct ahc_devinfo devinfo; 573 struct ahc_devinfo devinfo;
507 struct ahc_initiator_tinfo *tinfo; 574 struct ahc_initiator_tinfo *tinfo;
508 struct ahc_tmode_tstate *tstate; 575 struct ahc_tmode_tstate *tstate;
509 char channel = starget->channel + 'A'; 576 char channel = starget->channel + 'A';
510 unsigned int our_id = ahc->our_id; 577 unsigned int our_id = ahc->our_id;
511 unsigned int target_offset; 578 unsigned int target_offset;
512 579
513 target_offset = starget->id; 580 target_offset = starget->id;
514 if (starget->channel != 0) 581 if (starget->channel != 0)
515 target_offset += 8; 582 target_offset += 8;
516 583
517 if (starget->channel) 584 if (starget->channel)
518 our_id = ahc->our_id_b; 585 our_id = ahc->our_id_b;
519 586
520 ahc_lock(ahc, &flags); 587 ahc_lock(ahc, &flags);
521 588
522 BUG_ON(*ahc_targp != NULL); 589 BUG_ON(*ahc_targp != NULL);
523 590
524 *ahc_targp = starget; 591 *ahc_targp = starget;
525 592
526 if (sc) { 593 if (sc) {
527 int maxsync = AHC_SYNCRATE_DT; 594 int maxsync = AHC_SYNCRATE_DT;
528 int ultra = 0; 595 int ultra = 0;
529 int flags = sc->device_flags[t 596 int flags = sc->device_flags[target_offset];
530 597
531 if (ahc->flags & AHC_NEWEEPROM 598 if (ahc->flags & AHC_NEWEEPROM_FMT) {
532 if (flags & CFSYNCHISULTRA 599 if (flags & CFSYNCHISULTRA)
533 ultra = 1; 600 ultra = 1;
534 } else if (flags & CFULTRAEN) 601 } else if (flags & CFULTRAEN)
535 ultra = 1; 602 ultra = 1;
536 /* AIC nutcase; 10MHz appears 603 /* AIC nutcase; 10MHz appears as ultra = 1, CFXFER = 0x04
537 * change it to ultra=0, CFXFE 604 * change it to ultra=0, CFXFER = 0 */
538 if(ultra && (flags & CFXFER) = 605 if(ultra && (flags & CFXFER) == 0x04) {
539 ultra = 0; 606 ultra = 0;
540 flags &= ~CFXFER; 607 flags &= ~CFXFER;
541 } 608 }
542 609
543 if ((ahc->features & AHC_ULTRA 610 if ((ahc->features & AHC_ULTRA2) != 0) {
544 scsirate = (flags & CF 611 scsirate = (flags & CFXFER) | (ultra ? 0x8 : 0);
545 } else { 612 } else {
546 scsirate = (flags & CF 613 scsirate = (flags & CFXFER) << 4;
547 maxsync = ultra ? AHC_ 614 maxsync = ultra ? AHC_SYNCRATE_ULTRA :
548 AHC_SYNCRATE_F 615 AHC_SYNCRATE_FAST;
549 } 616 }
550 spi_max_width(starget) = (flag 617 spi_max_width(starget) = (flags & CFWIDEB) ? 1 : 0;
551 if (!(flags & CFSYNCH)) 618 if (!(flags & CFSYNCH))
552 spi_max_offset(starget 619 spi_max_offset(starget) = 0;
553 spi_min_period(starget) = 620 spi_min_period(starget) =
554 ahc_find_period(ahc, s 621 ahc_find_period(ahc, scsirate, maxsync);
555 622
556 tinfo = ahc_fetch_transinfo(ah 623 tinfo = ahc_fetch_transinfo(ahc, channel, ahc->our_id,
557 st 624 starget->id, &tstate);
558 } 625 }
559 ahc_compile_devinfo(&devinfo, our_id, 626 ahc_compile_devinfo(&devinfo, our_id, starget->id,
560 CAM_LUN_WILDCARD, 627 CAM_LUN_WILDCARD, channel,
561 ROLE_INITIATOR); 628 ROLE_INITIATOR);
562 ahc_set_syncrate(ahc, &devinfo, NULL, 629 ahc_set_syncrate(ahc, &devinfo, NULL, 0, 0, 0,
563 AHC_TRANS_GOAL, /*pau 630 AHC_TRANS_GOAL, /*paused*/FALSE);
564 ahc_set_width(ahc, &devinfo, MSG_EXT_W 631 ahc_set_width(ahc, &devinfo, MSG_EXT_WDTR_BUS_8_BIT,
565 AHC_TRANS_GOAL, /*paused 632 AHC_TRANS_GOAL, /*paused*/FALSE);
566 ahc_unlock(ahc, &flags); 633 ahc_unlock(ahc, &flags);
567 634
568 return 0; 635 return 0;
569 } 636 }
570 637
571 static void 638 static void
572 ahc_linux_target_destroy(struct scsi_target *s 639 ahc_linux_target_destroy(struct scsi_target *starget)
573 { 640 {
574 struct scsi_target **ahc_targp = ahc_l 641 struct scsi_target **ahc_targp = ahc_linux_target_in_softc(starget);
575 642
576 *ahc_targp = NULL; 643 *ahc_targp = NULL;
577 } 644 }
578 645
579 static int 646 static int
580 ahc_linux_slave_alloc(struct scsi_device *sdev 647 ahc_linux_slave_alloc(struct scsi_device *sdev)
581 { 648 {
582 struct ahc_softc *ahc = 649 struct ahc_softc *ahc =
583 *((struct ahc_softc **)sdev->h 650 *((struct ahc_softc **)sdev->host->hostdata);
584 struct scsi_target *starget = sdev->sd 651 struct scsi_target *starget = sdev->sdev_target;
585 struct ahc_linux_device *dev; 652 struct ahc_linux_device *dev;
586 653
587 if (bootverbose) 654 if (bootverbose)
588 printf("%s: Slave Alloc %d\n", 655 printf("%s: Slave Alloc %d\n", ahc_name(ahc), sdev->id);
589 656
590 dev = scsi_transport_device_data(sdev) 657 dev = scsi_transport_device_data(sdev);
591 memset(dev, 0, sizeof(*dev)); 658 memset(dev, 0, sizeof(*dev));
592 659
593 /* 660 /*
594 * We start out life using untagged 661 * We start out life using untagged
595 * transactions of which we allow one. 662 * transactions of which we allow one.
596 */ 663 */
597 dev->openings = 1; 664 dev->openings = 1;
598 665
599 /* 666 /*
600 * Set maxtags to 0. This will be cha 667 * Set maxtags to 0. This will be changed if we
601 * later determine that we are dealing 668 * later determine that we are dealing with
602 * a tagged queuing capable device. 669 * a tagged queuing capable device.
603 */ 670 */
604 dev->maxtags = 0; 671 dev->maxtags = 0;
605 672
606 spi_period(starget) = 0; 673 spi_period(starget) = 0;
607 674
608 return 0; 675 return 0;
609 } 676 }
610 677
611 static int 678 static int
612 ahc_linux_slave_configure(struct scsi_device * 679 ahc_linux_slave_configure(struct scsi_device *sdev)
613 { 680 {
614 struct ahc_softc *ahc; 681 struct ahc_softc *ahc;
615 682
616 ahc = *((struct ahc_softc **)sdev->hos 683 ahc = *((struct ahc_softc **)sdev->host->hostdata);
617 684
618 if (bootverbose) 685 if (bootverbose)
619 sdev_printk(KERN_INFO, sdev, " 686 sdev_printk(KERN_INFO, sdev, "Slave Configure\n");
620 687
621 ahc_linux_device_queue_depth(sdev); 688 ahc_linux_device_queue_depth(sdev);
622 689
623 /* Initial Domain Validation */ 690 /* Initial Domain Validation */
624 if (!spi_initial_dv(sdev->sdev_target) 691 if (!spi_initial_dv(sdev->sdev_target))
625 spi_dv_device(sdev); 692 spi_dv_device(sdev);
626 693
627 return 0; 694 return 0;
628 } 695 }
629 696
630 #if defined(__i386__) 697 #if defined(__i386__)
631 /* 698 /*
632 * Return the disk geometry for the given SCSI 699 * Return the disk geometry for the given SCSI device.
633 */ 700 */
634 static int 701 static int
635 ahc_linux_biosparam(struct scsi_device *sdev, 702 ahc_linux_biosparam(struct scsi_device *sdev, struct block_device *bdev,
636 sector_t capacity, int geo 703 sector_t capacity, int geom[])
637 { 704 {
638 uint8_t *bh; 705 uint8_t *bh;
639 int heads; 706 int heads;
640 int sectors; 707 int sectors;
641 int cylinders; 708 int cylinders;
642 int ret; 709 int ret;
643 int extended; 710 int extended;
644 struct ahc_softc *ahc; 711 struct ahc_softc *ahc;
645 u_int channel; 712 u_int channel;
646 713
647 ahc = *((struct ahc_softc **)sdev->hos 714 ahc = *((struct ahc_softc **)sdev->host->hostdata);
648 channel = sdev_channel(sdev); 715 channel = sdev_channel(sdev);
649 716
650 bh = scsi_bios_ptable(bdev); 717 bh = scsi_bios_ptable(bdev);
651 if (bh) { 718 if (bh) {
652 ret = scsi_partsize(bh, capaci 719 ret = scsi_partsize(bh, capacity,
653 &geom[2], 720 &geom[2], &geom[0], &geom[1]);
654 kfree(bh); 721 kfree(bh);
655 if (ret != -1) 722 if (ret != -1)
656 return (ret); 723 return (ret);
657 } 724 }
658 heads = 64; 725 heads = 64;
659 sectors = 32; 726 sectors = 32;
660 cylinders = aic_sector_div(capacity, h 727 cylinders = aic_sector_div(capacity, heads, sectors);
661 728
662 if (aic7xxx_extended != 0) 729 if (aic7xxx_extended != 0)
663 extended = 1; 730 extended = 1;
664 else if (channel == 0) 731 else if (channel == 0)
665 extended = (ahc->flags & AHC_E 732 extended = (ahc->flags & AHC_EXTENDED_TRANS_A) != 0;
666 else 733 else
667 extended = (ahc->flags & AHC_E 734 extended = (ahc->flags & AHC_EXTENDED_TRANS_B) != 0;
668 if (extended && cylinders >= 1024) { 735 if (extended && cylinders >= 1024) {
669 heads = 255; 736 heads = 255;
670 sectors = 63; 737 sectors = 63;
671 cylinders = aic_sector_div(cap 738 cylinders = aic_sector_div(capacity, heads, sectors);
672 } 739 }
673 geom[0] = heads; 740 geom[0] = heads;
674 geom[1] = sectors; 741 geom[1] = sectors;
675 geom[2] = cylinders; 742 geom[2] = cylinders;
676 return (0); 743 return (0);
677 } 744 }
678 #endif 745 #endif
679 746
680 /* 747 /*
681 * Abort the current SCSI command(s). 748 * Abort the current SCSI command(s).
682 */ 749 */
683 static int 750 static int
684 ahc_linux_abort(struct scsi_cmnd *cmd) 751 ahc_linux_abort(struct scsi_cmnd *cmd)
685 { 752 {
686 int error; 753 int error;
687 754
688 error = ahc_linux_queue_recovery_cmd(c 755 error = ahc_linux_queue_recovery_cmd(cmd, SCB_ABORT);
689 if (error != 0) 756 if (error != 0)
690 printf("aic7xxx_abort returns 757 printf("aic7xxx_abort returns 0x%x\n", error);
691 return (error); 758 return (error);
692 } 759 }
693 760
694 /* 761 /*
695 * Attempt to send a target reset message to t 762 * Attempt to send a target reset message to the device that timed out.
696 */ 763 */
697 static int 764 static int
698 ahc_linux_dev_reset(struct scsi_cmnd *cmd) 765 ahc_linux_dev_reset(struct scsi_cmnd *cmd)
699 { 766 {
700 int error; 767 int error;
701 768
702 error = ahc_linux_queue_recovery_cmd(c 769 error = ahc_linux_queue_recovery_cmd(cmd, SCB_DEVICE_RESET);
703 if (error != 0) 770 if (error != 0)
704 printf("aic7xxx_dev_reset retu 771 printf("aic7xxx_dev_reset returns 0x%x\n", error);
705 return (error); 772 return (error);
706 } 773 }
707 774
708 /* 775 /*
709 * Reset the SCSI bus. 776 * Reset the SCSI bus.
710 */ 777 */
711 static int 778 static int
712 ahc_linux_bus_reset(struct scsi_cmnd *cmd) 779 ahc_linux_bus_reset(struct scsi_cmnd *cmd)
713 { 780 {
714 struct ahc_softc *ahc; 781 struct ahc_softc *ahc;
715 int found; 782 int found;
716 unsigned long flags; 783 unsigned long flags;
717 784
718 ahc = *(struct ahc_softc **)cmd->devic 785 ahc = *(struct ahc_softc **)cmd->device->host->hostdata;
719 786
720 ahc_lock(ahc, &flags); 787 ahc_lock(ahc, &flags);
721 found = ahc_reset_channel(ahc, scmd_ch 788 found = ahc_reset_channel(ahc, scmd_channel(cmd) + 'A',
722 /*initiate r 789 /*initiate reset*/TRUE);
723 ahc_unlock(ahc, &flags); 790 ahc_unlock(ahc, &flags);
724 791
725 if (bootverbose) 792 if (bootverbose)
726 printf("%s: SCSI bus reset del 793 printf("%s: SCSI bus reset delivered. "
727 "%d SCBs aborted.\n", a 794 "%d SCBs aborted.\n", ahc_name(ahc), found);
728 795
729 return SUCCESS; 796 return SUCCESS;
730 } 797 }
731 798
732 struct scsi_host_template aic7xxx_driver_templ 799 struct scsi_host_template aic7xxx_driver_template = {
733 .module = THIS_MODULE, 800 .module = THIS_MODULE,
734 .name = "aic7xxx", 801 .name = "aic7xxx",
735 .proc_name = "aic7xxx", 802 .proc_name = "aic7xxx",
736 .proc_info = ahc_linux_pr 803 .proc_info = ahc_linux_proc_info,
737 .info = ahc_linux_in 804 .info = ahc_linux_info,
738 .queuecommand = ahc_linux_qu 805 .queuecommand = ahc_linux_queue,
739 .eh_abort_handler = ahc_linux_ab 806 .eh_abort_handler = ahc_linux_abort,
740 .eh_device_reset_handler = ahc_linux_d 807 .eh_device_reset_handler = ahc_linux_dev_reset,
741 .eh_bus_reset_handler = ahc_linux_bu 808 .eh_bus_reset_handler = ahc_linux_bus_reset,
742 #if defined(__i386__) 809 #if defined(__i386__)
743 .bios_param = ahc_linux_bi 810 .bios_param = ahc_linux_biosparam,
744 #endif 811 #endif
745 .can_queue = AHC_MAX_QUEU 812 .can_queue = AHC_MAX_QUEUE,
746 .this_id = -1, 813 .this_id = -1,
747 .max_sectors = 8192, 814 .max_sectors = 8192,
748 .cmd_per_lun = 2, 815 .cmd_per_lun = 2,
749 .use_clustering = ENABLE_CLUST 816 .use_clustering = ENABLE_CLUSTERING,
750 .slave_alloc = ahc_linux_sl 817 .slave_alloc = ahc_linux_slave_alloc,
751 .slave_configure = ahc_linux_sl 818 .slave_configure = ahc_linux_slave_configure,
752 .target_alloc = ahc_linux_ta 819 .target_alloc = ahc_linux_target_alloc,
753 .target_destroy = ahc_linux_ta 820 .target_destroy = ahc_linux_target_destroy,
754 }; 821 };
755 822
756 /**************************** Tasklet Handler 823 /**************************** Tasklet Handler *********************************/
757 824
758 /******************************** Macros ***** 825 /******************************** Macros **************************************/
759 #define BUILD_SCSIID(ahc, cmd) 826 #define BUILD_SCSIID(ahc, cmd) \
760 ((((cmd)->device->id << TID_SHIFT) & T 827 ((((cmd)->device->id << TID_SHIFT) & TID) \
761 | (((cmd)->device->channel == 0) ? (ah 828 | (((cmd)->device->channel == 0) ? (ahc)->our_id : (ahc)->our_id_b) \
762 | (((cmd)->device->channel == 0) ? 0 : 829 | (((cmd)->device->channel == 0) ? 0 : TWIN_CHNLB))
763 830
764 /******************************** Bus DMA **** 831 /******************************** Bus DMA *************************************/
765 int 832 int
766 ahc_dma_tag_create(struct ahc_softc *ahc, bus_ 833 ahc_dma_tag_create(struct ahc_softc *ahc, bus_dma_tag_t parent,
767 bus_size_t alignment, bus_s 834 bus_size_t alignment, bus_size_t boundary,
768 dma_addr_t lowaddr, dma_add 835 dma_addr_t lowaddr, dma_addr_t highaddr,
769 bus_dma_filter_t *filter, v 836 bus_dma_filter_t *filter, void *filterarg,
770 bus_size_t maxsize, int nse 837 bus_size_t maxsize, int nsegments,
771 bus_size_t maxsegsz, int fl 838 bus_size_t maxsegsz, int flags, bus_dma_tag_t *ret_tag)
772 { 839 {
773 bus_dma_tag_t dmat; 840 bus_dma_tag_t dmat;
774 841
775 dmat = malloc(sizeof(*dmat), M_DEVBUF, 842 dmat = malloc(sizeof(*dmat), M_DEVBUF, M_NOWAIT);
776 if (dmat == NULL) 843 if (dmat == NULL)
777 return (ENOMEM); 844 return (ENOMEM);
778 845
779 /* 846 /*
780 * Linux is very simplistic about DMA 847 * Linux is very simplistic about DMA memory. For now don't
781 * maintain all specification informat 848 * maintain all specification information. Once Linux supplies
782 * better facilities for doing these o 849 * better facilities for doing these operations, or the
783 * needs of this particular driver cha 850 * needs of this particular driver change, we might need to do
784 * more here. 851 * more here.
785 */ 852 */
786 dmat->alignment = alignment; 853 dmat->alignment = alignment;
787 dmat->boundary = boundary; 854 dmat->boundary = boundary;
788 dmat->maxsize = maxsize; 855 dmat->maxsize = maxsize;
789 *ret_tag = dmat; 856 *ret_tag = dmat;
790 return (0); 857 return (0);
791 } 858 }
792 859
793 void 860 void
794 ahc_dma_tag_destroy(struct ahc_softc *ahc, bus 861 ahc_dma_tag_destroy(struct ahc_softc *ahc, bus_dma_tag_t dmat)
795 { 862 {
796 free(dmat, M_DEVBUF); 863 free(dmat, M_DEVBUF);
797 } 864 }
798 865
799 int 866 int
800 ahc_dmamem_alloc(struct ahc_softc *ahc, bus_dm 867 ahc_dmamem_alloc(struct ahc_softc *ahc, bus_dma_tag_t dmat, void** vaddr,
801 int flags, bus_dmamap_t *mapp 868 int flags, bus_dmamap_t *mapp)
802 { 869 {
803 *vaddr = pci_alloc_consistent(ahc->dev 870 *vaddr = pci_alloc_consistent(ahc->dev_softc,
804 dmat->ma 871 dmat->maxsize, mapp);
805 if (*vaddr == NULL) 872 if (*vaddr == NULL)
806 return ENOMEM; 873 return ENOMEM;
807 return 0; 874 return 0;
808 } 875 }
809 876
810 void 877 void
811 ahc_dmamem_free(struct ahc_softc *ahc, bus_dma 878 ahc_dmamem_free(struct ahc_softc *ahc, bus_dma_tag_t dmat,
812 void* vaddr, bus_dmamap_t map) 879 void* vaddr, bus_dmamap_t map)
813 { 880 {
814 pci_free_consistent(ahc->dev_softc, dm 881 pci_free_consistent(ahc->dev_softc, dmat->maxsize,
815 vaddr, map); 882 vaddr, map);
816 } 883 }
817 884
818 int 885 int
819 ahc_dmamap_load(struct ahc_softc *ahc, bus_dma 886 ahc_dmamap_load(struct ahc_softc *ahc, bus_dma_tag_t dmat, bus_dmamap_t map,
820 void *buf, bus_size_t buflen, 887 void *buf, bus_size_t buflen, bus_dmamap_callback_t *cb,
821 void *cb_arg, int flags) 888 void *cb_arg, int flags)
822 { 889 {
823 /* 890 /*
824 * Assume for now that this will only 891 * Assume for now that this will only be used during
825 * initialization and not for per-tran 892 * initialization and not for per-transaction buffer mapping.
826 */ 893 */
827 bus_dma_segment_t stack_sg; 894 bus_dma_segment_t stack_sg;
828 895
829 stack_sg.ds_addr = map; 896 stack_sg.ds_addr = map;
830 stack_sg.ds_len = dmat->maxsize; 897 stack_sg.ds_len = dmat->maxsize;
831 cb(cb_arg, &stack_sg, /*nseg*/1, /*err 898 cb(cb_arg, &stack_sg, /*nseg*/1, /*error*/0);
832 return (0); 899 return (0);
833 } 900 }
834 901
835 void 902 void
836 ahc_dmamap_destroy(struct ahc_softc *ahc, bus_ 903 ahc_dmamap_destroy(struct ahc_softc *ahc, bus_dma_tag_t dmat, bus_dmamap_t map)
837 { 904 {
838 } 905 }
839 906
840 int 907 int
841 ahc_dmamap_unload(struct ahc_softc *ahc, bus_d 908 ahc_dmamap_unload(struct ahc_softc *ahc, bus_dma_tag_t dmat, bus_dmamap_t map)
842 { 909 {
843 /* Nothing to do */ 910 /* Nothing to do */
844 return (0); 911 return (0);
845 } 912 }
846 913
847 static void 914 static void
848 ahc_linux_setup_tag_info_global(char *p) 915 ahc_linux_setup_tag_info_global(char *p)
849 { 916 {
850 int tags, i, j; 917 int tags, i, j;
851 918
852 tags = simple_strtoul(p + 1, NULL, 0) 919 tags = simple_strtoul(p + 1, NULL, 0) & 0xff;
853 printf("Setting Global Tags= %d\n", ta 920 printf("Setting Global Tags= %d\n", tags);
854 921
855 for (i = 0; i < ARRAY_SIZE(aic7xxx_tag 922 for (i = 0; i < ARRAY_SIZE(aic7xxx_tag_info); i++) {
856 for (j = 0; j < AHC_NUM_TARGET 923 for (j = 0; j < AHC_NUM_TARGETS; j++) {
857 aic7xxx_tag_info[i].ta 924 aic7xxx_tag_info[i].tag_commands[j] = tags;
858 } 925 }
859 } 926 }
860 } 927 }
861 928
862 static void 929 static void
863 ahc_linux_setup_tag_info(u_long arg, int insta 930 ahc_linux_setup_tag_info(u_long arg, int instance, int targ, int32_t value)
864 { 931 {
865 932
866 if ((instance >= 0) && (targ >= 0) 933 if ((instance >= 0) && (targ >= 0)
867 && (instance < ARRAY_SIZE(aic7xxx_tag 934 && (instance < ARRAY_SIZE(aic7xxx_tag_info))
868 && (targ < AHC_NUM_TARGETS)) { 935 && (targ < AHC_NUM_TARGETS)) {
869 aic7xxx_tag_info[instance].tag 936 aic7xxx_tag_info[instance].tag_commands[targ] = value & 0xff;
870 if (bootverbose) 937 if (bootverbose)
871 printf("tag_info[%d:%d 938 printf("tag_info[%d:%d] = %d\n", instance, targ, value);
872 } 939 }
873 } 940 }
874 941
875 static char * 942 static char *
876 ahc_parse_brace_option(char *opt_name, char *o 943 ahc_parse_brace_option(char *opt_name, char *opt_arg, char *end, int depth,
877 void (*callback)(u_long 944 void (*callback)(u_long, int, int, int32_t),
878 u_long callback_arg) 945 u_long callback_arg)
879 { 946 {
880 char *tok_end; 947 char *tok_end;
881 char *tok_end2; 948 char *tok_end2;
882 int i; 949 int i;
883 int instance; 950 int instance;
884 int targ; 951 int targ;
885 int done; 952 int done;
886 char tok_list[] = {'.', ',', '{', 953 char tok_list[] = {'.', ',', '{', '}', '\0'};
887 954
888 /* All options use a ':' name/arg sepa 955 /* All options use a ':' name/arg separator */
889 if (*opt_arg != ':') 956 if (*opt_arg != ':')
890 return (opt_arg); 957 return (opt_arg);
891 opt_arg++; 958 opt_arg++;
892 instance = -1; 959 instance = -1;
893 targ = -1; 960 targ = -1;
894 done = FALSE; 961 done = FALSE;
895 /* 962 /*
896 * Restore separator that may be in 963 * Restore separator that may be in
897 * the middle of our option argument. 964 * the middle of our option argument.
898 */ 965 */
899 tok_end = strchr(opt_arg, '\0'); 966 tok_end = strchr(opt_arg, '\0');
900 if (tok_end < end) 967 if (tok_end < end)
901 *tok_end = ','; 968 *tok_end = ',';
902 while (!done) { 969 while (!done) {
903 switch (*opt_arg) { 970 switch (*opt_arg) {
904 case '{': 971 case '{':
905 if (instance == -1) { 972 if (instance == -1) {
906 instance = 0; 973 instance = 0;
907 } else { 974 } else {
908 if (depth > 1) 975 if (depth > 1) {
909 if (ta 976 if (targ == -1)
910 977 targ = 0;
911 } else { 978 } else {
912 printf 979 printf("Malformed Option %s\n",
913 980 opt_name);
914 done = 981 done = TRUE;
915 } 982 }
916 } 983 }
917 opt_arg++; 984 opt_arg++;
918 break; 985 break;
919 case '}': 986 case '}':
920 if (targ != -1) 987 if (targ != -1)
921 targ = -1; 988 targ = -1;
922 else if (instance != - 989 else if (instance != -1)
923 instance = -1; 990 instance = -1;
924 opt_arg++; 991 opt_arg++;
925 break; 992 break;
926 case ',': 993 case ',':
927 case '.': 994 case '.':
928 if (instance == -1) 995 if (instance == -1)
929 done = TRUE; 996 done = TRUE;
930 else if (targ >= 0) 997 else if (targ >= 0)
931 targ++; 998 targ++;
932 else if (instance >= 0 999 else if (instance >= 0)
933 instance++; 1000 instance++;
934 opt_arg++; 1001 opt_arg++;
935 break; 1002 break;
936 case '\0': 1003 case '\0':
937 done = TRUE; 1004 done = TRUE;
938 break; 1005 break;
939 default: 1006 default:
940 tok_end = end; 1007 tok_end = end;
941 for (i = 0; tok_list[i 1008 for (i = 0; tok_list[i]; i++) {
942 tok_end2 = str 1009 tok_end2 = strchr(opt_arg, tok_list[i]);
943 if ((tok_end2) 1010 if ((tok_end2) && (tok_end2 < tok_end))
944 tok_en 1011 tok_end = tok_end2;
945 } 1012 }
946 callback(callback_arg, 1013 callback(callback_arg, instance, targ,
947 simple_strtol 1014 simple_strtol(opt_arg, NULL, 0));
948 opt_arg = tok_end; 1015 opt_arg = tok_end;
949 break; 1016 break;
950 } 1017 }
951 } 1018 }
952 return (opt_arg); 1019 return (opt_arg);
953 } 1020 }
954 1021
955 /* 1022 /*
956 * Handle Linux boot parameters. This routine 1023 * Handle Linux boot parameters. This routine allows for assigning a value
957 * to a parameter with a ':' between the param 1024 * to a parameter with a ':' between the parameter and the value.
958 * ie. aic7xxx=stpwlev:1,extended 1025 * ie. aic7xxx=stpwlev:1,extended
959 */ 1026 */
960 static int 1027 static int
961 aic7xxx_setup(char *s) 1028 aic7xxx_setup(char *s)
962 { 1029 {
963 int i, n; 1030 int i, n;
964 char *p; 1031 char *p;
965 char *end; 1032 char *end;
966 1033
967 static struct { !! 1034 static const struct {
968 const char *name; 1035 const char *name;
969 uint32_t *flag; 1036 uint32_t *flag;
970 } options[] = { 1037 } options[] = {
971 { "extended", &aic7xxx_extende 1038 { "extended", &aic7xxx_extended },
972 { "no_reset", &aic7xxx_no_rese 1039 { "no_reset", &aic7xxx_no_reset },
973 { "verbose", &aic7xxx_verbose 1040 { "verbose", &aic7xxx_verbose },
974 { "allow_memio", &aic7xxx_allo 1041 { "allow_memio", &aic7xxx_allow_memio},
975 #ifdef AHC_DEBUG 1042 #ifdef AHC_DEBUG
976 { "debug", &ahc_debug }, 1043 { "debug", &ahc_debug },
977 #endif 1044 #endif
978 { "periodic_otag", &aic7xxx_pe 1045 { "periodic_otag", &aic7xxx_periodic_otag },
979 { "pci_parity", &aic7xxx_pci_p 1046 { "pci_parity", &aic7xxx_pci_parity },
980 { "seltime", &aic7xxx_seltime 1047 { "seltime", &aic7xxx_seltime },
981 { "tag_info", NULL }, 1048 { "tag_info", NULL },
982 { "global_tag_depth", NULL }, 1049 { "global_tag_depth", NULL },
983 { "dv", NULL } 1050 { "dv", NULL }
984 }; 1051 };
985 1052
986 end = strchr(s, '\0'); 1053 end = strchr(s, '\0');
987 1054
988 /* 1055 /*
989 * XXX ia64 gcc isn't smart enough to 1056 * XXX ia64 gcc isn't smart enough to know that ARRAY_SIZE
990 * will never be 0 in this case. 1057 * will never be 0 in this case.
991 */ 1058 */
992 n = 0; 1059 n = 0;
993 1060
994 while ((p = strsep(&s, ",.")) != NULL) 1061 while ((p = strsep(&s, ",.")) != NULL) {
995 if (*p == '\0') 1062 if (*p == '\0')
996 continue; 1063 continue;
997 for (i = 0; i < ARRAY_SIZE(opt 1064 for (i = 0; i < ARRAY_SIZE(options); i++) {
998 1065
999 n = strlen(options[i]. 1066 n = strlen(options[i].name);
1000 if (strncmp(options[i 1067 if (strncmp(options[i].name, p, n) == 0)
1001 break; 1068 break;
1002 } 1069 }
1003 if (i == ARRAY_SIZE(options)) 1070 if (i == ARRAY_SIZE(options))
1004 continue; 1071 continue;
1005 1072
1006 if (strncmp(p, "global_tag_de 1073 if (strncmp(p, "global_tag_depth", n) == 0) {
1007 ahc_linux_setup_tag_i 1074 ahc_linux_setup_tag_info_global(p + n);
1008 } else if (strncmp(p, "tag_in 1075 } else if (strncmp(p, "tag_info", n) == 0) {
1009 s = ahc_parse_brace_o 1076 s = ahc_parse_brace_option("tag_info", p + n, end,
1010 2, ahc_linux_setu 1077 2, ahc_linux_setup_tag_info, 0);
1011 } else if (p[n] == ':') { 1078 } else if (p[n] == ':') {
1012 *(options[i].flag) = 1079 *(options[i].flag) = simple_strtoul(p + n + 1, NULL, 0);
1013 } else if (strncmp(p, "verbos 1080 } else if (strncmp(p, "verbose", n) == 0) {
1014 *(options[i].flag) = 1081 *(options[i].flag) = 1;
1015 } else { 1082 } else {
1016 *(options[i].flag) ^= 1083 *(options[i].flag) ^= 0xFFFFFFFF;
1017 } 1084 }
1018 } 1085 }
1019 return 1; 1086 return 1;
1020 } 1087 }
1021 1088
1022 __setup("aic7xxx=", aic7xxx_setup); 1089 __setup("aic7xxx=", aic7xxx_setup);
1023 1090
1024 uint32_t aic7xxx_verbose; 1091 uint32_t aic7xxx_verbose;
1025 1092
1026 int 1093 int
1027 ahc_linux_register_host(struct ahc_softc *ahc 1094 ahc_linux_register_host(struct ahc_softc *ahc, struct scsi_host_template *template)
1028 { 1095 {
1029 char buf[80]; 1096 char buf[80];
1030 struct Scsi_Host *host; 1097 struct Scsi_Host *host;
1031 char *new_name; 1098 char *new_name;
1032 u_long s; 1099 u_long s;
1033 int retval; 1100 int retval;
1034 1101
1035 template->name = ahc->description; 1102 template->name = ahc->description;
1036 host = scsi_host_alloc(template, size 1103 host = scsi_host_alloc(template, sizeof(struct ahc_softc *));
1037 if (host == NULL) 1104 if (host == NULL)
1038 return (ENOMEM); 1105 return (ENOMEM);
1039 1106
1040 *((struct ahc_softc **)host->hostdata 1107 *((struct ahc_softc **)host->hostdata) = ahc;
1041 ahc->platform_data->host = host; 1108 ahc->platform_data->host = host;
1042 host->can_queue = AHC_MAX_QUEUE; 1109 host->can_queue = AHC_MAX_QUEUE;
1043 host->cmd_per_lun = 2; 1110 host->cmd_per_lun = 2;
1044 /* XXX No way to communicate the ID f 1111 /* XXX No way to communicate the ID for multiple channels */
1045 host->this_id = ahc->our_id; 1112 host->this_id = ahc->our_id;
1046 host->irq = ahc->platform_data->irq; 1113 host->irq = ahc->platform_data->irq;
1047 host->max_id = (ahc->features & AHC_W 1114 host->max_id = (ahc->features & AHC_WIDE) ? 16 : 8;
1048 host->max_lun = AHC_NUM_LUNS; 1115 host->max_lun = AHC_NUM_LUNS;
1049 host->max_channel = (ahc->features & 1116 host->max_channel = (ahc->features & AHC_TWIN) ? 1 : 0;
1050 host->sg_tablesize = AHC_NSEG; 1117 host->sg_tablesize = AHC_NSEG;
1051 ahc_lock(ahc, &s); 1118 ahc_lock(ahc, &s);
1052 ahc_set_unit(ahc, ahc_linux_unit++); 1119 ahc_set_unit(ahc, ahc_linux_unit++);
1053 ahc_unlock(ahc, &s); 1120 ahc_unlock(ahc, &s);
1054 sprintf(buf, "scsi%d", host->host_no) 1121 sprintf(buf, "scsi%d", host->host_no);
1055 new_name = malloc(strlen(buf) + 1, M_ 1122 new_name = malloc(strlen(buf) + 1, M_DEVBUF, M_NOWAIT);
1056 if (new_name != NULL) { 1123 if (new_name != NULL) {
1057 strcpy(new_name, buf); 1124 strcpy(new_name, buf);
1058 ahc_set_name(ahc, new_name); 1125 ahc_set_name(ahc, new_name);
1059 } 1126 }
1060 host->unique_id = ahc->unit; 1127 host->unique_id = ahc->unit;
1061 ahc_linux_initialize_scsi_bus(ahc); 1128 ahc_linux_initialize_scsi_bus(ahc);
1062 ahc_intr_enable(ahc, TRUE); 1129 ahc_intr_enable(ahc, TRUE);
1063 1130
1064 host->transportt = ahc_linux_transpor 1131 host->transportt = ahc_linux_transport_template;
1065 1132
1066 retval = scsi_add_host(host, 1133 retval = scsi_add_host(host,
1067 (ahc->dev_softc ? &ah 1134 (ahc->dev_softc ? &ahc->dev_softc->dev : NULL));
1068 if (retval) { 1135 if (retval) {
1069 printk(KERN_WARNING "aic7xxx: 1136 printk(KERN_WARNING "aic7xxx: scsi_add_host failed\n");
1070 scsi_host_put(host); 1137 scsi_host_put(host);
1071 return retval; 1138 return retval;
1072 } 1139 }
1073 1140
1074 scsi_scan_host(host); 1141 scsi_scan_host(host);
1075 return 0; 1142 return 0;
1076 } 1143 }
1077 1144
1078 /* 1145 /*
1079 * Place the SCSI bus into a known state by e 1146 * Place the SCSI bus into a known state by either resetting it,
1080 * or forcing transfer negotiations on the ne 1147 * or forcing transfer negotiations on the next command to any
1081 * target. 1148 * target.
1082 */ 1149 */
1083 void 1150 void
1084 ahc_linux_initialize_scsi_bus(struct ahc_soft 1151 ahc_linux_initialize_scsi_bus(struct ahc_softc *ahc)
1085 { 1152 {
1086 int i; 1153 int i;
1087 int numtarg; 1154 int numtarg;
1088 unsigned long s; 1155 unsigned long s;
1089 1156
1090 i = 0; 1157 i = 0;
1091 numtarg = 0; 1158 numtarg = 0;
1092 1159
1093 ahc_lock(ahc, &s); 1160 ahc_lock(ahc, &s);
1094 1161
1095 if (aic7xxx_no_reset != 0) 1162 if (aic7xxx_no_reset != 0)
1096 ahc->flags &= ~(AHC_RESET_BUS 1163 ahc->flags &= ~(AHC_RESET_BUS_A|AHC_RESET_BUS_B);
1097 1164
1098 if ((ahc->flags & AHC_RESET_BUS_A) != 1165 if ((ahc->flags & AHC_RESET_BUS_A) != 0)
1099 ahc_reset_channel(ahc, 'A', / 1166 ahc_reset_channel(ahc, 'A', /*initiate_reset*/TRUE);
1100 else 1167 else
1101 numtarg = (ahc->features & AH 1168 numtarg = (ahc->features & AHC_WIDE) ? 16 : 8;
1102 1169
1103 if ((ahc->features & AHC_TWIN) != 0) 1170 if ((ahc->features & AHC_TWIN) != 0) {
1104 1171
1105 if ((ahc->flags & AHC_RESET_B 1172 if ((ahc->flags & AHC_RESET_BUS_B) != 0) {
1106 ahc_reset_channel(ahc 1173 ahc_reset_channel(ahc, 'B', /*initiate_reset*/TRUE);
1107 } else { 1174 } else {
1108 if (numtarg == 0) 1175 if (numtarg == 0)
1109 i = 8; 1176 i = 8;
1110 numtarg += 8; 1177 numtarg += 8;
1111 } 1178 }
1112 } 1179 }
1113 1180
1114 /* 1181 /*
1115 * Force negotiation to async for all 1182 * Force negotiation to async for all targets that
1116 * will not see an initial bus reset. 1183 * will not see an initial bus reset.
1117 */ 1184 */
1118 for (; i < numtarg; i++) { 1185 for (; i < numtarg; i++) {
1119 struct ahc_devinfo devinfo; 1186 struct ahc_devinfo devinfo;
1120 struct ahc_initiator_tinfo *t 1187 struct ahc_initiator_tinfo *tinfo;
1121 struct ahc_tmode_tstate *tsta 1188 struct ahc_tmode_tstate *tstate;
1122 u_int our_id; 1189 u_int our_id;
1123 u_int target_id; 1190 u_int target_id;
1124 char channel; 1191 char channel;
1125 1192
1126 channel = 'A'; 1193 channel = 'A';
1127 our_id = ahc->our_id; 1194 our_id = ahc->our_id;
1128 target_id = i; 1195 target_id = i;
1129 if (i > 7 && (ahc->features & 1196 if (i > 7 && (ahc->features & AHC_TWIN) != 0) {
1130 channel = 'B'; 1197 channel = 'B';
1131 our_id = ahc->our_id_ 1198 our_id = ahc->our_id_b;
1132 target_id = i % 8; 1199 target_id = i % 8;
1133 } 1200 }
1134 tinfo = ahc_fetch_transinfo(a 1201 tinfo = ahc_fetch_transinfo(ahc, channel, our_id,
1135 t 1202 target_id, &tstate);
1136 ahc_compile_devinfo(&devinfo, 1203 ahc_compile_devinfo(&devinfo, our_id, target_id,
1137 CAM_LUN_W 1204 CAM_LUN_WILDCARD, channel, ROLE_INITIATOR);
1138 ahc_update_neg_request(ahc, & 1205 ahc_update_neg_request(ahc, &devinfo, tstate,
1139 tinfo, 1206 tinfo, AHC_NEG_ALWAYS);
1140 } 1207 }
1141 ahc_unlock(ahc, &s); 1208 ahc_unlock(ahc, &s);
1142 /* Give the bus some time to recover 1209 /* Give the bus some time to recover */
1143 if ((ahc->flags & (AHC_RESET_BUS_A|AH 1210 if ((ahc->flags & (AHC_RESET_BUS_A|AHC_RESET_BUS_B)) != 0) {
1144 ahc_linux_freeze_simq(ahc); 1211 ahc_linux_freeze_simq(ahc);
1145 msleep(AIC7XXX_RESET_DELAY); 1212 msleep(AIC7XXX_RESET_DELAY);
1146 ahc_linux_release_simq(ahc); 1213 ahc_linux_release_simq(ahc);
1147 } 1214 }
1148 } 1215 }
1149 1216
1150 int 1217 int
1151 ahc_platform_alloc(struct ahc_softc *ahc, voi 1218 ahc_platform_alloc(struct ahc_softc *ahc, void *platform_arg)
1152 { 1219 {
1153 1220
1154 ahc->platform_data = 1221 ahc->platform_data =
1155 malloc(sizeof(struct ahc_platform 1222 malloc(sizeof(struct ahc_platform_data), M_DEVBUF, M_NOWAIT);
1156 if (ahc->platform_data == NULL) 1223 if (ahc->platform_data == NULL)
1157 return (ENOMEM); 1224 return (ENOMEM);
1158 memset(ahc->platform_data, 0, sizeof( 1225 memset(ahc->platform_data, 0, sizeof(struct ahc_platform_data));
1159 ahc->platform_data->irq = AHC_LINUX_N 1226 ahc->platform_data->irq = AHC_LINUX_NOIRQ;
1160 ahc_lockinit(ahc); 1227 ahc_lockinit(ahc);
1161 ahc->seltime = (aic7xxx_seltime & 0x3 1228 ahc->seltime = (aic7xxx_seltime & 0x3) << 4;
1162 ahc->seltime_b = (aic7xxx_seltime & 0 1229 ahc->seltime_b = (aic7xxx_seltime & 0x3) << 4;
1163 if (aic7xxx_pci_parity == 0) 1230 if (aic7xxx_pci_parity == 0)
1164 ahc->flags |= AHC_DISABLE_PCI 1231 ahc->flags |= AHC_DISABLE_PCI_PERR;
1165 1232
1166 return (0); 1233 return (0);
1167 } 1234 }
1168 1235
1169 void 1236 void
1170 ahc_platform_free(struct ahc_softc *ahc) 1237 ahc_platform_free(struct ahc_softc *ahc)
1171 { 1238 {
1172 struct scsi_target *starget; 1239 struct scsi_target *starget;
1173 int i; 1240 int i;
1174 1241
1175 if (ahc->platform_data != NULL) { 1242 if (ahc->platform_data != NULL) {
1176 /* destroy all of the device 1243 /* destroy all of the device and target objects */
1177 for (i = 0; i < AHC_NUM_TARGE 1244 for (i = 0; i < AHC_NUM_TARGETS; i++) {
1178 starget = ahc->platfo 1245 starget = ahc->platform_data->starget[i];
1179 if (starget != NULL) 1246 if (starget != NULL) {
1180 ahc->platform 1247 ahc->platform_data->starget[i] = NULL;
1181 } 1248 }
1182 } 1249 }
1183 1250
1184 if (ahc->platform_data->irq ! 1251 if (ahc->platform_data->irq != AHC_LINUX_NOIRQ)
1185 free_irq(ahc->platfor 1252 free_irq(ahc->platform_data->irq, ahc);
1186 if (ahc->tag == BUS_SPACE_PIO 1253 if (ahc->tag == BUS_SPACE_PIO
1187 && ahc->bsh.ioport != 0) 1254 && ahc->bsh.ioport != 0)
1188 release_region(ahc->b 1255 release_region(ahc->bsh.ioport, 256);
1189 if (ahc->tag == BUS_SPACE_MEM 1256 if (ahc->tag == BUS_SPACE_MEMIO
1190 && ahc->bsh.maddr != NULL) { 1257 && ahc->bsh.maddr != NULL) {
1191 iounmap(ahc->bsh.madd 1258 iounmap(ahc->bsh.maddr);
1192 release_mem_region(ah 1259 release_mem_region(ahc->platform_data->mem_busaddr,
1193 0x 1260 0x1000);
1194 } 1261 }
1195 1262
1196 if (ahc->platform_data->host) 1263 if (ahc->platform_data->host)
1197 scsi_host_put(ahc->pl 1264 scsi_host_put(ahc->platform_data->host);
1198 1265
1199 free(ahc->platform_data, M_DE 1266 free(ahc->platform_data, M_DEVBUF);
1200 } 1267 }
1201 } 1268 }
1202 1269
1203 void 1270 void
1204 ahc_platform_freeze_devq(struct ahc_softc *ah 1271 ahc_platform_freeze_devq(struct ahc_softc *ahc, struct scb *scb)
1205 { 1272 {
1206 ahc_platform_abort_scbs(ahc, SCB_GET_ 1273 ahc_platform_abort_scbs(ahc, SCB_GET_TARGET(ahc, scb),
1207 SCB_GET_CHANN 1274 SCB_GET_CHANNEL(ahc, scb),
1208 SCB_GET_LUN(s 1275 SCB_GET_LUN(scb), SCB_LIST_NULL,
1209 ROLE_UNKNOWN, 1276 ROLE_UNKNOWN, CAM_REQUEUE_REQ);
1210 } 1277 }
1211 1278
1212 void 1279 void
1213 ahc_platform_set_tags(struct ahc_softc *ahc, 1280 ahc_platform_set_tags(struct ahc_softc *ahc, struct scsi_device *sdev,
1214 struct ahc_devinfo *dev 1281 struct ahc_devinfo *devinfo, ahc_queue_alg alg)
1215 { 1282 {
1216 struct ahc_linux_device *dev; 1283 struct ahc_linux_device *dev;
1217 int was_queuing; 1284 int was_queuing;
1218 int now_queuing; 1285 int now_queuing;
1219 1286
1220 if (sdev == NULL) 1287 if (sdev == NULL)
1221 return; 1288 return;
1222 dev = scsi_transport_device_data(sdev 1289 dev = scsi_transport_device_data(sdev);
1223 1290
1224 was_queuing = dev->flags & (AHC_DEV_Q 1291 was_queuing = dev->flags & (AHC_DEV_Q_BASIC|AHC_DEV_Q_TAGGED);
1225 switch (alg) { 1292 switch (alg) {
1226 default: 1293 default:
1227 case AHC_QUEUE_NONE: 1294 case AHC_QUEUE_NONE:
1228 now_queuing = 0; 1295 now_queuing = 0;
1229 break; 1296 break;
1230 case AHC_QUEUE_BASIC: 1297 case AHC_QUEUE_BASIC:
1231 now_queuing = AHC_DEV_Q_BASIC 1298 now_queuing = AHC_DEV_Q_BASIC;
1232 break; 1299 break;
1233 case AHC_QUEUE_TAGGED: 1300 case AHC_QUEUE_TAGGED:
1234 now_queuing = AHC_DEV_Q_TAGGE 1301 now_queuing = AHC_DEV_Q_TAGGED;
1235 break; 1302 break;
1236 } 1303 }
1237 if ((dev->flags & AHC_DEV_FREEZE_TIL_ 1304 if ((dev->flags & AHC_DEV_FREEZE_TIL_EMPTY) == 0
1238 && (was_queuing != now_queuing) 1305 && (was_queuing != now_queuing)
1239 && (dev->active != 0)) { 1306 && (dev->active != 0)) {
1240 dev->flags |= AHC_DEV_FREEZE_ 1307 dev->flags |= AHC_DEV_FREEZE_TIL_EMPTY;
1241 dev->qfrozen++; 1308 dev->qfrozen++;
1242 } 1309 }
1243 1310
1244 dev->flags &= ~(AHC_DEV_Q_BASIC|AHC_D 1311 dev->flags &= ~(AHC_DEV_Q_BASIC|AHC_DEV_Q_TAGGED|AHC_DEV_PERIODIC_OTAG);
1245 if (now_queuing) { 1312 if (now_queuing) {
1246 u_int usertags; 1313 u_int usertags;
1247 1314
1248 usertags = ahc_linux_user_tag 1315 usertags = ahc_linux_user_tagdepth(ahc, devinfo);
1249 if (!was_queuing) { 1316 if (!was_queuing) {
1250 /* 1317 /*
1251 * Start out agressiv 1318 * Start out agressively and allow our
1252 * dynamic queue dept 1319 * dynamic queue depth algorithm to take
1253 * care of the rest. 1320 * care of the rest.
1254 */ 1321 */
1255 dev->maxtags = userta 1322 dev->maxtags = usertags;
1256 dev->openings = dev-> 1323 dev->openings = dev->maxtags - dev->active;
1257 } 1324 }
1258 if (dev->maxtags == 0) { 1325 if (dev->maxtags == 0) {
1259 /* 1326 /*
1260 * Queueing is disabl 1327 * Queueing is disabled by the user.
1261 */ 1328 */
1262 dev->openings = 1; 1329 dev->openings = 1;
1263 } else if (alg == AHC_QUEUE_T 1330 } else if (alg == AHC_QUEUE_TAGGED) {
1264 dev->flags |= AHC_DEV 1331 dev->flags |= AHC_DEV_Q_TAGGED;
1265 if (aic7xxx_periodic_ 1332 if (aic7xxx_periodic_otag != 0)
1266 dev->flags |= 1333 dev->flags |= AHC_DEV_PERIODIC_OTAG;
1267 } else 1334 } else
1268 dev->flags |= AHC_DEV 1335 dev->flags |= AHC_DEV_Q_BASIC;
1269 } else { 1336 } else {
1270 /* We can only have one openi 1337 /* We can only have one opening. */
1271 dev->maxtags = 0; 1338 dev->maxtags = 0;
1272 dev->openings = 1 - dev->act 1339 dev->openings = 1 - dev->active;
1273 } 1340 }
1274 switch ((dev->flags & (AHC_DEV_Q_BASI 1341 switch ((dev->flags & (AHC_DEV_Q_BASIC|AHC_DEV_Q_TAGGED))) {
1275 case AHC_DEV_Q_BASIC: 1342 case AHC_DEV_Q_BASIC:
1276 scsi_set_tag_type(sdev, MSG_S 1343 scsi_set_tag_type(sdev, MSG_SIMPLE_TAG);
1277 scsi_activate_tcq(sdev, dev-> 1344 scsi_activate_tcq(sdev, dev->openings + dev->active);
1278 break; 1345 break;
1279 case AHC_DEV_Q_TAGGED: 1346 case AHC_DEV_Q_TAGGED:
1280 scsi_set_tag_type(sdev, MSG_O 1347 scsi_set_tag_type(sdev, MSG_ORDERED_TAG);
1281 scsi_activate_tcq(sdev, dev-> 1348 scsi_activate_tcq(sdev, dev->openings + dev->active);
1282 break; 1349 break;
1283 default: 1350 default:
1284 /* 1351 /*
1285 * We allow the OS to queue 2 1352 * We allow the OS to queue 2 untagged transactions to
1286 * us at any time even though 1353 * us at any time even though we can only execute them
1287 * serially on the controller 1354 * serially on the controller/device. This should
1288 * remove some latency. 1355 * remove some latency.
1289 */ 1356 */
1290 scsi_deactivate_tcq(sdev, 2); 1357 scsi_deactivate_tcq(sdev, 2);
1291 break; 1358 break;
1292 } 1359 }
1293 } 1360 }
1294 1361
1295 int 1362 int
1296 ahc_platform_abort_scbs(struct ahc_softc *ahc 1363 ahc_platform_abort_scbs(struct ahc_softc *ahc, int target, char channel,
1297 int lun, u_int tag, r 1364 int lun, u_int tag, role_t role, uint32_t status)
1298 { 1365 {
1299 return 0; 1366 return 0;
1300 } 1367 }
1301 1368
1302 static u_int 1369 static u_int
1303 ahc_linux_user_tagdepth(struct ahc_softc *ahc 1370 ahc_linux_user_tagdepth(struct ahc_softc *ahc, struct ahc_devinfo *devinfo)
1304 { 1371 {
1305 static int warned_user; 1372 static int warned_user;
1306 u_int tags; 1373 u_int tags;
1307 1374
1308 tags = 0; 1375 tags = 0;
1309 if ((ahc->user_discenable & devinfo-> 1376 if ((ahc->user_discenable & devinfo->target_mask) != 0) {
1310 if (ahc->unit >= ARRAY_SIZE(a 1377 if (ahc->unit >= ARRAY_SIZE(aic7xxx_tag_info)) {
1311 if (warned_user == 0) 1378 if (warned_user == 0) {
1312 1379
1313 printf(KERN_W 1380 printf(KERN_WARNING
1314 "aic7xxx: WARNING: Insufficient tag_info inst 1381 "aic7xxx: WARNING: Insufficient tag_info instances\n"
1315 "aic7xxx: for installed controllers. Using de 1382 "aic7xxx: for installed controllers. Using defaults\n"
1316 "aic7xxx: Please update the aic7xxx_tag_info 1383 "aic7xxx: Please update the aic7xxx_tag_info array in\n"
1317 "aic7xxx: the aic7xxx_osm..c source file.\n") 1384 "aic7xxx: the aic7xxx_osm..c source file.\n");
1318 warned_user++ 1385 warned_user++;
1319 } 1386 }
1320 tags = AHC_MAX_QUEUE; 1387 tags = AHC_MAX_QUEUE;
1321 } else { 1388 } else {
1322 adapter_tag_info_t *t 1389 adapter_tag_info_t *tag_info;
1323 1390
1324 tag_info = &aic7xxx_t 1391 tag_info = &aic7xxx_tag_info[ahc->unit];
1325 tags = tag_info->tag_ 1392 tags = tag_info->tag_commands[devinfo->target_offset];
1326 if (tags > AHC_MAX_QU 1393 if (tags > AHC_MAX_QUEUE)
1327 tags = AHC_MA 1394 tags = AHC_MAX_QUEUE;
1328 } 1395 }
1329 } 1396 }
1330 return (tags); 1397 return (tags);
1331 } 1398 }
1332 1399
1333 /* 1400 /*
1334 * Determines the queue depth for a given dev 1401 * Determines the queue depth for a given device.
1335 */ 1402 */
1336 static void 1403 static void
1337 ahc_linux_device_queue_depth(struct scsi_devi 1404 ahc_linux_device_queue_depth(struct scsi_device *sdev)
1338 { 1405 {
1339 struct ahc_devinfo devinfo; 1406 struct ahc_devinfo devinfo;
1340 u_int tags; 1407 u_int tags;
1341 struct ahc_softc *ahc = *((struct ahc 1408 struct ahc_softc *ahc = *((struct ahc_softc **)sdev->host->hostdata);
1342 1409
1343 ahc_compile_devinfo(&devinfo, 1410 ahc_compile_devinfo(&devinfo,
1344 sdev->sdev_target 1411 sdev->sdev_target->channel == 0
1345 ? ahc->our_id : ahc 1412 ? ahc->our_id : ahc->our_id_b,
1346 sdev->sdev_target 1413 sdev->sdev_target->id, sdev->lun,
1347 sdev->sdev_target 1414 sdev->sdev_target->channel == 0 ? 'A' : 'B',
1348 ROLE_INITIATOR); 1415 ROLE_INITIATOR);
1349 tags = ahc_linux_user_tagdepth(ahc, & 1416 tags = ahc_linux_user_tagdepth(ahc, &devinfo);
1350 if (tags != 0 && sdev->tagged_support 1417 if (tags != 0 && sdev->tagged_supported != 0) {
1351 1418
1352 ahc_platform_set_tags(ahc, sd 1419 ahc_platform_set_tags(ahc, sdev, &devinfo, AHC_QUEUE_TAGGED);
1353 ahc_send_async(ahc, devinfo.c 1420 ahc_send_async(ahc, devinfo.channel, devinfo.target,
1354 devinfo.lun, A 1421 devinfo.lun, AC_TRANSFER_NEG);
1355 ahc_print_devinfo(ahc, &devin 1422 ahc_print_devinfo(ahc, &devinfo);
1356 printf("Tagged Queuing enable 1423 printf("Tagged Queuing enabled. Depth %d\n", tags);
1357 } else { 1424 } else {
1358 ahc_platform_set_tags(ahc, sd 1425 ahc_platform_set_tags(ahc, sdev, &devinfo, AHC_QUEUE_NONE);
1359 ahc_send_async(ahc, devinfo.c 1426 ahc_send_async(ahc, devinfo.channel, devinfo.target,
1360 devinfo.lun, A 1427 devinfo.lun, AC_TRANSFER_NEG);
1361 } 1428 }
1362 } 1429 }
1363 1430
1364 static int 1431 static int
1365 ahc_linux_run_command(struct ahc_softc *ahc, 1432 ahc_linux_run_command(struct ahc_softc *ahc, struct ahc_linux_device *dev,
1366 struct scsi_cmnd *cmd) 1433 struct scsi_cmnd *cmd)
1367 { 1434 {
1368 struct scb *scb; 1435 struct scb *scb;
1369 struct hardware_scb *hscb; 1436 struct hardware_scb *hscb;
1370 struct ahc_initiator_tinfo *tinfo; 1437 struct ahc_initiator_tinfo *tinfo;
1371 struct ahc_tmode_tstate *tstate; 1438 struct ahc_tmode_tstate *tstate;
1372 uint16_t mask; 1439 uint16_t mask;
1373 struct scb_tailq *untagged_q = NULL; 1440 struct scb_tailq *untagged_q = NULL;
1374 int nseg; 1441 int nseg;
1375 1442
1376 /* 1443 /*
1377 * Schedule us to run later. The onl 1444 * Schedule us to run later. The only reason we are not
1378 * running is because the whole contr 1445 * running is because the whole controller Q is frozen.
1379 */ 1446 */
1380 if (ahc->platform_data->qfrozen != 0) 1447 if (ahc->platform_data->qfrozen != 0)
1381 return SCSI_MLQUEUE_HOST_BUSY 1448 return SCSI_MLQUEUE_HOST_BUSY;
1382 1449
1383 /* 1450 /*
1384 * We only allow one untagged transac 1451 * We only allow one untagged transaction
1385 * per target in the initiator role u 1452 * per target in the initiator role unless
1386 * we are storing a full busy target 1453 * we are storing a full busy target *lun*
1387 * table in SCB space. 1454 * table in SCB space.
1388 */ 1455 */
1389 if (!blk_rq_tagged(cmd->request) 1456 if (!blk_rq_tagged(cmd->request)
1390 && (ahc->features & AHC_SCB_BTT) 1457 && (ahc->features & AHC_SCB_BTT) == 0) {
1391 int target_offset; 1458 int target_offset;
1392 1459
1393 target_offset = cmd->device-> 1460 target_offset = cmd->device->id + cmd->device->channel * 8;
1394 untagged_q = &(ahc->untagged_ 1461 untagged_q = &(ahc->untagged_queues[target_offset]);
1395 if (!TAILQ_EMPTY(untagged_q)) 1462 if (!TAILQ_EMPTY(untagged_q))
1396 /* if we're already e 1463 /* if we're already executing an untagged command
1397 * we're busy to anot 1464 * we're busy to another */
1398 return SCSI_MLQUEUE_D 1465 return SCSI_MLQUEUE_DEVICE_BUSY;
1399 } 1466 }
1400 1467
>> 1468 nseg = scsi_dma_map(cmd);
>> 1469 if (nseg < 0)
>> 1470 return SCSI_MLQUEUE_HOST_BUSY;
>> 1471
1401 /* 1472 /*
1402 * Get an scb to use. 1473 * Get an scb to use.
1403 */ 1474 */
1404 scb = ahc_get_scb(ahc); 1475 scb = ahc_get_scb(ahc);
1405 if (!scb) !! 1476 if (!scb) {
>> 1477 scsi_dma_unmap(cmd);
1406 return SCSI_MLQUEUE_HOST_BUSY 1478 return SCSI_MLQUEUE_HOST_BUSY;
>> 1479 }
1407 1480
1408 scb->io_ctx = cmd; 1481 scb->io_ctx = cmd;
1409 scb->platform_data->dev = dev; 1482 scb->platform_data->dev = dev;
1410 hscb = scb->hscb; 1483 hscb = scb->hscb;
1411 cmd->host_scribble = (char *)scb; 1484 cmd->host_scribble = (char *)scb;
1412 1485
1413 /* 1486 /*
1414 * Fill out basics of the HSCB. 1487 * Fill out basics of the HSCB.
1415 */ 1488 */
1416 hscb->control = 0; 1489 hscb->control = 0;
1417 hscb->scsiid = BUILD_SCSIID(ahc, cmd) 1490 hscb->scsiid = BUILD_SCSIID(ahc, cmd);
1418 hscb->lun = cmd->device->lun; 1491 hscb->lun = cmd->device->lun;
1419 mask = SCB_GET_TARGET_MASK(ahc, scb); 1492 mask = SCB_GET_TARGET_MASK(ahc, scb);
1420 tinfo = ahc_fetch_transinfo(ahc, SCB_ 1493 tinfo = ahc_fetch_transinfo(ahc, SCB_GET_CHANNEL(ahc, scb),
1421 SCB_GET_O 1494 SCB_GET_OUR_ID(scb),
1422 SCB_GET_T 1495 SCB_GET_TARGET(ahc, scb), &tstate);
1423 hscb->scsirate = tinfo->scsirate; 1496 hscb->scsirate = tinfo->scsirate;
1424 hscb->scsioffset = tinfo->curr.offset 1497 hscb->scsioffset = tinfo->curr.offset;
1425 if ((tstate->ultraenb & mask) != 0) 1498 if ((tstate->ultraenb & mask) != 0)
1426 hscb->control |= ULTRAENB; 1499 hscb->control |= ULTRAENB;
1427 1500
1428 if ((ahc->user_discenable & mask) != 1501 if ((ahc->user_discenable & mask) != 0)
1429 hscb->control |= DISCENB; 1502 hscb->control |= DISCENB;
1430 1503
1431 if ((tstate->auto_negotiate & mask) ! 1504 if ((tstate->auto_negotiate & mask) != 0) {
1432 scb->flags |= SCB_AUTO_NEGOTI 1505 scb->flags |= SCB_AUTO_NEGOTIATE;
1433 scb->hscb->control |= MK_MESS 1506 scb->hscb->control |= MK_MESSAGE;
1434 } 1507 }
1435 1508
1436 if ((dev->flags & (AHC_DEV_Q_TAGGED|A 1509 if ((dev->flags & (AHC_DEV_Q_TAGGED|AHC_DEV_Q_BASIC)) != 0) {
1437 int msg_bytes; 1510 int msg_bytes;
1438 uint8_t tag_msgs[2]; 1511 uint8_t tag_msgs[2];
1439 1512
1440 msg_bytes = scsi_populate_tag 1513 msg_bytes = scsi_populate_tag_msg(cmd, tag_msgs);
1441 if (msg_bytes && tag_msgs[0] 1514 if (msg_bytes && tag_msgs[0] != MSG_SIMPLE_TASK) {
1442 hscb->control |= tag_ 1515 hscb->control |= tag_msgs[0];
1443 if (tag_msgs[0] == MS 1516 if (tag_msgs[0] == MSG_ORDERED_TASK)
1444 dev->commands 1517 dev->commands_since_idle_or_otag = 0;
1445 } else if (dev->commands_sinc 1518 } else if (dev->commands_since_idle_or_otag == AHC_OTAG_THRESH
1446 && (dev->flag 1519 && (dev->flags & AHC_DEV_Q_TAGGED) != 0) {
1447 hscb->control |= MSG_ 1520 hscb->control |= MSG_ORDERED_TASK;
1448 dev->commands_since_i 1521 dev->commands_since_idle_or_otag = 0;
1449 } else { 1522 } else {
1450 hscb->control |= MSG_ 1523 hscb->control |= MSG_SIMPLE_TASK;
1451 } 1524 }
1452 } 1525 }
1453 1526
1454 hscb->cdb_len = cmd->cmd_len; 1527 hscb->cdb_len = cmd->cmd_len;
1455 if (hscb->cdb_len <= 12) { 1528 if (hscb->cdb_len <= 12) {
1456 memcpy(hscb->shared_data.cdb, 1529 memcpy(hscb->shared_data.cdb, cmd->cmnd, hscb->cdb_len);
1457 } else { 1530 } else {
1458 memcpy(hscb->cdb32, cmd->cmnd 1531 memcpy(hscb->cdb32, cmd->cmnd, hscb->cdb_len);
1459 scb->flags |= SCB_CDB32_PTR; 1532 scb->flags |= SCB_CDB32_PTR;
1460 } 1533 }
1461 1534
1462 scb->platform_data->xfer_len = 0; 1535 scb->platform_data->xfer_len = 0;
1463 ahc_set_residual(scb, 0); 1536 ahc_set_residual(scb, 0);
1464 ahc_set_sense_residual(scb, 0); 1537 ahc_set_sense_residual(scb, 0);
1465 scb->sg_count = 0; 1538 scb->sg_count = 0;
1466 1539
1467 nseg = scsi_dma_map(cmd); <<
1468 BUG_ON(nseg < 0); <<
1469 if (nseg > 0) { 1540 if (nseg > 0) {
1470 struct ahc_dma_seg *sg; 1541 struct ahc_dma_seg *sg;
1471 struct scatterlist *cur_seg; 1542 struct scatterlist *cur_seg;
1472 int i; 1543 int i;
1473 1544
1474 /* Copy the segments into the 1545 /* Copy the segments into the SG list. */
1475 sg = scb->sg_list; 1546 sg = scb->sg_list;
1476 /* 1547 /*
1477 * The sg_count may be larger 1548 * The sg_count may be larger than nseg if
1478 * a transfer crosses a 32bit 1549 * a transfer crosses a 32bit page.
1479 */ 1550 */
1480 scsi_for_each_sg(cmd, cur_seg 1551 scsi_for_each_sg(cmd, cur_seg, nseg, i) {
1481 dma_addr_t addr; 1552 dma_addr_t addr;
1482 bus_size_t len; 1553 bus_size_t len;
1483 int consumed; 1554 int consumed;
1484 1555
1485 addr = sg_dma_address 1556 addr = sg_dma_address(cur_seg);
1486 len = sg_dma_len(cur_ 1557 len = sg_dma_len(cur_seg);
1487 consumed = ahc_linux_ 1558 consumed = ahc_linux_map_seg(ahc, scb,
1488 1559 sg, addr, len);
1489 sg += consumed; 1560 sg += consumed;
1490 scb->sg_count += cons 1561 scb->sg_count += consumed;
1491 } 1562 }
1492 sg--; 1563 sg--;
1493 sg->len |= ahc_htole32(AHC_DM 1564 sg->len |= ahc_htole32(AHC_DMA_LAST_SEG);
1494 1565
1495 /* 1566 /*
1496 * Reset the sg list pointer. 1567 * Reset the sg list pointer.
1497 */ 1568 */
1498 scb->hscb->sgptr = 1569 scb->hscb->sgptr =
1499 ahc_htole32(scb->sg_l 1570 ahc_htole32(scb->sg_list_phys | SG_FULL_RESID);
1500 1571
1501 /* 1572 /*
1502 * Copy the first SG into the 1573 * Copy the first SG into the "current"
1503 * data pointer area. 1574 * data pointer area.
1504 */ 1575 */
1505 scb->hscb->dataptr = scb->sg_ 1576 scb->hscb->dataptr = scb->sg_list->addr;
1506 scb->hscb->datacnt = scb->sg_ 1577 scb->hscb->datacnt = scb->sg_list->len;
1507 } else { 1578 } else {
1508 scb->hscb->sgptr = ahc_htole3 1579 scb->hscb->sgptr = ahc_htole32(SG_LIST_NULL);
1509 scb->hscb->dataptr = 0; 1580 scb->hscb->dataptr = 0;
1510 scb->hscb->datacnt = 0; 1581 scb->hscb->datacnt = 0;
1511 scb->sg_count = 0; 1582 scb->sg_count = 0;
1512 } 1583 }
1513 1584
1514 LIST_INSERT_HEAD(&ahc->pending_scbs, 1585 LIST_INSERT_HEAD(&ahc->pending_scbs, scb, pending_links);
1515 dev->openings--; 1586 dev->openings--;
1516 dev->active++; 1587 dev->active++;
1517 dev->commands_issued++; 1588 dev->commands_issued++;
1518 if ((dev->flags & AHC_DEV_PERIODIC_OT 1589 if ((dev->flags & AHC_DEV_PERIODIC_OTAG) != 0)
1519 dev->commands_since_idle_or_o 1590 dev->commands_since_idle_or_otag++;
1520 1591
1521 scb->flags |= SCB_ACTIVE; 1592 scb->flags |= SCB_ACTIVE;
1522 if (untagged_q) { 1593 if (untagged_q) {
1523 TAILQ_INSERT_TAIL(untagged_q, 1594 TAILQ_INSERT_TAIL(untagged_q, scb, links.tqe);
1524 scb->flags |= SCB_UNTAGGEDQ; 1595 scb->flags |= SCB_UNTAGGEDQ;
1525 } 1596 }
1526 ahc_queue_scb(ahc, scb); 1597 ahc_queue_scb(ahc, scb);
1527 return 0; 1598 return 0;
1528 } 1599 }
1529 1600
1530 /* 1601 /*
1531 * SCSI controller interrupt handler. 1602 * SCSI controller interrupt handler.
1532 */ 1603 */
1533 irqreturn_t 1604 irqreturn_t
1534 ahc_linux_isr(int irq, void *dev_id) 1605 ahc_linux_isr(int irq, void *dev_id)
1535 { 1606 {
1536 struct ahc_softc *ahc; 1607 struct ahc_softc *ahc;
1537 u_long flags; 1608 u_long flags;
1538 int ours; 1609 int ours;
1539 1610
1540 ahc = (struct ahc_softc *) dev_id; 1611 ahc = (struct ahc_softc *) dev_id;
1541 ahc_lock(ahc, &flags); 1612 ahc_lock(ahc, &flags);
1542 ours = ahc_intr(ahc); 1613 ours = ahc_intr(ahc);
1543 ahc_unlock(ahc, &flags); 1614 ahc_unlock(ahc, &flags);
1544 return IRQ_RETVAL(ours); 1615 return IRQ_RETVAL(ours);
1545 } 1616 }
1546 1617
1547 void 1618 void
1548 ahc_platform_flushwork(struct ahc_softc *ahc) 1619 ahc_platform_flushwork(struct ahc_softc *ahc)
1549 { 1620 {
1550 1621
1551 } 1622 }
1552 1623
1553 void 1624 void
1554 ahc_send_async(struct ahc_softc *ahc, char ch 1625 ahc_send_async(struct ahc_softc *ahc, char channel,
1555 u_int target, u_int lun, ac_co 1626 u_int target, u_int lun, ac_code code)
1556 { 1627 {
1557 switch (code) { 1628 switch (code) {
1558 case AC_TRANSFER_NEG: 1629 case AC_TRANSFER_NEG:
1559 { 1630 {
1560 char buf[80]; 1631 char buf[80];
1561 struct scsi_target *starget; 1632 struct scsi_target *starget;
1562 struct ahc_linux_target *tar 1633 struct ahc_linux_target *targ;
1563 struct info_str info; 1634 struct info_str info;
1564 struct ahc_initiator_tinfo * 1635 struct ahc_initiator_tinfo *tinfo;
1565 struct ahc_tmode_tstate *tst 1636 struct ahc_tmode_tstate *tstate;
1566 int target_offset; 1637 int target_offset;
1567 unsigned int target_ppr_optio 1638 unsigned int target_ppr_options;
1568 1639
1569 BUG_ON(target == CAM_TARGET_W 1640 BUG_ON(target == CAM_TARGET_WILDCARD);
1570 1641
1571 info.buffer = buf; 1642 info.buffer = buf;
1572 info.length = sizeof(buf); 1643 info.length = sizeof(buf);
1573 info.offset = 0; 1644 info.offset = 0;
1574 info.pos = 0; 1645 info.pos = 0;
1575 tinfo = ahc_fetch_transinfo(a 1646 tinfo = ahc_fetch_transinfo(ahc, channel,
1576 1647 channel == 'A' ? ahc->our_id
1577 1648 : ahc->our_id_b,
1578 1649 target, &tstate);
1579 1650
1580 /* 1651 /*
1581 * Don't bother reporting res 1652 * Don't bother reporting results while
1582 * negotiations are still pen 1653 * negotiations are still pending.
1583 */ 1654 */
1584 if (tinfo->curr.period != tin 1655 if (tinfo->curr.period != tinfo->goal.period
1585 || tinfo->curr.width != tinf 1656 || tinfo->curr.width != tinfo->goal.width
1586 || tinfo->curr.offset != tin 1657 || tinfo->curr.offset != tinfo->goal.offset
1587 || tinfo->curr.ppr_options ! 1658 || tinfo->curr.ppr_options != tinfo->goal.ppr_options)
1588 if (bootverbose == 0) 1659 if (bootverbose == 0)
1589 break; 1660 break;
1590 1661
1591 /* 1662 /*
1592 * Don't bother reporting res 1663 * Don't bother reporting results that
1593 * are identical to those las 1664 * are identical to those last reported.
1594 */ 1665 */
1595 target_offset = target; 1666 target_offset = target;
1596 if (channel == 'B') 1667 if (channel == 'B')
1597 target_offset += 8; 1668 target_offset += 8;
1598 starget = ahc->platform_data- 1669 starget = ahc->platform_data->starget[target_offset];
1599 if (starget == NULL) 1670 if (starget == NULL)
1600 break; 1671 break;
1601 targ = scsi_transport_target_ 1672 targ = scsi_transport_target_data(starget);
1602 1673
1603 target_ppr_options = 1674 target_ppr_options =
1604 (spi_dt(starget) ? MS 1675 (spi_dt(starget) ? MSG_EXT_PPR_DT_REQ : 0)
1605 + (spi_qas(starget) ? 1676 + (spi_qas(starget) ? MSG_EXT_PPR_QAS_REQ : 0)
1606 + (spi_iu(starget) ? 1677 + (spi_iu(starget) ? MSG_EXT_PPR_IU_REQ : 0);
1607 1678
1608 if (tinfo->curr.period == spi 1679 if (tinfo->curr.period == spi_period(starget)
1609 && tinfo->curr.width == s 1680 && tinfo->curr.width == spi_width(starget)
1610 && tinfo->curr.offset == 1681 && tinfo->curr.offset == spi_offset(starget)
1611 && tinfo->curr.ppr_options = 1682 && tinfo->curr.ppr_options == target_ppr_options)
1612 if (bootverbose == 0) 1683 if (bootverbose == 0)
1613 break; 1684 break;
1614 1685
1615 spi_period(starget) = tinfo-> 1686 spi_period(starget) = tinfo->curr.period;
1616 spi_width(starget) = tinfo->c 1687 spi_width(starget) = tinfo->curr.width;
1617 spi_offset(starget) = tinfo-> 1688 spi_offset(starget) = tinfo->curr.offset;
1618 spi_dt(starget) = tinfo->curr 1689 spi_dt(starget) = tinfo->curr.ppr_options & MSG_EXT_PPR_DT_REQ ? 1 : 0;
1619 spi_qas(starget) = tinfo->cur 1690 spi_qas(starget) = tinfo->curr.ppr_options & MSG_EXT_PPR_QAS_REQ ? 1 : 0;
1620 spi_iu(starget) = tinfo->curr 1691 spi_iu(starget) = tinfo->curr.ppr_options & MSG_EXT_PPR_IU_REQ ? 1 : 0;
1621 spi_display_xfer_agreement(st 1692 spi_display_xfer_agreement(starget);
1622 break; 1693 break;
1623 } 1694 }
1624 case AC_SENT_BDR: 1695 case AC_SENT_BDR:
1625 { 1696 {
1626 WARN_ON(lun != CAM_LUN_WILDCA 1697 WARN_ON(lun != CAM_LUN_WILDCARD);
1627 scsi_report_device_reset(ahc- 1698 scsi_report_device_reset(ahc->platform_data->host,
1628 chan 1699 channel - 'A', target);
1629 break; 1700 break;
1630 } 1701 }
1631 case AC_BUS_RESET: 1702 case AC_BUS_RESET:
1632 if (ahc->platform_data->host 1703 if (ahc->platform_data->host != NULL) {
1633 scsi_report_bus_reset 1704 scsi_report_bus_reset(ahc->platform_data->host,
1634 1705 channel - 'A');
1635 } 1706 }
1636 break; 1707 break;
1637 default: 1708 default:
1638 panic("ahc_send_async: Unexpe 1709 panic("ahc_send_async: Unexpected async event");
1639 } 1710 }
1640 } 1711 }
1641 1712
1642 /* 1713 /*
1643 * Calls the higher level scsi done function 1714 * Calls the higher level scsi done function and frees the scb.
1644 */ 1715 */
1645 void 1716 void
1646 ahc_done(struct ahc_softc *ahc, struct scb *s 1717 ahc_done(struct ahc_softc *ahc, struct scb *scb)
1647 { 1718 {
1648 struct scsi_cmnd *cmd; 1719 struct scsi_cmnd *cmd;
1649 struct ahc_linux_device *dev; 1720 struct ahc_linux_device *dev;
1650 1721
1651 LIST_REMOVE(scb, pending_links); 1722 LIST_REMOVE(scb, pending_links);
1652 if ((scb->flags & SCB_UNTAGGEDQ) != 0 1723 if ((scb->flags & SCB_UNTAGGEDQ) != 0) {
1653 struct scb_tailq *untagged_q; 1724 struct scb_tailq *untagged_q;
1654 int target_offset; 1725 int target_offset;
1655 1726
1656 target_offset = SCB_GET_TARGE 1727 target_offset = SCB_GET_TARGET_OFFSET(ahc, scb);
1657 untagged_q = &(ahc->untagged_ 1728 untagged_q = &(ahc->untagged_queues[target_offset]);
1658 TAILQ_REMOVE(untagged_q, scb, 1729 TAILQ_REMOVE(untagged_q, scb, links.tqe);
1659 BUG_ON(!TAILQ_EMPTY(untagged_ 1730 BUG_ON(!TAILQ_EMPTY(untagged_q));
1660 } else if ((scb->flags & SCB_ACTIVE) 1731 } else if ((scb->flags & SCB_ACTIVE) == 0) {
1661 /* 1732 /*
1662 * Transactions aborted from 1733 * Transactions aborted from the untagged queue may
1663 * not have been dispatched t 1734 * not have been dispatched to the controller, so
1664 * only check the SCB_ACTIVE 1735 * only check the SCB_ACTIVE flag for tagged transactions.
1665 */ 1736 */
1666 printf("SCB %d done'd twice\n 1737 printf("SCB %d done'd twice\n", scb->hscb->tag);
1667 ahc_dump_card_state(ahc); 1738 ahc_dump_card_state(ahc);
1668 panic("Stopping for safety"); 1739 panic("Stopping for safety");
1669 } 1740 }
1670 cmd = scb->io_ctx; 1741 cmd = scb->io_ctx;
1671 dev = scb->platform_data->dev; 1742 dev = scb->platform_data->dev;
1672 dev->active--; 1743 dev->active--;
1673 dev->openings++; 1744 dev->openings++;
1674 if ((cmd->result & (CAM_DEV_QFRZN << 1745 if ((cmd->result & (CAM_DEV_QFRZN << 16)) != 0) {
1675 cmd->result &= ~(CAM_DEV_QFRZ 1746 cmd->result &= ~(CAM_DEV_QFRZN << 16);
1676 dev->qfrozen--; 1747 dev->qfrozen--;
1677 } 1748 }
1678 ahc_linux_unmap_scb(ahc, scb); 1749 ahc_linux_unmap_scb(ahc, scb);
1679 1750
1680 /* 1751 /*
1681 * Guard against stale sense data. 1752 * Guard against stale sense data.
1682 * The Linux mid-layer assumes that s 1753 * The Linux mid-layer assumes that sense
1683 * was retrieved anytime the first by 1754 * was retrieved anytime the first byte of
1684 * the sense buffer looks "sane". 1755 * the sense buffer looks "sane".
1685 */ 1756 */
1686 cmd->sense_buffer[0] = 0; 1757 cmd->sense_buffer[0] = 0;
1687 if (ahc_get_transaction_status(scb) = 1758 if (ahc_get_transaction_status(scb) == CAM_REQ_INPROG) {
1688 uint32_t amount_xferred; 1759 uint32_t amount_xferred;
1689 1760
1690 amount_xferred = 1761 amount_xferred =
1691 ahc_get_transfer_length(s 1762 ahc_get_transfer_length(scb) - ahc_get_residual(scb);
1692 if ((scb->flags & SCB_TRANSMI 1763 if ((scb->flags & SCB_TRANSMISSION_ERROR) != 0) {
1693 #ifdef AHC_DEBUG 1764 #ifdef AHC_DEBUG
1694 if ((ahc_debug & AHC_ 1765 if ((ahc_debug & AHC_SHOW_MISC) != 0) {
1695 ahc_print_pat 1766 ahc_print_path(ahc, scb);
1696 printf("Set C 1767 printf("Set CAM_UNCOR_PARITY\n");
1697 } 1768 }
1698 #endif 1769 #endif
1699 ahc_set_transaction_s 1770 ahc_set_transaction_status(scb, CAM_UNCOR_PARITY);
1700 #ifdef AHC_REPORT_UNDERFLOWS 1771 #ifdef AHC_REPORT_UNDERFLOWS
1701 /* 1772 /*
1702 * This code is disabled by d 1773 * This code is disabled by default as some
1703 * clients of the SCSI system 1774 * clients of the SCSI system do not properly
1704 * initialize the underflow p 1775 * initialize the underflow parameter. This
1705 * results in spurious termin 1776 * results in spurious termination of commands
1706 * that complete as expected 1777 * that complete as expected (e.g. underflow is
1707 * allowed as command can ret 1778 * allowed as command can return variable amounts
1708 * of data. 1779 * of data.
1709 */ 1780 */
1710 } else if (amount_xferred < s 1781 } else if (amount_xferred < scb->io_ctx->underflow) {
1711 u_int i; 1782 u_int i;
1712 1783
1713 ahc_print_path(ahc, s 1784 ahc_print_path(ahc, scb);
1714 printf("CDB:"); 1785 printf("CDB:");
1715 for (i = 0; i < scb-> 1786 for (i = 0; i < scb->io_ctx->cmd_len; i++)
1716 printf(" 0x%x 1787 printf(" 0x%x", scb->io_ctx->cmnd[i]);
1717 printf("\n"); 1788 printf("\n");
1718 ahc_print_path(ahc, s 1789 ahc_print_path(ahc, scb);
1719 printf("Saw underflow 1790 printf("Saw underflow (%ld of %ld bytes). "
1720 "Treated as er 1791 "Treated as error\n",
1721 ahc_get_resid 1792 ahc_get_residual(scb),
1722 ahc_get_trans 1793 ahc_get_transfer_length(scb));
1723 ahc_set_transaction_s 1794 ahc_set_transaction_status(scb, CAM_DATA_RUN_ERR);
1724 #endif 1795 #endif
1725 } else { 1796 } else {
1726 ahc_set_transaction_s 1797 ahc_set_transaction_status(scb, CAM_REQ_CMP);
1727 } 1798 }
1728 } else if (ahc_get_transaction_status 1799 } else if (ahc_get_transaction_status(scb) == CAM_SCSI_STATUS_ERROR) {
1729 ahc_linux_handle_scsi_status( 1800 ahc_linux_handle_scsi_status(ahc, cmd->device, scb);
1730 } 1801 }
1731 1802
1732 if (dev->openings == 1 1803 if (dev->openings == 1
1733 && ahc_get_transaction_status(scb) = 1804 && ahc_get_transaction_status(scb) == CAM_REQ_CMP
1734 && ahc_get_scsi_status(scb) != SCSI_ 1805 && ahc_get_scsi_status(scb) != SCSI_STATUS_QUEUE_FULL)
1735 dev->tag_success_count++; 1806 dev->tag_success_count++;
1736 /* 1807 /*
1737 * Some devices deal with temporary i 1808 * Some devices deal with temporary internal resource
1738 * shortages by returning queue full. 1809 * shortages by returning queue full. When the queue
1739 * full occurrs, we throttle back. S 1810 * full occurrs, we throttle back. Slowly try to get
1740 * back to our previous queue depth. 1811 * back to our previous queue depth.
1741 */ 1812 */
1742 if ((dev->openings + dev->active) < d 1813 if ((dev->openings + dev->active) < dev->maxtags
1743 && dev->tag_success_count > AHC_TAG_ 1814 && dev->tag_success_count > AHC_TAG_SUCCESS_INTERVAL) {
1744 dev->tag_success_count = 0; 1815 dev->tag_success_count = 0;
1745 dev->openings++; 1816 dev->openings++;
1746 } 1817 }
1747 1818
1748 if (dev->active == 0) 1819 if (dev->active == 0)
1749 dev->commands_since_idle_or_o 1820 dev->commands_since_idle_or_otag = 0;
1750 1821
1751 if ((scb->flags & SCB_RECOVERY_SCB) ! 1822 if ((scb->flags & SCB_RECOVERY_SCB) != 0) {
1752 printf("Recovery SCB complete 1823 printf("Recovery SCB completes\n");
1753 if (ahc_get_transaction_statu 1824 if (ahc_get_transaction_status(scb) == CAM_BDR_SENT
1754 || ahc_get_transaction_statu 1825 || ahc_get_transaction_status(scb) == CAM_REQ_ABORTED)
1755 ahc_set_transaction_s 1826 ahc_set_transaction_status(scb, CAM_CMD_TIMEOUT);
1756 1827
1757 if (ahc->platform_data->eh_do 1828 if (ahc->platform_data->eh_done)
1758 complete(ahc->platfor 1829 complete(ahc->platform_data->eh_done);
1759 } 1830 }
1760 1831
1761 ahc_free_scb(ahc, scb); 1832 ahc_free_scb(ahc, scb);
1762 ahc_linux_queue_cmd_complete(ahc, cmd 1833 ahc_linux_queue_cmd_complete(ahc, cmd);
1763 } 1834 }
1764 1835
1765 static void 1836 static void
1766 ahc_linux_handle_scsi_status(struct ahc_softc 1837 ahc_linux_handle_scsi_status(struct ahc_softc *ahc,
1767 struct scsi_devi 1838 struct scsi_device *sdev, struct scb *scb)
1768 { 1839 {
1769 struct ahc_devinfo devinfo; 1840 struct ahc_devinfo devinfo;
1770 struct ahc_linux_device *dev = scsi_t 1841 struct ahc_linux_device *dev = scsi_transport_device_data(sdev);
1771 1842
1772 ahc_compile_devinfo(&devinfo, 1843 ahc_compile_devinfo(&devinfo,
1773 ahc->our_id, 1844 ahc->our_id,
1774 sdev->sdev_target 1845 sdev->sdev_target->id, sdev->lun,
1775 sdev->sdev_target 1846 sdev->sdev_target->channel == 0 ? 'A' : 'B',
1776 ROLE_INITIATOR); 1847 ROLE_INITIATOR);
1777 1848
1778 /* 1849 /*
1779 * We don't currently trust the mid-l 1850 * We don't currently trust the mid-layer to
1780 * properly deal with queue full or b 1851 * properly deal with queue full or busy. So,
1781 * when one occurs, we tell the mid-l 1852 * when one occurs, we tell the mid-layer to
1782 * unconditionally requeue the comman 1853 * unconditionally requeue the command to us
1783 * so that we can retry it ourselves. 1854 * so that we can retry it ourselves. We also
1784 * implement our own throttling mecha 1855 * implement our own throttling mechanism so
1785 * we don't clobber the device with t 1856 * we don't clobber the device with too many
1786 * commands. 1857 * commands.
1787 */ 1858 */
1788 switch (ahc_get_scsi_status(scb)) { 1859 switch (ahc_get_scsi_status(scb)) {
1789 default: 1860 default:
1790 break; 1861 break;
1791 case SCSI_STATUS_CHECK_COND: 1862 case SCSI_STATUS_CHECK_COND:
1792 case SCSI_STATUS_CMD_TERMINATED: 1863 case SCSI_STATUS_CMD_TERMINATED:
1793 { 1864 {
1794 struct scsi_cmnd *cmd; 1865 struct scsi_cmnd *cmd;
1795 1866
1796 /* 1867 /*
1797 * Copy sense information to 1868 * Copy sense information to the OS's cmd
1798 * structure if it is availab 1869 * structure if it is available.
1799 */ 1870 */
1800 cmd = scb->io_ctx; 1871 cmd = scb->io_ctx;
1801 if (scb->flags & SCB_SENSE) { 1872 if (scb->flags & SCB_SENSE) {
1802 u_int sense_size; 1873 u_int sense_size;
1803 1874
1804 sense_size = min(size 1875 sense_size = min(sizeof(struct scsi_sense_data)
1805 - ahc_ 1876 - ahc_get_sense_residual(scb),
1806 (u_l 1877 (u_long)SCSI_SENSE_BUFFERSIZE);
1807 memcpy(cmd->sense_buf 1878 memcpy(cmd->sense_buffer,
1808 ahc_get_sense_ 1879 ahc_get_sense_buf(ahc, scb), sense_size);
1809 if (sense_size < SCSI 1880 if (sense_size < SCSI_SENSE_BUFFERSIZE)
1810 memset(&cmd-> 1881 memset(&cmd->sense_buffer[sense_size], 0,
1811 SCSI_S 1882 SCSI_SENSE_BUFFERSIZE - sense_size);
1812 cmd->result |= (DRIVE 1883 cmd->result |= (DRIVER_SENSE << 24);
1813 #ifdef AHC_DEBUG 1884 #ifdef AHC_DEBUG
1814 if (ahc_debug & AHC_S 1885 if (ahc_debug & AHC_SHOW_SENSE) {
1815 int i; 1886 int i;
1816 1887
1817 printf("Copie 1888 printf("Copied %d bytes of sense data:",
1818 sense_ 1889 sense_size);
1819 for (i = 0; i 1890 for (i = 0; i < sense_size; i++) {
1820 if (( 1891 if ((i & 0xF) == 0)
1821 1892 printf("\n");
1822 print 1893 printf("0x%x ", cmd->sense_buffer[i]);
1823 } 1894 }
1824 printf("\n"); 1895 printf("\n");
1825 } 1896 }
1826 #endif 1897 #endif
1827 } 1898 }
1828 break; 1899 break;
1829 } 1900 }
1830 case SCSI_STATUS_QUEUE_FULL: 1901 case SCSI_STATUS_QUEUE_FULL:
1831 { 1902 {
1832 /* 1903 /*
1833 * By the time the core drive 1904 * By the time the core driver has returned this
1834 * command, all other command 1905 * command, all other commands that were queued
1835 * to us but not the device h 1906 * to us but not the device have been returned.
1836 * This ensures that dev->act 1907 * This ensures that dev->active is equal to
1837 * the number of commands act 1908 * the number of commands actually queued to
1838 * the device. 1909 * the device.
1839 */ 1910 */
1840 dev->tag_success_count = 0; 1911 dev->tag_success_count = 0;
1841 if (dev->active != 0) { 1912 if (dev->active != 0) {
1842 /* 1913 /*
1843 * Drop our opening c 1914 * Drop our opening count to the number
1844 * of commands curren 1915 * of commands currently outstanding.
1845 */ 1916 */
1846 dev->openings = 0; 1917 dev->openings = 0;
1847 /* 1918 /*
1848 ahc_print_path(ahc, s 1919 ahc_print_path(ahc, scb);
1849 printf("Dropping tag 1920 printf("Dropping tag count to %d\n", dev->active);
1850 */ 1921 */
1851 if (dev->active == de 1922 if (dev->active == dev->tags_on_last_queuefull) {
1852 1923
1853 dev->last_que 1924 dev->last_queuefull_same_count++;
1854 /* 1925 /*
1855 * If we repe 1926 * If we repeatedly see a queue full
1856 * at the sam 1927 * at the same queue depth, this
1857 * device has 1928 * device has a fixed number of tag
1858 * slots. Lo 1929 * slots. Lock in this tag depth
1859 * so we stop 1930 * so we stop seeing queue fulls from
1860 * this devic 1931 * this device.
1861 */ 1932 */
1862 if (dev->last 1933 if (dev->last_queuefull_same_count
1863 == AHC_LOCK_ 1934 == AHC_LOCK_TAGS_COUNT) {
1864 dev-> 1935 dev->maxtags = dev->active;
1865 ahc_p 1936 ahc_print_path(ahc, scb);
1866 print 1937 printf("Locking max tag count at %d\n",
1867 1938 dev->active);
1868 } 1939 }
1869 } else { 1940 } else {
1870 dev->tags_on_ 1941 dev->tags_on_last_queuefull = dev->active;
1871 dev->last_que 1942 dev->last_queuefull_same_count = 0;
1872 } 1943 }
1873 ahc_set_transaction_s 1944 ahc_set_transaction_status(scb, CAM_REQUEUE_REQ);
1874 ahc_set_scsi_status(s 1945 ahc_set_scsi_status(scb, SCSI_STATUS_OK);
1875 ahc_platform_set_tags 1946 ahc_platform_set_tags(ahc, sdev, &devinfo,
1876 (dev->fl 1947 (dev->flags & AHC_DEV_Q_BASIC)
1877 ? AHC_QUEU 1948 ? AHC_QUEUE_BASIC : AHC_QUEUE_TAGGED);
1878 break; 1949 break;
1879 } 1950 }
1880 /* 1951 /*
1881 * Drop down to a single open 1952 * Drop down to a single opening, and treat this
1882 * as if the target returned 1953 * as if the target returned BUSY SCSI status.
1883 */ 1954 */
1884 dev->openings = 1; 1955 dev->openings = 1;
1885 ahc_set_scsi_status(scb, SCSI 1956 ahc_set_scsi_status(scb, SCSI_STATUS_BUSY);
1886 ahc_platform_set_tags(ahc, sd 1957 ahc_platform_set_tags(ahc, sdev, &devinfo,
1887 (dev->flags & AH 1958 (dev->flags & AHC_DEV_Q_BASIC)
1888 ? AHC_QUEUE_BASIC 1959 ? AHC_QUEUE_BASIC : AHC_QUEUE_TAGGED);
1889 break; 1960 break;
1890 } 1961 }
1891 } 1962 }
1892 } 1963 }
1893 1964
1894 static void 1965 static void
1895 ahc_linux_queue_cmd_complete(struct ahc_softc 1966 ahc_linux_queue_cmd_complete(struct ahc_softc *ahc, struct scsi_cmnd *cmd)
1896 { 1967 {
1897 /* 1968 /*
1898 * Map CAM error codes into Linux Err 1969 * Map CAM error codes into Linux Error codes. We
1899 * avoid the conversion so that the D 1970 * avoid the conversion so that the DV code has the
1900 * full error information available w 1971 * full error information available when making
1901 * state change decisions. 1972 * state change decisions.
1902 */ 1973 */
1903 { 1974 {
1904 u_int new_status; 1975 u_int new_status;
1905 1976
1906 switch (ahc_cmd_get_transacti 1977 switch (ahc_cmd_get_transaction_status(cmd)) {
1907 case CAM_REQ_INPROG: 1978 case CAM_REQ_INPROG:
1908 case CAM_REQ_CMP: 1979 case CAM_REQ_CMP:
1909 case CAM_SCSI_STATUS_ERROR: 1980 case CAM_SCSI_STATUS_ERROR:
1910 new_status = DID_OK; 1981 new_status = DID_OK;
1911 break; 1982 break;
1912 case CAM_REQ_ABORTED: 1983 case CAM_REQ_ABORTED:
1913 new_status = DID_ABOR 1984 new_status = DID_ABORT;
1914 break; 1985 break;
1915 case CAM_BUSY: 1986 case CAM_BUSY:
1916 new_status = DID_BUS_ 1987 new_status = DID_BUS_BUSY;
1917 break; 1988 break;
1918 case CAM_REQ_INVALID: 1989 case CAM_REQ_INVALID:
1919 case CAM_PATH_INVALID: 1990 case CAM_PATH_INVALID:
1920 new_status = DID_BAD_ 1991 new_status = DID_BAD_TARGET;
1921 break; 1992 break;
1922 case CAM_SEL_TIMEOUT: 1993 case CAM_SEL_TIMEOUT:
1923 new_status = DID_NO_C 1994 new_status = DID_NO_CONNECT;
1924 break; 1995 break;
1925 case CAM_SCSI_BUS_RESET: 1996 case CAM_SCSI_BUS_RESET:
1926 case CAM_BDR_SENT: 1997 case CAM_BDR_SENT:
1927 new_status = DID_RESE 1998 new_status = DID_RESET;
1928 break; 1999 break;
1929 case CAM_UNCOR_PARITY: 2000 case CAM_UNCOR_PARITY:
1930 new_status = DID_PARI 2001 new_status = DID_PARITY;
1931 break; 2002 break;
1932 case CAM_CMD_TIMEOUT: 2003 case CAM_CMD_TIMEOUT:
1933 new_status = DID_TIME 2004 new_status = DID_TIME_OUT;
1934 break; 2005 break;
1935 case CAM_UA_ABORT: 2006 case CAM_UA_ABORT:
1936 case CAM_REQ_CMP_ERR: 2007 case CAM_REQ_CMP_ERR:
1937 case CAM_AUTOSENSE_FAIL: 2008 case CAM_AUTOSENSE_FAIL:
1938 case CAM_NO_HBA: 2009 case CAM_NO_HBA:
1939 case CAM_DATA_RUN_ERR: 2010 case CAM_DATA_RUN_ERR:
1940 case CAM_UNEXP_BUSFREE: 2011 case CAM_UNEXP_BUSFREE:
1941 case CAM_SEQUENCE_FAIL: 2012 case CAM_SEQUENCE_FAIL:
1942 case CAM_CCB_LEN_ERR: 2013 case CAM_CCB_LEN_ERR:
1943 case CAM_PROVIDE_FAIL: 2014 case CAM_PROVIDE_FAIL:
1944 case CAM_REQ_TERMIO: 2015 case CAM_REQ_TERMIO:
1945 case CAM_UNREC_HBA_ERROR: 2016 case CAM_UNREC_HBA_ERROR:
1946 case CAM_REQ_TOO_BIG: 2017 case CAM_REQ_TOO_BIG:
1947 new_status = DID_ERRO 2018 new_status = DID_ERROR;
1948 break; 2019 break;
1949 case CAM_REQUEUE_REQ: 2020 case CAM_REQUEUE_REQ:
1950 new_status = DID_REQU 2021 new_status = DID_REQUEUE;
1951 break; 2022 break;
1952 default: 2023 default:
1953 /* We should never ge 2024 /* We should never get here */
1954 new_status = DID_ERRO 2025 new_status = DID_ERROR;
1955 break; 2026 break;
1956 } 2027 }
1957 2028
1958 ahc_cmd_set_transaction_statu 2029 ahc_cmd_set_transaction_status(cmd, new_status);
1959 } 2030 }
1960 2031
1961 cmd->scsi_done(cmd); 2032 cmd->scsi_done(cmd);
1962 } 2033 }
1963 2034
1964 static void 2035 static void
1965 ahc_linux_freeze_simq(struct ahc_softc *ahc) 2036 ahc_linux_freeze_simq(struct ahc_softc *ahc)
1966 { 2037 {
1967 unsigned long s; 2038 unsigned long s;
1968 2039
1969 ahc_lock(ahc, &s); 2040 ahc_lock(ahc, &s);
1970 ahc->platform_data->qfrozen++; 2041 ahc->platform_data->qfrozen++;
1971 if (ahc->platform_data->qfrozen == 1) 2042 if (ahc->platform_data->qfrozen == 1) {
1972 scsi_block_requests(ahc->plat 2043 scsi_block_requests(ahc->platform_data->host);
1973 2044
1974 /* XXX What about Twin channe 2045 /* XXX What about Twin channels? */
1975 ahc_platform_abort_scbs(ahc, 2046 ahc_platform_abort_scbs(ahc, CAM_TARGET_WILDCARD, ALL_CHANNELS,
1976 CAM_L 2047 CAM_LUN_WILDCARD, SCB_LIST_NULL,
1977 ROLE_ 2048 ROLE_INITIATOR, CAM_REQUEUE_REQ);
1978 } 2049 }
1979 ahc_unlock(ahc, &s); 2050 ahc_unlock(ahc, &s);
1980 } 2051 }
1981 2052
1982 static void 2053 static void
1983 ahc_linux_release_simq(struct ahc_softc *ahc) 2054 ahc_linux_release_simq(struct ahc_softc *ahc)
1984 { 2055 {
1985 u_long s; 2056 u_long s;
1986 int unblock_reqs; 2057 int unblock_reqs;
1987 2058
1988 unblock_reqs = 0; 2059 unblock_reqs = 0;
1989 ahc_lock(ahc, &s); 2060 ahc_lock(ahc, &s);
1990 if (ahc->platform_data->qfrozen > 0) 2061 if (ahc->platform_data->qfrozen > 0)
1991 ahc->platform_data->qfrozen-- 2062 ahc->platform_data->qfrozen--;
1992 if (ahc->platform_data->qfrozen == 0) 2063 if (ahc->platform_data->qfrozen == 0)
1993 unblock_reqs = 1; 2064 unblock_reqs = 1;
1994 ahc_unlock(ahc, &s); 2065 ahc_unlock(ahc, &s);
1995 /* 2066 /*
1996 * There is still a race here. The m 2067 * There is still a race here. The mid-layer
1997 * should keep its own freeze count a 2068 * should keep its own freeze count and use
1998 * a bottom half handler to run the q 2069 * a bottom half handler to run the queues
1999 * so we can unblock with our own loc 2070 * so we can unblock with our own lock held.
2000 */ 2071 */
2001 if (unblock_reqs) 2072 if (unblock_reqs)
2002 scsi_unblock_requests(ahc->pl 2073 scsi_unblock_requests(ahc->platform_data->host);
2003 } 2074 }
2004 2075
2005 static int 2076 static int
2006 ahc_linux_queue_recovery_cmd(struct scsi_cmnd 2077 ahc_linux_queue_recovery_cmd(struct scsi_cmnd *cmd, scb_flag flag)
2007 { 2078 {
2008 struct ahc_softc *ahc; 2079 struct ahc_softc *ahc;
2009 struct ahc_linux_device *dev; 2080 struct ahc_linux_device *dev;
2010 struct scb *pending_scb; 2081 struct scb *pending_scb;
2011 u_int saved_scbptr; 2082 u_int saved_scbptr;
2012 u_int active_scb_index; 2083 u_int active_scb_index;
2013 u_int last_phase; 2084 u_int last_phase;
2014 u_int saved_scsiid; 2085 u_int saved_scsiid;
2015 u_int cdb_byte; 2086 u_int cdb_byte;
2016 int retval; 2087 int retval;
2017 int was_paused; 2088 int was_paused;
2018 int paused; 2089 int paused;
2019 int wait; 2090 int wait;
2020 int disconnected; 2091 int disconnected;
2021 unsigned long flags; 2092 unsigned long flags;
2022 2093
2023 pending_scb = NULL; 2094 pending_scb = NULL;
2024 paused = FALSE; 2095 paused = FALSE;
2025 wait = FALSE; 2096 wait = FALSE;
2026 ahc = *(struct ahc_softc **)cmd->devi 2097 ahc = *(struct ahc_softc **)cmd->device->host->hostdata;
2027 2098
2028 scmd_printk(KERN_INFO, cmd, "Attempti 2099 scmd_printk(KERN_INFO, cmd, "Attempting to queue a%s message\n",
2029 flag == SCB_ABORT ? "n ABORT" 2100 flag == SCB_ABORT ? "n ABORT" : " TARGET RESET");
2030 2101
2031 printf("CDB:"); 2102 printf("CDB:");
2032 for (cdb_byte = 0; cdb_byte < cmd->cm 2103 for (cdb_byte = 0; cdb_byte < cmd->cmd_len; cdb_byte++)
2033 printf(" 0x%x", cmd->cmnd[cdb 2104 printf(" 0x%x", cmd->cmnd[cdb_byte]);
2034 printf("\n"); 2105 printf("\n");
2035 2106
2036 ahc_lock(ahc, &flags); 2107 ahc_lock(ahc, &flags);
2037 2108
2038 /* 2109 /*
2039 * First determine if we currently ow 2110 * First determine if we currently own this command.
2040 * Start by searching the device queu 2111 * Start by searching the device queue. If not found
2041 * there, check the pending_scb list. 2112 * there, check the pending_scb list. If not found
2042 * at all, and the system wanted us t 2113 * at all, and the system wanted us to just abort the
2043 * command, return success. 2114 * command, return success.
2044 */ 2115 */
2045 dev = scsi_transport_device_data(cmd- 2116 dev = scsi_transport_device_data(cmd->device);
2046 2117
2047 if (dev == NULL) { 2118 if (dev == NULL) {
2048 /* 2119 /*
2049 * No target device for this 2120 * No target device for this command exists,
2050 * so we must not still own t 2121 * so we must not still own the command.
2051 */ 2122 */
2052 printf("%s:%d:%d:%d: Is not a 2123 printf("%s:%d:%d:%d: Is not an active device\n",
2053 ahc_name(ahc), cmd->de 2124 ahc_name(ahc), cmd->device->channel, cmd->device->id,
2054 cmd->device->lun); 2125 cmd->device->lun);
2055 retval = SUCCESS; 2126 retval = SUCCESS;
2056 goto no_cmd; 2127 goto no_cmd;
2057 } 2128 }
2058 2129
2059 if ((dev->flags & (AHC_DEV_Q_BASIC|AH 2130 if ((dev->flags & (AHC_DEV_Q_BASIC|AHC_DEV_Q_TAGGED)) == 0
2060 && ahc_search_untagged_queues(ahc, c 2131 && ahc_search_untagged_queues(ahc, cmd, cmd->device->id,
2061 cmd->d 2132 cmd->device->channel + 'A',
2062 cmd->d 2133 cmd->device->lun,
2063 CAM_RE 2134 CAM_REQ_ABORTED, SEARCH_COMPLETE) != 0) {
2064 printf("%s:%d:%d:%d: Command 2135 printf("%s:%d:%d:%d: Command found on untagged queue\n",
2065 ahc_name(ahc), cmd->de 2136 ahc_name(ahc), cmd->device->channel, cmd->device->id,
2066 cmd->device->lun); 2137 cmd->device->lun);
2067 retval = SUCCESS; 2138 retval = SUCCESS;
2068 goto done; 2139 goto done;
2069 } 2140 }
2070 2141
2071 /* 2142 /*
2072 * See if we can find a matching cmd 2143 * See if we can find a matching cmd in the pending list.
2073 */ 2144 */
2074 LIST_FOREACH(pending_scb, &ahc->pendi 2145 LIST_FOREACH(pending_scb, &ahc->pending_scbs, pending_links) {
2075 if (pending_scb->io_ctx == cm 2146 if (pending_scb->io_ctx == cmd)
2076 break; 2147 break;
2077 } 2148 }
2078 2149
2079 if (pending_scb == NULL && flag == SC 2150 if (pending_scb == NULL && flag == SCB_DEVICE_RESET) {
2080 2151
2081 /* Any SCB for this device wi 2152 /* Any SCB for this device will do for a target reset */
2082 LIST_FOREACH(pending_scb, &ah 2153 LIST_FOREACH(pending_scb, &ahc->pending_scbs, pending_links) {
2083 if (ahc_match_scb(ahc 2154 if (ahc_match_scb(ahc, pending_scb, scmd_id(cmd),
2084 scm 2155 scmd_channel(cmd) + 'A',
2085 CAM 2156 CAM_LUN_WILDCARD,
2086 SCB 2157 SCB_LIST_NULL, ROLE_INITIATOR))
2087 break; 2158 break;
2088 } 2159 }
2089 } 2160 }
2090 2161
2091 if (pending_scb == NULL) { 2162 if (pending_scb == NULL) {
2092 scmd_printk(KERN_INFO, cmd, " 2163 scmd_printk(KERN_INFO, cmd, "Command not found\n");
2093 goto no_cmd; 2164 goto no_cmd;
2094 } 2165 }
2095 2166
2096 if ((pending_scb->flags & SCB_RECOVER 2167 if ((pending_scb->flags & SCB_RECOVERY_SCB) != 0) {
2097 /* 2168 /*
2098 * We can't queue two recover 2169 * We can't queue two recovery actions using the same SCB
2099 */ 2170 */
2100 retval = FAILED; 2171 retval = FAILED;
2101 goto done; 2172 goto done;
2102 } 2173 }
2103 2174
2104 /* 2175 /*
2105 * Ensure that the card doesn't do an 2176 * Ensure that the card doesn't do anything
2106 * behind our back and that we didn't 2177 * behind our back and that we didn't "just" miss
2107 * an interrupt that would affect thi 2178 * an interrupt that would affect this cmd.
2108 */ 2179 */
2109 was_paused = ahc_is_paused(ahc); 2180 was_paused = ahc_is_paused(ahc);
2110 ahc_pause_and_flushwork(ahc); 2181 ahc_pause_and_flushwork(ahc);
2111 paused = TRUE; 2182 paused = TRUE;
2112 2183
2113 if ((pending_scb->flags & SCB_ACTIVE) 2184 if ((pending_scb->flags & SCB_ACTIVE) == 0) {
2114 scmd_printk(KERN_INFO, cmd, " 2185 scmd_printk(KERN_INFO, cmd, "Command already completed\n");
2115 goto no_cmd; 2186 goto no_cmd;
2116 } 2187 }
2117 2188
2118 printf("%s: At time of recovery, card 2189 printf("%s: At time of recovery, card was %spaused\n",
2119 ahc_name(ahc), was_paused ? "" 2190 ahc_name(ahc), was_paused ? "" : "not ");
2120 ahc_dump_card_state(ahc); 2191 ahc_dump_card_state(ahc);
2121 2192
2122 disconnected = TRUE; 2193 disconnected = TRUE;
2123 if (flag == SCB_ABORT) { 2194 if (flag == SCB_ABORT) {
2124 if (ahc_search_qinfifo(ahc, c 2195 if (ahc_search_qinfifo(ahc, cmd->device->id,
2125 cmd->d 2196 cmd->device->channel + 'A',
2126 cmd->d 2197 cmd->device->lun,
2127 pendin 2198 pending_scb->hscb->tag,
2128 ROLE_I 2199 ROLE_INITIATOR, CAM_REQ_ABORTED,
2129 SEARCH 2200 SEARCH_COMPLETE) > 0) {
2130 printf("%s:%d:%d:%d: 2201 printf("%s:%d:%d:%d: Cmd aborted from QINFIFO\n",
2131 ahc_name(ahc), 2202 ahc_name(ahc), cmd->device->channel,
2132 cmd-> 2203 cmd->device->id, cmd->device->lun);
2133 retval = SUCCESS; 2204 retval = SUCCESS;
2134 goto done; 2205 goto done;
2135 } 2206 }
2136 } else if (ahc_search_qinfifo(ahc, cm 2207 } else if (ahc_search_qinfifo(ahc, cmd->device->id,
2137 cmd->de 2208 cmd->device->channel + 'A',
2138 cmd->de 2209 cmd->device->lun, pending_scb->hscb->tag,
2139 ROLE_IN 2210 ROLE_INITIATOR, /*status*/0,
2140 SEARCH_ 2211 SEARCH_COUNT) > 0) {
2141 disconnected = FALSE; 2212 disconnected = FALSE;
2142 } 2213 }
2143 2214
2144 if (disconnected && (ahc_inb(ahc, SEQ 2215 if (disconnected && (ahc_inb(ahc, SEQ_FLAGS) & NOT_IDENTIFIED) == 0) {
2145 struct scb *bus_scb; 2216 struct scb *bus_scb;
2146 2217
2147 bus_scb = ahc_lookup_scb(ahc, 2218 bus_scb = ahc_lookup_scb(ahc, ahc_inb(ahc, SCB_TAG));
2148 if (bus_scb == pending_scb) 2219 if (bus_scb == pending_scb)
2149 disconnected = FALSE; 2220 disconnected = FALSE;
2150 else if (flag != SCB_ABORT 2221 else if (flag != SCB_ABORT
2151 && ahc_inb(ahc, SAVED_S 2222 && ahc_inb(ahc, SAVED_SCSIID) == pending_scb->hscb->scsiid
2152 && ahc_inb(ahc, SAVED_L 2223 && ahc_inb(ahc, SAVED_LUN) == SCB_GET_LUN(pending_scb))
2153 disconnected = FALSE; 2224 disconnected = FALSE;
2154 } 2225 }
2155 2226
2156 /* 2227 /*
2157 * At this point, pending_scb is the 2228 * At this point, pending_scb is the scb associated with the
2158 * passed in command. That command i 2229 * passed in command. That command is currently active on the
2159 * bus, is in the disconnected state, 2230 * bus, is in the disconnected state, or we're hoping to find
2160 * a command for the same target acti 2231 * a command for the same target active on the bus to abuse to
2161 * send a BDR. Queue the appropriate 2232 * send a BDR. Queue the appropriate message based on which of
2162 * these states we are in. 2233 * these states we are in.
2163 */ 2234 */
2164 last_phase = ahc_inb(ahc, LASTPHASE); 2235 last_phase = ahc_inb(ahc, LASTPHASE);
2165 saved_scbptr = ahc_inb(ahc, SCBPTR); 2236 saved_scbptr = ahc_inb(ahc, SCBPTR);
2166 active_scb_index = ahc_inb(ahc, SCB_T 2237 active_scb_index = ahc_inb(ahc, SCB_TAG);
2167 saved_scsiid = ahc_inb(ahc, SAVED_SCS 2238 saved_scsiid = ahc_inb(ahc, SAVED_SCSIID);
2168 if (last_phase != P_BUSFREE 2239 if (last_phase != P_BUSFREE
2169 && (pending_scb->hscb->tag == active 2240 && (pending_scb->hscb->tag == active_scb_index
2170 || (flag == SCB_DEVICE_RESET 2241 || (flag == SCB_DEVICE_RESET
2171 && SCSIID_TARGET(ahc, saved_scsiid 2242 && SCSIID_TARGET(ahc, saved_scsiid) == scmd_id(cmd)))) {
2172 2243
2173 /* 2244 /*
2174 * We're active on the bus, s 2245 * We're active on the bus, so assert ATN
2175 * and hope that the target r 2246 * and hope that the target responds.
2176 */ 2247 */
2177 pending_scb = ahc_lookup_scb( 2248 pending_scb = ahc_lookup_scb(ahc, active_scb_index);
2178 pending_scb->flags |= SCB_REC 2249 pending_scb->flags |= SCB_RECOVERY_SCB|flag;
2179 ahc_outb(ahc, MSG_OUT, HOST_M 2250 ahc_outb(ahc, MSG_OUT, HOST_MSG);
2180 ahc_outb(ahc, SCSISIGO, last_ 2251 ahc_outb(ahc, SCSISIGO, last_phase|ATNO);
2181 scmd_printk(KERN_INFO, cmd, " 2252 scmd_printk(KERN_INFO, cmd, "Device is active, asserting ATN\n");
2182 wait = TRUE; 2253 wait = TRUE;
2183 } else if (disconnected) { 2254 } else if (disconnected) {
2184 2255
2185 /* 2256 /*
2186 * Actually re-queue this SCB 2257 * Actually re-queue this SCB in an attempt
2187 * to select the device befor 2258 * to select the device before it reconnects.
2188 * In either case (selection 2259 * In either case (selection or reselection),
2189 * we will now issue the appr 2260 * we will now issue the approprate message
2190 * to the timed-out device. 2261 * to the timed-out device.
2191 * 2262 *
2192 * Set the MK_MESSAGE control 2263 * Set the MK_MESSAGE control bit indicating
2193 * that we desire to send a m 2264 * that we desire to send a message. We
2194 * also set the disconnected 2265 * also set the disconnected flag since
2195 * in the paging case there i 2266 * in the paging case there is no guarantee
2196 * that our SCB control byte 2267 * that our SCB control byte matches the
2197 * version on the card. We d 2268 * version on the card. We don't want the
2198 * sequencer to abort the com 2269 * sequencer to abort the command thinking
2199 * an unsolicited reselection 2270 * an unsolicited reselection occurred.
2200 */ 2271 */
2201 pending_scb->hscb->control |= 2272 pending_scb->hscb->control |= MK_MESSAGE|DISCONNECTED;
2202 pending_scb->flags |= SCB_REC 2273 pending_scb->flags |= SCB_RECOVERY_SCB|flag;
2203 2274
2204 /* 2275 /*
2205 * Remove any cached copy of 2276 * Remove any cached copy of this SCB in the
2206 * disconnected list in prepa 2277 * disconnected list in preparation for the
2207 * queuing of our abort SCB. 2278 * queuing of our abort SCB. We use the
2208 * same element in the SCB, S 2279 * same element in the SCB, SCB_NEXT, for
2209 * both the qinfifo and the d 2280 * both the qinfifo and the disconnected list.
2210 */ 2281 */
2211 ahc_search_disc_list(ahc, cmd 2282 ahc_search_disc_list(ahc, cmd->device->id,
2212 cmd->dev 2283 cmd->device->channel + 'A',
2213 cmd->dev 2284 cmd->device->lun, pending_scb->hscb->tag,
2214 /*stop_o 2285 /*stop_on_first*/TRUE,
2215 /*remove 2286 /*remove*/TRUE,
2216 /*save_s 2287 /*save_state*/FALSE);
2217 2288
2218 /* 2289 /*
2219 * In the non-paging case, th 2290 * In the non-paging case, the sequencer will
2220 * never re-reference the in- 2291 * never re-reference the in-core SCB.
2221 * To make sure we are notifi 2292 * To make sure we are notified during
2222 * reslection, set the MK_MES 2293 * reslection, set the MK_MESSAGE flag in
2223 * the card's copy of the SCB 2294 * the card's copy of the SCB.
2224 */ 2295 */
2225 if ((ahc->flags & AHC_PAGESCB 2296 if ((ahc->flags & AHC_PAGESCBS) == 0) {
2226 ahc_outb(ahc, SCBPTR, 2297 ahc_outb(ahc, SCBPTR, pending_scb->hscb->tag);
2227 ahc_outb(ahc, SCB_CON 2298 ahc_outb(ahc, SCB_CONTROL,
2228 ahc_inb(ahc, 2299 ahc_inb(ahc, SCB_CONTROL)|MK_MESSAGE);
2229 } 2300 }
2230 2301
2231 /* 2302 /*
2232 * Clear out any entries in t 2303 * Clear out any entries in the QINFIFO first
2233 * so we are the next SCB for 2304 * so we are the next SCB for this target
2234 * to run. 2305 * to run.
2235 */ 2306 */
2236 ahc_search_qinfifo(ahc, cmd-> 2307 ahc_search_qinfifo(ahc, cmd->device->id,
2237 cmd->devic 2308 cmd->device->channel + 'A',
2238 cmd->devic 2309 cmd->device->lun, SCB_LIST_NULL,
2239 ROLE_INITI 2310 ROLE_INITIATOR, CAM_REQUEUE_REQ,
2240 SEARCH_COM 2311 SEARCH_COMPLETE);
2241 ahc_qinfifo_requeue_tail(ahc, 2312 ahc_qinfifo_requeue_tail(ahc, pending_scb);
2242 ahc_outb(ahc, SCBPTR, saved_s 2313 ahc_outb(ahc, SCBPTR, saved_scbptr);
2243 ahc_print_path(ahc, pending_s 2314 ahc_print_path(ahc, pending_scb);
2244 printf("Device is disconnecte 2315 printf("Device is disconnected, re-queuing SCB\n");
2245 wait = TRUE; 2316 wait = TRUE;
2246 } else { 2317 } else {
2247 scmd_printk(KERN_INFO, cmd, " 2318 scmd_printk(KERN_INFO, cmd, "Unable to deliver message\n");
2248 retval = FAILED; 2319 retval = FAILED;
2249 goto done; 2320 goto done;
2250 } 2321 }
2251 2322
2252 no_cmd: 2323 no_cmd:
2253 /* 2324 /*
2254 * Our assumption is that if we don't 2325 * Our assumption is that if we don't have the command, no
2255 * recovery action was required, so w 2326 * recovery action was required, so we return success. Again,
2256 * the semantics of the mid-layer rec 2327 * the semantics of the mid-layer recovery engine are not
2257 * well defined, so this may change i 2328 * well defined, so this may change in time.
2258 */ 2329 */
2259 retval = SUCCESS; 2330 retval = SUCCESS;
2260 done: 2331 done:
2261 if (paused) 2332 if (paused)
2262 ahc_unpause(ahc); 2333 ahc_unpause(ahc);
2263 if (wait) { 2334 if (wait) {
2264 DECLARE_COMPLETION_ONSTACK(do 2335 DECLARE_COMPLETION_ONSTACK(done);
2265 2336
2266 ahc->platform_data->eh_done = 2337 ahc->platform_data->eh_done = &done;
2267 ahc_unlock(ahc, &flags); 2338 ahc_unlock(ahc, &flags);
2268 2339
2269 printf("Recovery code sleepin 2340 printf("Recovery code sleeping\n");
2270 if (!wait_for_completion_time 2341 if (!wait_for_completion_timeout(&done, 5 * HZ)) {
2271 ahc_lock(ahc, &flags) 2342 ahc_lock(ahc, &flags);
2272 ahc->platform_data->e 2343 ahc->platform_data->eh_done = NULL;
2273 ahc_unlock(ahc, &flag 2344 ahc_unlock(ahc, &flags);
2274 2345
2275 printf("Timer Expired 2346 printf("Timer Expired\n");
2276 retval = FAILED; 2347 retval = FAILED;
2277 } 2348 }
2278 printf("Recovery code awake\n 2349 printf("Recovery code awake\n");
2279 } else 2350 } else
2280 ahc_unlock(ahc, &flags); 2351 ahc_unlock(ahc, &flags);
2281 return (retval); 2352 return (retval);
2282 } 2353 }
2283 2354
2284 void 2355 void
2285 ahc_platform_dump_card_state(struct ahc_softc 2356 ahc_platform_dump_card_state(struct ahc_softc *ahc)
2286 { 2357 {
2287 } 2358 }
2288 2359
2289 static void ahc_linux_set_width(struct scsi_t 2360 static void ahc_linux_set_width(struct scsi_target *starget, int width)
2290 { 2361 {
2291 struct Scsi_Host *shost = dev_to_shos 2362 struct Scsi_Host *shost = dev_to_shost(starget->dev.parent);
2292 struct ahc_softc *ahc = *((struct ahc 2363 struct ahc_softc *ahc = *((struct ahc_softc **)shost->hostdata);
2293 struct ahc_devinfo devinfo; 2364 struct ahc_devinfo devinfo;
2294 unsigned long flags; 2365 unsigned long flags;
2295 2366
2296 ahc_compile_devinfo(&devinfo, shost-> 2367 ahc_compile_devinfo(&devinfo, shost->this_id, starget->id, 0,
2297 starget->channel 2368 starget->channel + 'A', ROLE_INITIATOR);
2298 ahc_lock(ahc, &flags); 2369 ahc_lock(ahc, &flags);
2299 ahc_set_width(ahc, &devinfo, width, A 2370 ahc_set_width(ahc, &devinfo, width, AHC_TRANS_GOAL, FALSE);
2300 ahc_unlock(ahc, &flags); 2371 ahc_unlock(ahc, &flags);
2301 } 2372 }
2302 2373
2303 static void ahc_linux_set_period(struct scsi_ 2374 static void ahc_linux_set_period(struct scsi_target *starget, int period)
2304 { 2375 {
2305 struct Scsi_Host *shost = dev_to_shos 2376 struct Scsi_Host *shost = dev_to_shost(starget->dev.parent);
2306 struct ahc_softc *ahc = *((struct ahc 2377 struct ahc_softc *ahc = *((struct ahc_softc **)shost->hostdata);
2307 struct ahc_tmode_tstate *tstate; 2378 struct ahc_tmode_tstate *tstate;
2308 struct ahc_initiator_tinfo *tinfo 2379 struct ahc_initiator_tinfo *tinfo
2309 = ahc_fetch_transinfo(ahc, 2380 = ahc_fetch_transinfo(ahc,
2310 starget 2381 starget->channel + 'A',
2311 shost-> 2382 shost->this_id, starget->id, &tstate);
2312 struct ahc_devinfo devinfo; 2383 struct ahc_devinfo devinfo;
2313 unsigned int ppr_options = tinfo->goa 2384 unsigned int ppr_options = tinfo->goal.ppr_options;
2314 unsigned long flags; 2385 unsigned long flags;
2315 unsigned long offset = tinfo->goal.of 2386 unsigned long offset = tinfo->goal.offset;
2316 struct ahc_syncrate *syncrate; !! 2387 const struct ahc_syncrate *syncrate;
2317 2388
2318 if (offset == 0) 2389 if (offset == 0)
2319 offset = MAX_OFFSET; 2390 offset = MAX_OFFSET;
2320 2391
2321 if (period < 9) 2392 if (period < 9)
2322 period = 9; /* 12.5ns is 2393 period = 9; /* 12.5ns is our minimum */
2323 if (period == 9) { 2394 if (period == 9) {
2324 if (spi_max_width(starget)) 2395 if (spi_max_width(starget))
2325 ppr_options |= MSG_EX 2396 ppr_options |= MSG_EXT_PPR_DT_REQ;
2326 else 2397 else
2327 /* need wide for DT a 2398 /* need wide for DT and need DT for 12.5 ns */
2328 period = 10; 2399 period = 10;
2329 } 2400 }
2330 2401
2331 ahc_compile_devinfo(&devinfo, shost-> 2402 ahc_compile_devinfo(&devinfo, shost->this_id, starget->id, 0,
2332 starget->channel 2403 starget->channel + 'A', ROLE_INITIATOR);
2333 2404
2334 /* all PPR requests apart from QAS re 2405 /* all PPR requests apart from QAS require wide transfers */
2335 if (ppr_options & ~MSG_EXT_PPR_QAS_RE 2406 if (ppr_options & ~MSG_EXT_PPR_QAS_REQ) {
2336 if (spi_width(starget) == 0) 2407 if (spi_width(starget) == 0)
2337 ppr_options &= MSG_EX 2408 ppr_options &= MSG_EXT_PPR_QAS_REQ;
2338 } 2409 }
2339 2410
2340 syncrate = ahc_find_syncrate(ahc, &pe 2411 syncrate = ahc_find_syncrate(ahc, &period, &ppr_options, AHC_SYNCRATE_DT);
2341 ahc_lock(ahc, &flags); 2412 ahc_lock(ahc, &flags);
2342 ahc_set_syncrate(ahc, &devinfo, syncr 2413 ahc_set_syncrate(ahc, &devinfo, syncrate, period, offset,
2343 ppr_options, AHC_TRA 2414 ppr_options, AHC_TRANS_GOAL, FALSE);
2344 ahc_unlock(ahc, &flags); 2415 ahc_unlock(ahc, &flags);
2345 } 2416 }
2346 2417
2347 static void ahc_linux_set_offset(struct scsi_ 2418 static void ahc_linux_set_offset(struct scsi_target *starget, int offset)
2348 { 2419 {
2349 struct Scsi_Host *shost = dev_to_shos 2420 struct Scsi_Host *shost = dev_to_shost(starget->dev.parent);
2350 struct ahc_softc *ahc = *((struct ahc 2421 struct ahc_softc *ahc = *((struct ahc_softc **)shost->hostdata);
2351 struct ahc_tmode_tstate *tstate; 2422 struct ahc_tmode_tstate *tstate;
2352 struct ahc_initiator_tinfo *tinfo 2423 struct ahc_initiator_tinfo *tinfo
2353 = ahc_fetch_transinfo(ahc, 2424 = ahc_fetch_transinfo(ahc,
2354 starget 2425 starget->channel + 'A',
2355 shost-> 2426 shost->this_id, starget->id, &tstate);
2356 struct ahc_devinfo devinfo; 2427 struct ahc_devinfo devinfo;
2357 unsigned int ppr_options = 0; 2428 unsigned int ppr_options = 0;
2358 unsigned int period = 0; 2429 unsigned int period = 0;
2359 unsigned long flags; 2430 unsigned long flags;
2360 struct ahc_syncrate *syncrate = NULL; !! 2431 const struct ahc_syncrate *syncrate = NULL;
2361 2432
2362 ahc_compile_devinfo(&devinfo, shost-> 2433 ahc_compile_devinfo(&devinfo, shost->this_id, starget->id, 0,
2363 starget->channel 2434 starget->channel + 'A', ROLE_INITIATOR);
2364 if (offset != 0) { 2435 if (offset != 0) {
2365 syncrate = ahc_find_syncrate( 2436 syncrate = ahc_find_syncrate(ahc, &period, &ppr_options, AHC_SYNCRATE_DT);
2366 period = tinfo->goal.period; 2437 period = tinfo->goal.period;
2367 ppr_options = tinfo->goal.ppr 2438 ppr_options = tinfo->goal.ppr_options;
2368 } 2439 }
2369 ahc_lock(ahc, &flags); 2440 ahc_lock(ahc, &flags);
2370 ahc_set_syncrate(ahc, &devinfo, syncr 2441 ahc_set_syncrate(ahc, &devinfo, syncrate, period, offset,
2371 ppr_options, AHC_TRA 2442 ppr_options, AHC_TRANS_GOAL, FALSE);
2372 ahc_unlock(ahc, &flags); 2443 ahc_unlock(ahc, &flags);
2373 } 2444 }
2374 2445
2375 static void ahc_linux_set_dt(struct scsi_targ 2446 static void ahc_linux_set_dt(struct scsi_target *starget, int dt)
2376 { 2447 {
2377 struct Scsi_Host *shost = dev_to_shos 2448 struct Scsi_Host *shost = dev_to_shost(starget->dev.parent);
2378 struct ahc_softc *ahc = *((struct ahc 2449 struct ahc_softc *ahc = *((struct ahc_softc **)shost->hostdata);
2379 struct ahc_tmode_tstate *tstate; 2450 struct ahc_tmode_tstate *tstate;
2380 struct ahc_initiator_tinfo *tinfo 2451 struct ahc_initiator_tinfo *tinfo
2381 = ahc_fetch_transinfo(ahc, 2452 = ahc_fetch_transinfo(ahc,
2382 starget 2453 starget->channel + 'A',
2383 shost-> 2454 shost->this_id, starget->id, &tstate);
2384 struct ahc_devinfo devinfo; 2455 struct ahc_devinfo devinfo;
2385 unsigned int ppr_options = tinfo->goa 2456 unsigned int ppr_options = tinfo->goal.ppr_options
2386 & ~MSG_EXT_PPR_DT_REQ; 2457 & ~MSG_EXT_PPR_DT_REQ;
2387 unsigned int period = tinfo->goal.per 2458 unsigned int period = tinfo->goal.period;
2388 unsigned int width = tinfo->goal.widt 2459 unsigned int width = tinfo->goal.width;
2389 unsigned long flags; 2460 unsigned long flags;
2390 struct ahc_syncrate *syncrate; !! 2461 const struct ahc_syncrate *syncrate;
2391 2462
2392 if (dt && spi_max_width(starget)) { 2463 if (dt && spi_max_width(starget)) {
2393 ppr_options |= MSG_EXT_PPR_DT 2464 ppr_options |= MSG_EXT_PPR_DT_REQ;
2394 if (!width) 2465 if (!width)
2395 ahc_linux_set_width(s 2466 ahc_linux_set_width(starget, 1);
2396 } else if (period == 9) 2467 } else if (period == 9)
2397 period = 10; /* if resetti 2468 period = 10; /* if resetting DT, period must be >= 25ns */
2398 2469
2399 ahc_compile_devinfo(&devinfo, shost-> 2470 ahc_compile_devinfo(&devinfo, shost->this_id, starget->id, 0,
2400 starget->channel 2471 starget->channel + 'A', ROLE_INITIATOR);
2401 syncrate = ahc_find_syncrate(ahc, &pe 2472 syncrate = ahc_find_syncrate(ahc, &period, &ppr_options,AHC_SYNCRATE_DT);
2402 ahc_lock(ahc, &flags); 2473 ahc_lock(ahc, &flags);
2403 ahc_set_syncrate(ahc, &devinfo, syncr 2474 ahc_set_syncrate(ahc, &devinfo, syncrate, period, tinfo->goal.offset,
2404 ppr_options, AHC_TRA 2475 ppr_options, AHC_TRANS_GOAL, FALSE);
2405 ahc_unlock(ahc, &flags); 2476 ahc_unlock(ahc, &flags);
2406 } 2477 }
2407 2478
2408 #if 0 2479 #if 0
2409 /* FIXME: This code claims to support IU and 2480 /* FIXME: This code claims to support IU and QAS. However, the actual
2410 * sequencer code and aic7xxx_core have no su 2481 * sequencer code and aic7xxx_core have no support for these parameters and
2411 * will get into a bad state if they're negot 2482 * will get into a bad state if they're negotiated. Do not enable this
2412 * unless you know what you're doing */ 2483 * unless you know what you're doing */
2413 static void ahc_linux_set_qas(struct scsi_tar 2484 static void ahc_linux_set_qas(struct scsi_target *starget, int qas)
2414 { 2485 {
2415 struct Scsi_Host *shost = dev_to_shos 2486 struct Scsi_Host *shost = dev_to_shost(starget->dev.parent);
2416 struct ahc_softc *ahc = *((struct ahc 2487 struct ahc_softc *ahc = *((struct ahc_softc **)shost->hostdata);
2417 struct ahc_tmode_tstate *tstate; 2488 struct ahc_tmode_tstate *tstate;
2418 struct ahc_initiator_tinfo *tinfo 2489 struct ahc_initiator_tinfo *tinfo
2419 = ahc_fetch_transinfo(ahc, 2490 = ahc_fetch_transinfo(ahc,
2420 starget 2491 starget->channel + 'A',
2421 shost-> 2492 shost->this_id, starget->id, &tstate);
2422 struct ahc_devinfo devinfo; 2493 struct ahc_devinfo devinfo;
2423 unsigned int ppr_options = tinfo->goa 2494 unsigned int ppr_options = tinfo->goal.ppr_options
2424 & ~MSG_EXT_PPR_QAS_REQ; 2495 & ~MSG_EXT_PPR_QAS_REQ;
2425 unsigned int period = tinfo->goal.per 2496 unsigned int period = tinfo->goal.period;
2426 unsigned long flags; 2497 unsigned long flags;
2427 struct ahc_syncrate *syncrate; 2498 struct ahc_syncrate *syncrate;
2428 2499
2429 if (qas) 2500 if (qas)
2430 ppr_options |= MSG_EXT_PPR_QA 2501 ppr_options |= MSG_EXT_PPR_QAS_REQ;
2431 2502
2432 ahc_compile_devinfo(&devinfo, shost-> 2503 ahc_compile_devinfo(&devinfo, shost->this_id, starget->id, 0,
2433 starget->channel 2504 starget->channel + 'A', ROLE_INITIATOR);
2434 syncrate = ahc_find_syncrate(ahc, &pe 2505 syncrate = ahc_find_syncrate(ahc, &period, &ppr_options, AHC_SYNCRATE_DT);
2435 ahc_lock(ahc, &flags); 2506 ahc_lock(ahc, &flags);
2436 ahc_set_syncrate(ahc, &devinfo, syncr 2507 ahc_set_syncrate(ahc, &devinfo, syncrate, period, tinfo->goal.offset,
2437 ppr_options, AHC_TRA 2508 ppr_options, AHC_TRANS_GOAL, FALSE);
2438 ahc_unlock(ahc, &flags); 2509 ahc_unlock(ahc, &flags);
2439 } 2510 }
2440 2511
2441 static void ahc_linux_set_iu(struct scsi_targ 2512 static void ahc_linux_set_iu(struct scsi_target *starget, int iu)
2442 { 2513 {
2443 struct Scsi_Host *shost = dev_to_shos 2514 struct Scsi_Host *shost = dev_to_shost(starget->dev.parent);
2444 struct ahc_softc *ahc = *((struct ahc 2515 struct ahc_softc *ahc = *((struct ahc_softc **)shost->hostdata);
2445 struct ahc_tmode_tstate *tstate; 2516 struct ahc_tmode_tstate *tstate;
2446 struct ahc_initiator_tinfo *tinfo 2517 struct ahc_initiator_tinfo *tinfo
2447 = ahc_fetch_transinfo(ahc, 2518 = ahc_fetch_transinfo(ahc,
2448 starget 2519 starget->channel + 'A',
2449 shost-> 2520 shost->this_id, starget->id, &tstate);
2450 struct ahc_devinfo devinfo; 2521 struct ahc_devinfo devinfo;
2451 unsigned int ppr_options = tinfo->goa 2522 unsigned int ppr_options = tinfo->goal.ppr_options
2452 & ~MSG_EXT_PPR_IU_REQ; 2523 & ~MSG_EXT_PPR_IU_REQ;
2453 unsigned int period = tinfo->goal.per 2524 unsigned int period = tinfo->goal.period;
2454 unsigned long flags; 2525 unsigned long flags;
2455 struct ahc_syncrate *syncrate; 2526 struct ahc_syncrate *syncrate;
2456 2527
2457 if (iu) 2528 if (iu)
2458 ppr_options |= MSG_EXT_PPR_IU 2529 ppr_options |= MSG_EXT_PPR_IU_REQ;
2459 2530
2460 ahc_compile_devinfo(&devinfo, shost-> 2531 ahc_compile_devinfo(&devinfo, shost->this_id, starget->id, 0,
2461 starget->channel 2532 starget->channel + 'A', ROLE_INITIATOR);
2462 syncrate = ahc_find_syncrate(ahc, &pe 2533 syncrate = ahc_find_syncrate(ahc, &period, &ppr_options, AHC_SYNCRATE_DT);
2463 ahc_lock(ahc, &flags); 2534 ahc_lock(ahc, &flags);
2464 ahc_set_syncrate(ahc, &devinfo, syncr 2535 ahc_set_syncrate(ahc, &devinfo, syncrate, period, tinfo->goal.offset,
2465 ppr_options, AHC_TRA 2536 ppr_options, AHC_TRANS_GOAL, FALSE);
2466 ahc_unlock(ahc, &flags); 2537 ahc_unlock(ahc, &flags);
2467 } 2538 }
2468 #endif 2539 #endif
2469 2540
2470 static void ahc_linux_get_signalling(struct S 2541 static void ahc_linux_get_signalling(struct Scsi_Host *shost)
2471 { 2542 {
2472 struct ahc_softc *ahc = *(struct ahc_ 2543 struct ahc_softc *ahc = *(struct ahc_softc **)shost->hostdata;
2473 unsigned long flags; 2544 unsigned long flags;
2474 u8 mode; 2545 u8 mode;
2475 2546
2476 if (!(ahc->features & AHC_ULTRA2)) { 2547 if (!(ahc->features & AHC_ULTRA2)) {
2477 /* non-LVD chipset, may not h 2548 /* non-LVD chipset, may not have SBLKCTL reg */
2478 spi_signalling(shost) = 2549 spi_signalling(shost) =
2479 ahc->features & AHC_H 2550 ahc->features & AHC_HVD ?
2480 SPI_SIGNAL_HVD : 2551 SPI_SIGNAL_HVD :
2481 SPI_SIGNAL_SE; 2552 SPI_SIGNAL_SE;
2482 return; 2553 return;
2483 } 2554 }
2484 2555
2485 ahc_lock(ahc, &flags); 2556 ahc_lock(ahc, &flags);
2486 ahc_pause(ahc); 2557 ahc_pause(ahc);
2487 mode = ahc_inb(ahc, SBLKCTL); 2558 mode = ahc_inb(ahc, SBLKCTL);
2488 ahc_unpause(ahc); 2559 ahc_unpause(ahc);
2489 ahc_unlock(ahc, &flags); 2560 ahc_unlock(ahc, &flags);
2490 2561
2491 if (mode & ENAB40) 2562 if (mode & ENAB40)
2492 spi_signalling(shost) = SPI_S 2563 spi_signalling(shost) = SPI_SIGNAL_LVD;
2493 else if (mode & ENAB20) 2564 else if (mode & ENAB20)
2494 spi_signalling(shost) = SPI_S 2565 spi_signalling(shost) = SPI_SIGNAL_SE;
2495 else 2566 else
2496 spi_signalling(shost) = SPI_S 2567 spi_signalling(shost) = SPI_SIGNAL_UNKNOWN;
2497 } 2568 }
2498 2569
2499 static struct spi_function_template ahc_linux 2570 static struct spi_function_template ahc_linux_transport_functions = {
2500 .set_offset = ahc_linux_set_offse 2571 .set_offset = ahc_linux_set_offset,
2501 .show_offset = 1, 2572 .show_offset = 1,
2502 .set_period = ahc_linux_set_perio 2573 .set_period = ahc_linux_set_period,
2503 .show_period = 1, 2574 .show_period = 1,
2504 .set_width = ahc_linux_set_width 2575 .set_width = ahc_linux_set_width,
2505 .show_width = 1, 2576 .show_width = 1,
2506 .set_dt = ahc_linux_set_dt, 2577 .set_dt = ahc_linux_set_dt,
2507 .show_dt = 1, 2578 .show_dt = 1,
2508 #if 0 2579 #if 0
2509 .set_iu = ahc_linux_set_iu, 2580 .set_iu = ahc_linux_set_iu,
2510 .show_iu = 1, 2581 .show_iu = 1,
2511 .set_qas = ahc_linux_set_qas, 2582 .set_qas = ahc_linux_set_qas,
2512 .show_qas = 1, 2583 .show_qas = 1,
2513 #endif 2584 #endif
2514 .get_signalling = ahc_linux_get_signa 2585 .get_signalling = ahc_linux_get_signalling,
2515 }; 2586 };
2516 2587
2517 2588
2518 2589
2519 static int __init 2590 static int __init
2520 ahc_linux_init(void) 2591 ahc_linux_init(void)
2521 { 2592 {
2522 /* 2593 /*
2523 * If we've been passed any parameter 2594 * If we've been passed any parameters, process them now.
2524 */ 2595 */
2525 if (aic7xxx) 2596 if (aic7xxx)
2526 aic7xxx_setup(aic7xxx); 2597 aic7xxx_setup(aic7xxx);
2527 2598
2528 ahc_linux_transport_template = 2599 ahc_linux_transport_template =
2529 spi_attach_transport(&ahc_lin 2600 spi_attach_transport(&ahc_linux_transport_functions);
2530 if (!ahc_linux_transport_template) 2601 if (!ahc_linux_transport_template)
2531 return -ENODEV; 2602 return -ENODEV;
2532 2603
2533 scsi_transport_reserve_device(ahc_lin 2604 scsi_transport_reserve_device(ahc_linux_transport_template,
2534 sizeof( 2605 sizeof(struct ahc_linux_device));
2535 2606
2536 ahc_linux_pci_init(); 2607 ahc_linux_pci_init();
2537 ahc_linux_eisa_init(); 2608 ahc_linux_eisa_init();
2538 return 0; 2609 return 0;
2539 } 2610 }
2540 2611
2541 static void 2612 static void
2542 ahc_linux_exit(void) 2613 ahc_linux_exit(void)
2543 { 2614 {
2544 ahc_linux_pci_exit(); 2615 ahc_linux_pci_exit();
2545 ahc_linux_eisa_exit(); 2616 ahc_linux_eisa_exit();
2546 spi_release_transport(ahc_linux_trans 2617 spi_release_transport(ahc_linux_transport_template);
2547 } 2618 }
2548 2619
2549 module_init(ahc_linux_init); 2620 module_init(ahc_linux_init);
2550 module_exit(ahc_linux_exit); 2621 module_exit(ahc_linux_exit);
2551 2622
|
This page was automatically generated by the
LXR engine.
|