aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoman Zippel <zippel@linux-m68k.org>2006-06-23 05:04:57 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-23 10:43:01 -0400
commit882905c7ff81763a3aa3413629f7253b75587cb1 (patch)
tree1425504c208f6c06a8817e376b113ae6360b12ef
parent5fa28ea42f28342ca6efaa2d23789f3fec5adff6 (diff)
[PATCH] m68k: wd33c93: extra delay
The wd33c93 needs a small delay before a new command can be started. Signed-off-by: Roman Zippel <zippel@linux-m68k.org> Cc: James Bottomley <James.Bottomley@steeleye.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--drivers/scsi/wd33c93.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/scsi/wd33c93.c b/drivers/scsi/wd33c93.c
index 9341703dee00..27307fe5a4c8 100644
--- a/drivers/scsi/wd33c93.c
+++ b/drivers/scsi/wd33c93.c
@@ -939,6 +939,7 @@ wd33c93_intr(struct Scsi_Host *instance)
939 DB(DB_INTR, printk("%02x", cmd->SCp.Status)) 939 DB(DB_INTR, printk("%02x", cmd->SCp.Status))
940 if (hostdata->level2 >= L2_BASIC) { 940 if (hostdata->level2 >= L2_BASIC) {
941 sr = read_wd33c93(regs, WD_SCSI_STATUS); /* clear interrupt */ 941 sr = read_wd33c93(regs, WD_SCSI_STATUS); /* clear interrupt */
942 udelay(7);
942 hostdata->state = S_RUNNING_LEVEL2; 943 hostdata->state = S_RUNNING_LEVEL2;
943 write_wd33c93(regs, WD_COMMAND_PHASE, 0x50); 944 write_wd33c93(regs, WD_COMMAND_PHASE, 0x50);
944 write_wd33c93_cmd(regs, WD_CMD_SEL_ATN_XFER); 945 write_wd33c93_cmd(regs, WD_CMD_SEL_ATN_XFER);
@@ -955,6 +956,7 @@ wd33c93_intr(struct Scsi_Host *instance)
955 956
956 msg = read_1_byte(regs); 957 msg = read_1_byte(regs);
957 sr = read_wd33c93(regs, WD_SCSI_STATUS); /* clear interrupt */ 958 sr = read_wd33c93(regs, WD_SCSI_STATUS); /* clear interrupt */
959 udelay(7);
958 960
959 hostdata->incoming_msg[hostdata->incoming_ptr] = msg; 961 hostdata->incoming_msg[hostdata->incoming_ptr] = msg;
960 if (hostdata->incoming_msg[0] == EXTENDED_MESSAGE) 962 if (hostdata->incoming_msg[0] == EXTENDED_MESSAGE)
@@ -1358,6 +1360,7 @@ wd33c93_intr(struct Scsi_Host *instance)
1358 } else { 1360 } else {
1359 /* Verify this is a change to MSG_IN and read the message */ 1361 /* Verify this is a change to MSG_IN and read the message */
1360 sr = read_wd33c93(regs, WD_SCSI_STATUS); 1362 sr = read_wd33c93(regs, WD_SCSI_STATUS);
1363 udelay(7);
1361 if (sr == (CSR_ABORT | PHS_MESS_IN) || 1364 if (sr == (CSR_ABORT | PHS_MESS_IN) ||
1362 sr == (CSR_UNEXP | PHS_MESS_IN) || 1365 sr == (CSR_UNEXP | PHS_MESS_IN) ||
1363 sr == (CSR_SRV_REQ | PHS_MESS_IN)) { 1366 sr == (CSR_SRV_REQ | PHS_MESS_IN)) {
@@ -1374,6 +1377,7 @@ wd33c93_intr(struct Scsi_Host *instance)
1374 asr); 1377 asr);
1375 } 1378 }
1376 sr = read_wd33c93(regs, WD_SCSI_STATUS); 1379 sr = read_wd33c93(regs, WD_SCSI_STATUS);
1380 udelay(7);
1377 if (sr != CSR_MSGIN) 1381 if (sr != CSR_MSGIN)
1378 printk 1382 printk
1379 ("wd33c93: Not paused with ACK on RESEL (%02x)\n", 1383 ("wd33c93: Not paused with ACK on RESEL (%02x)\n",