Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-06 13:16:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[PATCH] m68k: wd33c93: extra delay

Browse Source 
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>
This commit is contained in:
Roman Zippel 2006-06-23 02:04:57 -07:00 committed by Linus Torvalds
parent 5fa28ea42f
commit 882905c7ff
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/scsi/wd33c93.c
View File

@ -939,6 +939,7 @@ wd33c93_intr(struct Scsi_Host *instance)
DB(DB_INTR, printk("%02x", cmd->SCp.Status)) DB(DB_INTR, printk("%02x", cmd->SCp.Status))
if (hostdata->level2 >= L2_BASIC) { if (hostdata->level2 >= L2_BASIC) {
sr = read_wd33c93(regs, WD_SCSI_STATUS); /* clear interrupt */ sr = read_wd33c93(regs, WD_SCSI_STATUS); /* clear interrupt */
udelay(7);
hostdata->state = S_RUNNING_LEVEL2; hostdata->state = S_RUNNING_LEVEL2;
write_wd33c93(regs, WD_COMMAND_PHASE, 0x50); write_wd33c93(regs, WD_COMMAND_PHASE, 0x50);
write_wd33c93_cmd(regs, WD_CMD_SEL_ATN_XFER); write_wd33c93_cmd(regs, WD_CMD_SEL_ATN_XFER);
@ -955,6 +956,7 @@ wd33c93_intr(struct Scsi_Host *instance)
msg = read_1_byte(regs); msg = read_1_byte(regs);
sr = read_wd33c93(regs, WD_SCSI_STATUS); /* clear interrupt */ sr = read_wd33c93(regs, WD_SCSI_STATUS); /* clear interrupt */
udelay(7);
hostdata->incoming_msg[hostdata->incoming_ptr] = msg; hostdata->incoming_msg[hostdata->incoming_ptr] = msg;
if (hostdata->incoming_msg[0] == EXTENDED_MESSAGE) if (hostdata->incoming_msg[0] == EXTENDED_MESSAGE)
@ -1358,6 +1360,7 @@ wd33c93_intr(struct Scsi_Host *instance)
} else { } else {
/* Verify this is a change to MSG_IN and read the message */ /* Verify this is a change to MSG_IN and read the message */
sr = read_wd33c93(regs, WD_SCSI_STATUS); sr = read_wd33c93(regs, WD_SCSI_STATUS);
udelay(7);
if (sr == (CSR_ABORT | PHS_MESS_IN) || if (sr == (CSR_ABORT | PHS_MESS_IN) ||
sr == (CSR_UNEXP | PHS_MESS_IN) || sr == (CSR_UNEXP | PHS_MESS_IN) ||
sr == (CSR_SRV_REQ | PHS_MESS_IN)) { sr == (CSR_SRV_REQ | PHS_MESS_IN)) {
@ -1374,6 +1377,7 @@ wd33c93_intr(struct Scsi_Host *instance)
asr); asr);
} }
sr = read_wd33c93(regs, WD_SCSI_STATUS); sr = read_wd33c93(regs, WD_SCSI_STATUS);
udelay(7);
if (sr != CSR_MSGIN) if (sr != CSR_MSGIN)
printk printk
("wd33c93: Not paused with ACK on RESEL (%02x)\n", ("wd33c93: Not paused with ACK on RESEL (%02x)\n",