Author: cts Date: Fri Feb 10 15:04:49 2006 New Revision: 5812 Added: dists/sid/linux-2.6/debian/patches/m68k-wd33c93.patch Modified: dists/sid/linux-2.6/debian/changelog dists/sid/linux-2.6/debian/patches/series/6-extra Log: fix wd33c93 driver
Modified: dists/sid/linux-2.6/debian/changelog ============================================================================== --- dists/sid/linux-2.6/debian/changelog (original) +++ dists/sid/linux-2.6/debian/changelog Fri Feb 10 15:04:49 2006 @@ -36,6 +36,7 @@ * [m68k] Add fix for m68k/buddha IDE and m68k/mac SCSI driver * [m68k] Patch by Peter Krummrich to stop flickering pixels with PicassoII * [m68k] make Amiga keyboard usable again, patch by Roman Zippel + * [m68k] prevent wd33c93 SCSI driver from crashing the kernel, patch by Roman Zippel -- Christian T. Steigies <[EMAIL PROTECTED]> Fri, 10 Feb 2006 12:31:55 +0100 Added: dists/sid/linux-2.6/debian/patches/m68k-wd33c93.patch ============================================================================== --- (empty file) +++ dists/sid/linux-2.6/debian/patches/m68k-wd33c93.patch Fri Feb 10 15:04:49 2006 @@ -0,0 +1,51 @@ +Log message: +The wd33c93 needs a small delay before a new command can be started. + +Modified files: + linux/drivers/scsi: + wd33c93.c + + +Index: linux/drivers/scsi/wd33c93.c +Stats: 4 insertions +http://linux-m68k-cvs.ubb.ca/c/cvsweb/linux/drivers/scsi/wd33c93%2ec.diff?r1=1.1.1.15&r2=1.10 +======================================================================== +--- linux/drivers/scsi/wd33c93.c 14 Jan 2006 23:13:17 -0000 1.1.1.15 ++++ linux/drivers/scsi/wd33c93.c 28 Jan 2006 21:28:05 -0000 1.10 +@@ -939,6 +939,7 @@ + DB(DB_INTR, printk("%02x", cmd->SCp.Status)) + if (hostdata->level2 >= L2_BASIC) { + sr = read_wd33c93(regs, WD_SCSI_STATUS); /* clear interrupt */ ++ udelay(7); + hostdata->state = S_RUNNING_LEVEL2; + write_wd33c93(regs, WD_COMMAND_PHASE, 0x50); + write_wd33c93_cmd(regs, WD_CMD_SEL_ATN_XFER); +@@ -955,6 +956,7 @@ + + msg = read_1_byte(regs); + sr = read_wd33c93(regs, WD_SCSI_STATUS); /* clear interrupt */ ++ udelay(7); + + hostdata->incoming_msg[hostdata->incoming_ptr] = msg; + if (hostdata->incoming_msg[0] == EXTENDED_MESSAGE) +@@ -1358,6 +1360,7 @@ + } else { + /* Verify this is a change to MSG_IN and read the message */ + sr = read_wd33c93(regs, WD_SCSI_STATUS); ++ udelay(7); + if (sr == (CSR_ABORT | PHS_MESS_IN) || + sr == (CSR_UNEXP | PHS_MESS_IN) || + sr == (CSR_SRV_REQ | PHS_MESS_IN)) { +@@ -1374,6 +1377,7 @@ + asr); + } + sr = read_wd33c93(regs, WD_SCSI_STATUS); ++ udelay(7); + if (sr != CSR_MSGIN) + printk + ("wd33c93: Not paused with ACK on RESEL (%02x)\n", +- +To unsubscribe from this list: send the line "unsubscribe linux-m68k-cvscommit" in +the body of a message to [EMAIL PROTECTED] +More majordomo info at http://vger.kernel.org/majordomo-info.html + Modified: dists/sid/linux-2.6/debian/patches/series/6-extra ============================================================================== --- dists/sid/linux-2.6/debian/patches/series/6-extra (original) +++ dists/sid/linux-2.6/debian/patches/series/6-extra Fri Feb 10 15:04:49 2006 @@ -2,3 +2,4 @@ + m68k-mac68k_cvs_via_cleanup_and_fix2.patch m68k + m68k-cirrusfb.patch m68k + m68k-amikbd.patch m68k ++ m68k-wd33c93.patch m68k _______________________________________________ Kernel-svn-changes mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
