Date: Sat, 12 Jul 1997 02:41:08 -0700 From: jshiffle@netcom.com (John Shifflett) To: linux-m68k@phil.uni-sb.de Subject: L68K: patch for 2.1.42 wd33c93 SCSI driver Sender: owner-linux-m68k@phil.uni-sb.de Reply-To: linux-m68k@phil.uni-sb.de Hi everyone. The following patch fixes several bugs in the Amiga wd33c93 SCSI driver. One was fairly serious - commands sent to LUN's greater than 0 returned bad status bytes. With this fixed, CDROM changers now work fine! If you have one of these devices, this patch will cause all LUN's to be detected and usable. There was also a small bug involving command-line parameters passed via 'insmod', as well as other miscellaneous cleanups and improvements. The new driver is now exactly the same code for both 2.0.xx and 2.1.xx kernel source trees. As you know, Jes likes to have people test out new patches before he incorporates them into a new release, so please give this a try and post a short message here if it seems OK. Thanks. John Shifflett jshiffle@netcom.com (patch relative to 2.1.42) --- wd33c93.c Fri Jul 11 20:03:32 1997 +++ linux/drivers/scsi/wd33c93.c Fri Jul 11 15:13:06 1997 @@ -87,8 +87,9 @@ #include "hosts.h" -#define WD33C93_VERSION "1.24" -#define WD33C93_DATE "29/Jan/1997" +#define WD33C93_VERSION "1.25" +#define WD33C93_DATE "09/Jul/1997" +/* NOTE: 1.25 for m68k is related to in2000-1.31 for x86 */ /* * Note - the following defines have been moved to 'wd33c93.h': @@ -107,11 +108,14 @@ /* - * setup_strings is an array of strings that define some of the operating - * parameters and settings for this driver. It is used unless an amiboot - * or insmod command line has been specified, in which case those settings - * are combined with the ones here. The driver recognizes the following - * keywords (lower case required) and arguments: + * 'setup_strings' is a single string used to pass operating parameters and + * settings from the kernel/module command-line to the driver. 'setup_args[]' + * is an array of strings that define the compile-time default values for + * these settings. If Linux boots with an amiboot or insmod command-line, + * those settings are combined with 'setup_args[]'. Note that amiboot + * command-lines are prefixed with "wd33c93=" while insmod uses a + * "setup_strings=" prefix. The driver recognizes the following keywords + * (lower case required) and arguments: * * - nosync:bitmask -bitmask is a byte where the 1st 7 bits correspond with * the 7 possible SCSI devices. Set a bit to negotiate for @@ -139,13 +143,11 @@ * _must_ be a colon between a keyword and its numeric argument, with no * spaces. * - Keywords are separated by commas, no spaces, in the standard kernel - * command-line manner, except in the case of 'setup_strings[]' (see - * below), which is simply a C array of pointers to char. Each element - * in the array is a string comprising one keyword & argument. + * command-line manner. * - A keyword in the 'nth' comma-separated command-line member will overwrite - * the 'nth' element of setup_strings[]. A blank command-line member (in + * the 'nth' element of setup_args[]. A blank command-line member (in * other words, a comma with no preceding keyword) will _not_ overwrite - * the corresponding setup_strings[] element. + * the corresponding setup_args[] element. * - If a keyword is used more than once, the first one applies to the first * SCSI host found, the second to the second card, etc, unless the 'next' * keyword is used to change the order. @@ -158,8 +160,16 @@ * - wd33c93=debug:0x1c */ -static char *setup_strings[] = - {"","","","","","","","","","","",""}; +/* Normally, no defaults are specified */ +static char *setup_args[] = + {"","","","","","","","",""}; + +/* filled in by 'insmod' */ +static char *setup_strings = 0; + +#ifdef MODULE_PARM +MODULE_PARM(setup_strings, "s"); +#endif @@ -337,9 +347,24 @@ cmd->SCp.this_residual = cmd->request_bufflen; } -/* Preset the command status to GOOD, since that's the normal case */ +/* WD docs state that at the conclusion of a "LEVEL2" command, the + * status byte can be retrieved from the LUN register. Apparently, + * this is the case only for *uninterrupted* LEVEL2 commands! If + * there are any unexpected phases entered, even if they are 100% + * legal (different devices may choose to do things differently), + * the LEVEL2 command sequence is exited. This often occurs prior + * to receiving the status byte, in which case the driver does a + * status phase interrupt and gets the status byte on its own. + * While such a command can then be "resumed" (ie restarted to + * finish up as a LEVEL2 command), the LUN register will NOT be + * a valid status byte at the command's conclusion, and we must + * use the byte obtained during the earlier interrupt. Here, we + * preset SCp.Status to an illegal value (0xff) so that when + * this command finally completes, we can tell where the actual + * status byte is stored. + */ - cmd->SCp.Status = GOOD; + cmd->SCp.Status = ILLEGAL_STATUS_BYTE; /* * Add the cmd to the end of 'input_Q'. Note that REQUEST SENSE @@ -701,7 +726,8 @@ write_wd33c93(regp, WD_CONTROL, CTRL_IDI | CTRL_EDI | CTRL_DMA); write_wd33c93_count(regp,cmd->SCp.this_residual); - if ((hostdata->level2 >= L2_DATA) || (cmd->SCp.phase == 0)) { + if ((hostdata->level2 >= L2_DATA) || + (hostdata->level2 == L2_BASIC && cmd->SCp.phase == 0)) { write_wd33c93(regp, WD_COMMAND_PHASE, 0x45); write_wd33c93_cmd(regp, WD_CMD_SEL_ATN_XFER); hostdata->state = S_RUNNING_LEVEL2; @@ -786,17 +812,17 @@ hostdata->state = S_UNCONNECTED; cmd->scsi_done(cmd); - /* From esp.c: - * There is a window of time within the scsi_done() path - * of execution where interrupts are turned back on full - * blast and left that way. During that time we could - * reconnect to a disconnected command, then we'd bomb - * out below. We could also end up executing two commands - * at _once_. ...just so you know why the restore_flags() - * is here... - */ + /* From esp.c: + * There is a window of time within the scsi_done() path + * of execution where interrupts are turned back on full + * blast and left that way. During that time we could + * reconnect to a disconnected command, then we'd bomb + * out below. We could also end up executing two commands + * at _once_. ...just so you know why the restore_flags() + * is here... + */ - restore_flags(flags); + restore_flags(flags); /* We are not connected to a target - check to see if there * are commands waiting to be executed. @@ -887,9 +913,10 @@ case CSR_XFER_DONE|PHS_STATUS: case CSR_UNEXP |PHS_STATUS: case CSR_SRV_REQ |PHS_STATUS: -DB(DB_INTR,printk("STATUS")) +DB(DB_INTR,printk("STATUS=")) cmd->SCp.Status = read_1_byte(regp); +DB(DB_INTR,printk("%02x",cmd->SCp.Status)) if (hostdata->level2 >= L2_BASIC) { sr = read_wd33c93(regp, WD_SCSI_STATUS); /* clear interrupt */ hostdata->state = S_RUNNING_LEVEL2; @@ -897,7 +924,6 @@ write_wd33c93_cmd(regp, WD_CMD_SEL_ATN_XFER); } else { -DB(DB_INTR,printk("=%02x",cmd->SCp.Status)) hostdata->state = S_CONNECTED; } break; @@ -1067,21 +1093,22 @@ DB(DB_INTR,printk("SX-DONE-%ld",cmd->pid)) cmd->SCp.Message = COMMAND_COMPLETE; lun = read_wd33c93(regp, WD_TARGET_LUN); - if (cmd->SCp.Status == GOOD) - cmd->SCp.Status = lun; +DB(DB_INTR,printk(":%d.%d",cmd->SCp.Status,lun)) hostdata->connected = NULL; - if (cmd->cmnd[0] != REQUEST_SENSE) - cmd->result = cmd->SCp.Status | (cmd->SCp.Message << 8); - else if (cmd->SCp.Status != GOOD) - cmd->result = (cmd->result & 0x00ffff) | (DID_ERROR << 16); hostdata->busy[cmd->target] &= ~(1 << cmd->lun); hostdata->state = S_UNCONNECTED; + if (cmd->SCp.Status == ILLEGAL_STATUS_BYTE) + cmd->SCp.Status = lun; + if (cmd->cmnd[0] == REQUEST_SENSE && cmd->SCp.Status != GOOD) + cmd->result = (cmd->result & 0x00ffff) | (DID_ERROR << 16); + else + cmd->result = cmd->SCp.Status | (cmd->SCp.Message << 8); cmd->scsi_done(cmd); /* We are no longer connected to a target - check to see if * there are commands waiting to be executed. */ - restore_flags(flags); + restore_flags(flags); wd33c93_execute(instance); } else { @@ -1154,17 +1181,17 @@ hostdata->connected = NULL; hostdata->busy[cmd->target] &= ~(1 << cmd->lun); hostdata->state = S_UNCONNECTED; - if (cmd->cmnd[0] != REQUEST_SENSE) - cmd->result = cmd->SCp.Status | (cmd->SCp.Message << 8); - else if (cmd->SCp.Status != GOOD) + if (cmd->cmnd[0] == REQUEST_SENSE && cmd->SCp.Status != GOOD) cmd->result = (cmd->result & 0x00ffff) | (DID_ERROR << 16); + else + cmd->result = cmd->SCp.Status | (cmd->SCp.Message << 8); cmd->scsi_done(cmd); /* We are no longer connected to a target - check to see if * there are commands waiting to be executed. */ - /* look above for comments on scsi_done() */ - restore_flags(flags); + /* look above for comments on scsi_done() */ + restore_flags(flags); wd33c93_execute(instance); break; @@ -1186,12 +1213,13 @@ hostdata->connected = NULL; hostdata->busy[cmd->target] &= ~(1 << cmd->lun); hostdata->state = S_UNCONNECTED; - if (cmd->cmnd[0] != REQUEST_SENSE) - cmd->result = cmd->SCp.Status | (cmd->SCp.Message << 8); - else if (cmd->SCp.Status != GOOD) +DB(DB_INTR,printk(":%d",cmd->SCp.Status)) + if (cmd->cmnd[0] == REQUEST_SENSE && cmd->SCp.Status != GOOD) cmd->result = (cmd->result & 0x00ffff) | (DID_ERROR << 16); + else + cmd->result = cmd->SCp.Status | (cmd->SCp.Message << 8); cmd->scsi_done(cmd); - restore_flags(flags); + restore_flags(flags); break; case S_PRE_TMP_DISC: case S_RUNNING_LEVEL2: @@ -1433,7 +1461,7 @@ cmd->result = DID_ABORT << 16; printk("scsi%d: Abort - removing command %ld from input_Q. ", instance->host_no, cmd->pid); - enable_irq(cmd->host->irq); + enable_irq(cmd->host->irq); cmd->scsi_done(cmd); return SCSI_ABORT_SUCCESS; } @@ -1523,7 +1551,7 @@ printk("scsi%d: Abort - command %ld found on disconnected_Q - ", instance->host_no, cmd->pid); printk("returning ABORT_SNOOZE. "); - enable_irq(cmd->host->irq); + enable_irq(cmd->host->irq); return SCSI_ABORT_SNOOZE; } tmp = (Scsi_Cmnd *)tmp->host_scribble; @@ -1551,10 +1579,11 @@ #define MAX_WD33C93_HOSTS 4 -#define MAX_SETUP_STRINGS (sizeof(setup_strings) / sizeof(char *)) +#define MAX_SETUP_ARGS (sizeof(setup_args) / sizeof(char *)) #define SETUP_BUFFER_SIZE 200 static char setup_buffer[SETUP_BUFFER_SIZE]; -static char setup_used[MAX_SETUP_STRINGS]; +static char setup_used[MAX_SETUP_ARGS]; +static int done_setup = 0; void wd33c93_setup (char *str, int *ints) { @@ -1583,45 +1612,46 @@ setup_buffer[SETUP_BUFFER_SIZE - 1] = '\0'; p1 = setup_buffer; i = 0; - while (*p1 && (i < MAX_SETUP_STRINGS)) { + while (*p1 && (i < MAX_SETUP_ARGS)) { p2 = strchr(p1, ','); if (p2) { *p2 = '\0'; if (p1 != p2) - setup_strings[i] = p1; + setup_args[i] = p1; p1 = p2 + 1; i++; } else { - setup_strings[i] = p1; + setup_args[i] = p1; break; } } - for (i=0; ihostdata; hostdata->regp = regs; @@ -1688,26 +1721,29 @@ #endif - if (check_setup_strings("nosync",&flags,&val,buf)) + if (check_setup_args("nosync",&flags,&val,buf)) hostdata->no_sync = val; - if (check_setup_strings("nodma",&flags,&val,buf)) + if (check_setup_args("nodma",&flags,&val,buf)) hostdata->no_dma = (val == -1) ? 1 : val; - if (check_setup_strings("period",&flags,&val,buf)) + if (check_setup_args("period",&flags,&val,buf)) hostdata->default_sx_per = sx_table[round_period((unsigned int)val)].period_ns; - if (check_setup_strings("disconnect",&flags,&val,buf)) { + if (check_setup_args("disconnect",&flags,&val,buf)) { if ((val >= DIS_NEVER) && (val <= DIS_ALWAYS)) hostdata->disconnect = val; else hostdata->disconnect = DIS_ADAPTIVE; } - if (check_setup_strings("debug",&flags,&val,buf)) + if (check_setup_args("level2",&flags,&val,buf)) + hostdata->level2 = val; + + if (check_setup_args("debug",&flags,&val,buf)) hostdata->args = val & DB_MASK; - if (check_setup_strings("clock",&flags,&val,buf)) { + if (check_setup_args("clock",&flags,&val,buf)) { if (val>7 && val<11) val = WD33C93_FS_8_10; else if (val>11 && val<16) @@ -1719,13 +1755,13 @@ hostdata->clock_freq = val; } - if ((i = check_setup_strings("next",&flags,&val,buf))) { + if ((i = check_setup_args("next",&flags,&val,buf))) { while (i) setup_used[--i] = 1; } #ifdef PROC_INTERFACE - if (check_setup_strings("proc",&flags,&val,buf)) + if (check_setup_args("proc",&flags,&val,buf)) hostdata->proc = val; #endif @@ -1744,9 +1780,9 @@ #else printk(" debugging=OFF\n"); #endif - printk(" setup_strings="); - for (i=0; ino_dma = simple_strtoul(bp,NULL,0); } + else if (!strncmp(bp,"level2:",7)) { + bp += 7; + hd->level2 = simple_strtoul(bp,NULL,0); + } return len; } @@ -1838,32 +1878,32 @@ sprintf(tbuf,"\nclock_freq=%02x no_sync=%02x no_dma=%d", hd->clock_freq,hd->no_sync,hd->no_dma); strcat(bp,tbuf); - strcat(bp,"\nsync_xfer[] ="); - for (x=0; x<8; x++) { - sprintf(tbuf," %02x",hd->sync_xfer[x]); + strcat(bp,"\nsync_xfer[] = "); + for (x=0; x<7; x++) { + sprintf(tbuf,"\t%02x",hd->sync_xfer[x]); strcat(bp,tbuf); } - strcat(bp,"\nsync_stat[] ="); - for (x=0; x<8; x++) { - sprintf(tbuf," %02x",hd->sync_stat[x]); + strcat(bp,"\nsync_stat[] = "); + for (x=0; x<7; x++) { + sprintf(tbuf,"\t%02x",hd->sync_stat[x]); strcat(bp,tbuf); } } #ifdef PROC_STATISTICS if (hd->proc & PR_STATISTICS) { strcat(bp,"\ncommands issued: "); - for (x=0; x<8; x++) { - sprintf(tbuf," %ld",hd->cmd_cnt[x]); + for (x=0; x<7; x++) { + sprintf(tbuf,"\t%ld",hd->cmd_cnt[x]); strcat(bp,tbuf); } strcat(bp,"\ndisconnects allowed:"); - for (x=0; x<8; x++) { - sprintf(tbuf," %ld",hd->disc_allowed_cnt[x]); + for (x=0; x<7; x++) { + sprintf(tbuf,"\t%ld",hd->disc_allowed_cnt[x]); strcat(bp,tbuf); } strcat(bp,"\ndisconnects done: "); - for (x=0; x<8; x++) { - sprintf(tbuf," %ld",hd->disc_done_cnt[x]); + for (x=0; x<7; x++) { + sprintf(tbuf,"\t%ld",hd->disc_done_cnt[x]); strcat(bp,tbuf); } sprintf(tbuf,"\ninterrupts: %ld, DATA_PHASE ints: %ld DMA, %ld PIO", --- wd33c93.h Fri Jul 11 20:03:32 1997 +++ linux/drivers/scsi/wd33c93.h Fri Jul 11 14:04:28 1997 @@ -2,7 +2,7 @@ * wd33c93.h - Linux device driver definitions for the * Commodore Amiga A2091/590 SCSI controller card * - * IMPORTANT: This file is for version 1.24 - 29/Jan/1997 + * IMPORTANT: This file is for version 1.25 - 09/Jul/1997 * * Copyright (c) 1996 John Shifflett, GeoLog Consulting * john@geolog.com @@ -198,6 +198,8 @@ typedef void (*dma_stop_t) (struct Scsi_Host *instance, Scsi_Cmnd *SCpnt, int status); + +#define ILLEGAL_STATUS_BYTE 0xff #define DEFAULT_SX_PER 376 /* (ns) fairly safe */ #define DEFAULT_SX_OFF 0 /* aka async */