patch-2.0.36 linux/drivers/scsi/wd7000.c
Next file: linux/drivers/scsi/wd7000.h
Previous file: linux/drivers/scsi/u14-34f.h
Back to the patch index
Back to the overall index
- Lines: 1555
- Date:
Sun Nov 15 10:33:10 1998
- Orig file:
v2.0.35/linux/drivers/scsi/wd7000.c
- Orig date:
Sun Nov 15 10:49:45 1998
diff -u --recursive --new-file v2.0.35/linux/drivers/scsi/wd7000.c linux/drivers/scsi/wd7000.c
@@ -102,44 +102,56 @@
*
* Revisions by Miroslav Zagorac <zaga@fly.cc.fer.hr>
*
- * 08/24/1996.
+ * -- 08/24/1996. --------------------------------------------------------------
+ * Enhancement for wd7000_detect function has been made, so you don't have
+ * to enter BIOS ROM address in initialisation data (see struct Config).
+ * We cannot detect IRQ, DMA and I/O base address for now, so we have to
+ * enter them as arguments while wd_7000 is detected. If someone has IRQ,
+ * DMA or an I/O base address set to some other value, he can enter them in
+ * a configuration without any problem.
+ * Also I wrote a function wd7000_setup, so now you can enter WD-7000
+ * definition as kernel arguments, as in lilo.conf:
+ *
+ * append="wd7000=IRQ,DMA,IO"
+ *
+ * PS: If card BIOS ROM is disabled, function wd7000_detect now will recognize
+ * adapter, unlike the old one. Anyway, BIOS ROM from WD7000 adapter is
+ * useless for Linux. B^)
+ *
+ * -- 09/06/1996. --------------------------------------------------------------
+ * Auto detecting of an I/O base address from wd7000_detect function is
+ * removed, some little bugs too...
+ *
+ * Thanks to Roger Scott for driver debugging.
+ *
+ * -- 06/07/1997. --------------------------------------------------------------
+ * Added support for /proc file system (/proc/scsi/wd7000/[0...] files).
+ * Now, the driver can handle hard disks with capacity >1GB.
+ *
+ * -- 01/15/1998. --------------------------------------------------------------
+ * Added support for BUS_ON and BUS_OFF parameters in config line.
+ * Miscellaneous cleanups. Syntax of the append line is changed to:
+ *
+ * append="wd7000=IRQ,DMA,IO[,BUS_ON[,BUS_OFF]]"
+ *
+ * , where BUS_ON and BUS_OFF are time in nanoseconds.
+ *
+ * -- 03/01/1998. --------------------------------------------------------------
+ * The WD7000 driver now works on kernels' >= 2.1.x
+ *
+ * -- 06/11/1998. --------------------------------------------------------------
+ * Ugly init_scbs, alloc_scbs and free_scb functions are changed with
+ * scbs_init, scb_alloc and scb_free. Now, source code is identical on
+ * 2.0.xx and 2.1.xx kernels.
+ * WD7000 specific definitions are moved from this file to wd7000.h.
*
- * Enhancement for wd7000_detect function has been made, so you don't have
- * to enter BIOS ROM adress in initialisation data (see struct Config).
- * We cannot detect IRQ, DMA and I/O base address for now, so we have to
- * enter them as arguments while wd_7000 is detected. If someone has IRQ,
- * DMA or I/O base address set to some other value, he can enter them in
- * configuration without any problem. Also I wrote a function wd7000_setup,
- * so now you can enter WD-7000 definition as kernel arguments,
- * as in lilo.conf:
- *
- * append="wd7000=IRQ,DMA,IO"
- *
- * PS: If card BIOS ROM is disabled, function wd7000_detect now will recognize
- * adapter, unlike the old one. Anyway, BIOS ROM from WD7000 adapter is
- * useless for Linux. B^)
- *
- *
- * 09/06/1996.
- *
- * Autodetecting of I/O base address from wd7000_detect function is removed,
- * some little bugs removed, etc...
- *
- * Thanks to Roger Scott for driver debugging.
- *
- * 06/07/1997
- *
- * Added support for /proc file system (/proc/scsi/wd7000/[0...] files).
- * Now, driver can handle hard disks with capacity >1GB.
- *
- * 01/15/1998
- *
- * Added support for BUS_ON and BUS_OFF parameters in config line.
- * Miscellaneous cleanup.
*/
-
#ifdef MODULE
-#include <linux/module.h>
+# include <linux/module.h>
+#endif
+
+#if (LINUX_VERSION_CODE >= 0x020100)
+# include <asm/spinlock.h>
#endif
#include <stdarg.h>
@@ -155,16 +167,17 @@
#include <linux/ioport.h>
#include <linux/proc_fs.h>
#include <linux/blk.h>
+#include <linux/version.h>
+#include <linux/stat.h>
#include "scsi.h"
#include "hosts.h"
#include "sd.h"
#include <scsi/scsicam.h>
-#define ANY2SCSI_INLINE /* undef this to use old macros */
-#undef WD7000_DEBUG /* general debug */
+#undef WD7000_DEBUG /* general debug */
+#define WD7000_DEFINES /* This must be defined! */
#include "wd7000.h"
-#include <linux/stat.h>
struct proc_dir_entry proc_scsi_wd7000 =
@@ -176,86 +189,28 @@
2
};
-
-/*
- * Mailbox structure sizes.
- * I prefer to keep the number of ICMBs much larger than the number of
- * OGMBs. OGMBs are used very quickly by the driver to start one or
- * more commands, while ICMBs are used by the host adapter per command.
- */
-#define OGMB_CNT 16
-#define ICMB_CNT 32
-
-/*
- * Scb's are shared by all active adapters. So, if they all become busy,
- * callers may be made to wait in alloc_scbs for them to free. That can
- * be avoided by setting MAX_SCBS to NUM_CONFIG * WD7000_Q. If you'd
- * rather conserve memory, use a smaller number (> 0, of course) - things
- * will should still work OK.
- */
-#define MAX_SCBS 32
-
-/*
- * WD7000-specific mailbox structure
- *
- */
-typedef volatile struct mailbox {
- unchar status;
- unchar scbptr[3]; /* SCSI-style - MSB first (big endian) */
-} Mailbox;
-
-/*
- * This structure should contain all per-adapter global data. I.e., any
- * new global per-adapter data should put in here.
- */
-typedef struct adapter {
- struct Scsi_Host *sh; /* Pointer to Scsi_Host structure */
- int iobase; /* This adapter's I/O base address */
- int irq; /* This adapter's IRQ level */
- int dma; /* This adapter's DMA channel */
- int int_counter; /* This adapter's interrupt counter */
- int bus_on; /* This adapter's BUS_ON time */
- int bus_off; /* This adapter's BUS_OFF time */
- struct { /* This adapter's mailboxes */
- Mailbox ogmb[OGMB_CNT]; /* Outgoing mailboxes */
- Mailbox icmb[ICMB_CNT]; /* Incoming mailboxes */
- } mb;
- int next_ogmb; /* to reduce contention at mailboxes */
- unchar control; /* shadows CONTROL port value */
- unchar rev1, rev2; /* filled in by wd7000_revision */
-} Adapter;
-
/*
* (linear) base address for ROM BIOS
*/
-static const long wd7000_biosaddr[] =
-{
+static const long wd7000_biosaddr[] = {
0xc0000, 0xc2000, 0xc4000, 0xc6000, 0xc8000, 0xca000, 0xcc000, 0xce000,
0xd0000, 0xd2000, 0xd4000, 0xd6000, 0xd8000, 0xda000, 0xdc000, 0xde000
};
-#define NUM_ADDRS (sizeof(wd7000_biosaddr)/sizeof(long))
+#define NUM_ADDRS (sizeof (wd7000_biosaddr) / sizeof (long))
-static const unsigned short wd7000_iobase[] =
-{
+static const ushort wd7000_iobase[] = {
0x0300, 0x0308, 0x0310, 0x0318, 0x0320, 0x0328, 0x0330, 0x0338,
0x0340, 0x0348, 0x0350, 0x0358, 0x0360, 0x0368, 0x0370, 0x0378,
0x0380, 0x0388, 0x0390, 0x0398, 0x03a0, 0x03a8, 0x03b0, 0x03b8,
0x03c0, 0x03c8, 0x03d0, 0x03d8, 0x03e0, 0x03e8, 0x03f0, 0x03f8
};
-#define NUM_IOPORTS (sizeof(wd7000_iobase)/sizeof(unsigned short))
+#define NUM_IOPORTS (sizeof (wd7000_iobase) / sizeof (ushort))
static const short wd7000_irq[] = { 3, 4, 5, 7, 9, 10, 11, 12, 14, 15 };
-#define NUM_IRQS (sizeof(wd7000_irq)/sizeof(short))
+#define NUM_IRQS (sizeof (wd7000_irq) / sizeof (short))
static const short wd7000_dma[] = { 5, 6, 7 };
-#define NUM_DMAS (sizeof(wd7000_dma)/sizeof(short))
-
-/*
- * possible irq range
- */
-#define IRQ_MIN 3
-#define IRQ_MAX 15
-#define IRQS (IRQ_MAX - IRQ_MIN + 1)
+#define NUM_DMAS (sizeof (wd7000_dma) / sizeof (short))
/*
* The following is set up by wd7000_detect, and used thereafter by
@@ -265,23 +220,6 @@
*/
static struct Scsi_Host *wd7000_host[IRQS];
-#define BUS_ON 64 /* x 125ns = 8000ns (BIOS default) */
-#define BUS_OFF 15 /* x 125ns = 1875ns (BIOS default) */
-
-/*
- * Standard Adapter Configurations - used by wd7000_detect
- */
-typedef struct {
- short irq; /* IRQ level */
- short dma; /* DMA channel */
- unsigned iobase; /* I/O base address */
- short bus_on; /* Time that WD7000 spends on the AT-bus when */
- /* transferring data. BIOS default is 8000ns. */
- short bus_off; /* Time that WD7000 spends OFF THE BUS after */
- /* while it is transferring data. */
- /* BIOS default is 1875ns */
-} Config;
-
/*
* Add here your configuration...
*/
@@ -294,276 +232,12 @@
};
#define NUM_CONFIGS (sizeof(configs)/sizeof(Config))
-/*
- * The following list defines strings to look for in the BIOS that identify
- * it as the WD7000-FASST2 SST BIOS. I suspect that something should be
- * added for the Future Domain version.
- */
-typedef struct signature {
- const void *sig; /* String to look for */
- unsigned ofs; /* offset from BIOS base address */
- unsigned len; /* length of string */
-} Signature;
-
static const Signature signatures[] =
{
{"SSTBIOS", 0x0000d, 7} /* "SSTBIOS" @ offset 0x0000d */
};
#define NUM_SIGNATURES (sizeof(signatures)/sizeof(Signature))
-
-/*
- * I/O Port Offsets and Bit Definitions
- * 4 addresses are used. Those not defined here are reserved.
- */
-#define ASC_STAT 0 /* Status, Read */
-#define ASC_COMMAND 0 /* Command, Write */
-#define ASC_INTR_STAT 1 /* Interrupt Status, Read */
-#define ASC_INTR_ACK 1 /* Acknowledge, Write */
-#define ASC_CONTROL 2 /* Control, Write */
-
-/*
- * ASC Status Port
- */
-#define INT_IM 0x80 /* Interrupt Image Flag */
-#define CMD_RDY 0x40 /* Command Port Ready */
-#define CMD_REJ 0x20 /* Command Port Byte Rejected */
-#define ASC_INIT 0x10 /* ASC Initialized Flag */
-#define ASC_STATMASK 0xf0 /* The lower 4 Bytes are reserved */
-
-/*
- * COMMAND opcodes
- *
- * Unfortunately, I have no idea how to properly use some of these commands,
- * as the OEM manual does not make it clear. I have not been able to use
- * enable/disable unsolicited interrupts or the reset commands with any
- * discernible effect whatsoever. I think they may be related to certain
- * ICB commands, but again, the OEM manual doesn't make that clear.
- */
-#define NO_OP 0 /* NO-OP toggles CMD_RDY bit in ASC_STAT */
-#define INITIALIZATION 1 /* initialization (10 bytes) */
-#define DISABLE_UNS_INTR 2 /* disable unsolicited interrupts */
-#define ENABLE_UNS_INTR 3 /* enable unsolicited interrupts */
-#define INTR_ON_FREE_OGMB 4 /* interrupt on free OGMB */
-#define SOFT_RESET 5 /* SCSI bus soft reset */
-#define HARD_RESET_ACK 6 /* SCSI bus hard reset acknowledge */
-#define START_OGMB 0x80 /* start command in OGMB (n) */
-#define SCAN_OGMBS 0xc0 /* start multiple commands, signature (n) */
- /* where (n) = lower 6 bits */
-/*
- * For INITIALIZATION:
- */
-typedef struct initCmd {
- unchar op; /* command opcode (= 1) */
- unchar ID; /* Adapter's SCSI ID */
- unchar bus_on; /* Bus on time, x 125ns (see below) */
- unchar bus_off; /* Bus off time, "" "" */
- unchar rsvd; /* Reserved */
- unchar mailboxes[3]; /* Address of Mailboxes, MSB first */
- unchar ogmbs; /* Number of outgoing MBs, max 64, 0,1 = 1 */
- unchar icmbs; /* Number of incoming MBs, "" "" */
-} InitCmd;
-
-/*
- * Interrupt Status Port - also returns diagnostic codes at ASC reset
- *
- * if msb is zero, the lower bits are diagnostic status
- * Diagnostics:
- * 01 No diagnostic error occurred
- * 02 RAM failure
- * 03 FIFO R/W failed
- * 04 SBIC register read/write failed
- * 05 Initialization D-FF failed
- * 06 Host IRQ D-FF failed
- * 07 ROM checksum error
- * Interrupt status (bitwise):
- * 10NNNNNN outgoing mailbox NNNNNN is free
- * 11NNNNNN incoming mailbox NNNNNN needs service
- */
-#define MB_INTR 0xC0 /* Mailbox Service possible/required */
-#define IMB_INTR 0x40 /* 1 Incoming / 0 Outgoing */
-#define MB_MASK 0x3f /* mask for mailbox number */
-
-/*
- * CONTROL port bits
- */
-#define INT_EN 0x08 /* Interrupt Enable */
-#define DMA_EN 0x04 /* DMA Enable */
-#define SCSI_RES 0x02 /* SCSI Reset */
-#define ASC_RES 0x01 /* ASC Reset */
-
-/*
- * Driver data structures:
- * - mb and scbs are required for interfacing with the host adapter.
- * An SCB has extra fields not visible to the adapter; mb's
- * _cannot_ do this, since the adapter assumes they are contiguous in
- * memory, 4 bytes each, with ICMBs following OGMBs, and uses this fact
- * to access them.
- * - An icb is for host-only (non-SCSI) commands. ICBs are 16 bytes each;
- * the additional bytes are used only by the driver.
- * - For now, a pool of SCBs are kept in global storage by this driver,
- * and are allocated and freed as needed.
- *
- * The 7000-FASST2 marks OGMBs empty as soon as it has _started_ a command,
- * not when it has finished. Since the SCB must be around for completion,
- * problems arise when SCBs correspond to OGMBs, which may be reallocated
- * earlier (or delayed unnecessarily until a command completes).
- * Mailboxes are used as transient data structures, simply for
- * carrying SCB addresses to/from the 7000-FASST2.
- *
- * Note also since SCBs are not "permanently" associated with mailboxes,
- * there is no need to keep a global list of Scsi_Cmnd pointers indexed
- * by OGMB. Again, SCBs reference their Scsi_Cmnds directly, so mailbox
- * indices need not be involved.
- */
-
-/*
- * WD7000-specific scatter/gather element structure
- */
-typedef struct sgb {
- unchar len[3];
- unchar ptr[3]; /* Also SCSI-style - MSB first */
-} Sgb;
-
-typedef struct scb { /* Command Control Block 5.4.1 */
- unchar op; /* Command Control Block Operation Code */
- unchar idlun; /* op=0,2:Target Id, op=1:Initiator Id */
- /* Outbound data transfer, length is checked */
- /* Inbound data transfer, length is checked */
- /* Logical Unit Number */
- unchar cdb[12]; /* SCSI Command Block */
- volatile unchar status; /* SCSI Return Status */
- volatile unchar vue; /* Vendor Unique Error Code */
- unchar maxlen[3]; /* Maximum Data Transfer Length */
- unchar dataptr[3]; /* SCSI Data Block Pointer */
- unchar linkptr[3]; /* Next Command Link Pointer */
- unchar direc; /* Transfer Direction */
- unchar reserved2[6]; /* SCSI Command Descriptor Block */
- /* end of hardware SCB */
- Scsi_Cmnd *SCpnt; /* Scsi_Cmnd using this SCB */
- Sgb sgb[WD7000_SG]; /* Scatter/gather list for this SCB */
- Adapter *host; /* host adapter */
- struct scb *next; /* for lists of scbs */
-} Scb;
-
-/*
- * This driver is written to allow host-only commands to be executed.
- * These use a 16-byte block called an ICB. The format is extended by the
- * driver to 18 bytes, to support the status returned in the ICMB and
- * an execution phase code.
- *
- * There are other formats besides these; these are the ones I've tried
- * to use. Formats for some of the defined ICB opcodes are not defined
- * (notably, get/set unsolicited interrupt status) in my copy of the OEM
- * manual, and others are ambiguous/hard to follow.
- */
-#define ICB_OP_MASK 0x80 /* distinguishes scbs from icbs */
-#define ICB_OP_OPEN_RBUF 0x80 /* open receive buffer */
-#define ICB_OP_RECV_CMD 0x81 /* receive command from initiator */
-#define ICB_OP_RECV_DATA 0x82 /* receive data from initiator */
-#define ICB_OP_RECV_SDATA 0x83 /* receive data with status from init. */
-#define ICB_OP_SEND_DATA 0x84 /* send data with status to initiator */
-#define ICB_OP_SEND_STAT 0x86 /* send command status to initiator */
- /* 0x87 is reserved */
-#define ICB_OP_READ_INIT 0x88 /* read initialization bytes */
-#define ICB_OP_READ_ID 0x89 /* read adapter's SCSI ID */
-#define ICB_OP_SET_UMASK 0x8A /* set unsolicited interrupt mask */
-#define ICB_OP_GET_UMASK 0x8B /* read unsolicited interrupt mask */
-#define ICB_OP_GET_REVISION 0x8C /* read firmware revision level */
-#define ICB_OP_DIAGNOSTICS 0x8D /* execute diagnostics */
-#define ICB_OP_SET_EPARMS 0x8E /* set execution parameters */
-#define ICB_OP_GET_EPARMS 0x8F /* read execution parameters */
-
-typedef struct icbRecvCmd {
- unchar op;
- unchar IDlun; /* Initiator SCSI ID/lun */
- unchar len[3]; /* command buffer length */
- unchar ptr[3]; /* command buffer address */
- unchar rsvd[7]; /* reserved */
- volatile unchar vue; /* vendor-unique error code */
- volatile unchar status; /* returned (icmb) status */
- volatile unchar phase; /* used by interrupt handler */
-} IcbRecvCmd;
-
-typedef struct icbSendStat {
- unchar op;
- unchar IDlun; /* Target SCSI ID/lun */
- unchar stat; /* (outgoing) completion status byte 1 */
- unchar rsvd[12]; /* reserved */
- volatile unchar vue; /* vendor-unique error code */
- volatile unchar status; /* returned (icmb) status */
- volatile unchar phase; /* used by interrupt handler */
-} IcbSendStat;
-
-typedef struct icbRevLvl {
- unchar op;
- volatile unchar primary; /* primary revision level (returned) */
- volatile unchar secondary; /* secondary revision level (returned) */
- unchar rsvd[12]; /* reserved */
- volatile unchar vue; /* vendor-unique error code */
- volatile unchar status; /* returned (icmb) status */
- volatile unchar phase; /* used by interrupt handler */
-} IcbRevLvl;
-
-typedef struct icbUnsMask { /* I'm totally guessing here */
- unchar op;
- volatile unchar mask[14]; /* mask bits */
-#if 0
- unchar rsvd[12]; /* reserved */
-#endif
- volatile unchar vue; /* vendor-unique error code */
- volatile unchar status; /* returned (icmb) status */
- volatile unchar phase; /* used by interrupt handler */
-} IcbUnsMask;
-
-typedef struct icbDiag {
- unchar op;
- unchar type; /* diagnostics type code (0-3) */
- unchar len[3]; /* buffer length */
- unchar ptr[3]; /* buffer address */
- unchar rsvd[7]; /* reserved */
- volatile unchar vue; /* vendor-unique error code */
- volatile unchar status; /* returned (icmb) status */
- volatile unchar phase; /* used by interrupt handler */
-} IcbDiag;
-
-#define ICB_DIAG_POWERUP 0 /* Power-up diags only */
-#define ICB_DIAG_WALKING 1 /* walking 1's pattern */
-#define ICB_DIAG_DMA 2 /* DMA - system memory diags */
-#define ICB_DIAG_FULL 3 /* do both 1 & 2 */
-
-typedef struct icbParms {
- unchar op;
- unchar rsvd1; /* reserved */
- unchar len[3]; /* parms buffer length */
- unchar ptr[3]; /* parms buffer address */
- unchar idx[2]; /* index (MSB-LSB) */
- unchar rsvd2[5]; /* reserved */
- volatile unchar vue; /* vendor-unique error code */
- volatile unchar status; /* returned (icmb) status */
- volatile unchar phase; /* used by interrupt handler */
-} IcbParms;
-
-typedef struct icbAny {
- unchar op;
- unchar data[14]; /* format-specific data */
- volatile unchar vue; /* vendor-unique error code */
- volatile unchar status; /* returned (icmb) status */
- volatile unchar phase; /* used by interrupt handler */
-} IcbAny;
-
-typedef union icb {
- unchar op; /* ICB opcode */
- IcbRecvCmd recv_cmd; /* format for receive command */
- IcbSendStat send_stat; /* format for send status */
- IcbRevLvl rev_lvl; /* format for get revision level */
- IcbDiag diag; /* format for execute diagnostics */
- IcbParms eparms; /* format for get/set exec parms */
- IcbAny icb; /* generic format */
- unchar data[18];
-} Icb;
-
-
/*
* Driver SCB structure pool.
*
@@ -571,8 +245,7 @@
* structure is not part of the Adapter structure.
*/
static Scb scbs[MAX_SCBS];
-static Scb *scbfree = NULL; /* free list */
-static int freescbs = MAX_SCBS; /* free list counter */
+
/*
* END of data/declarations - code follows.
@@ -599,6 +272,7 @@
*
* , where BUS_ON and BUS_OFF are in nanoseconds. BIOS default values
* are 8000ns for BUS_ON and 1875ns for BUS_OFF.
+ *
* eg:
* wd7000=7,6,0x350
*
@@ -611,14 +285,15 @@
short i, j;
if (wd7000_card_num >= NUM_CONFIGS) {
- printk ("wd7000_setup: Too many \"wd7000=\" configurations in "
- "command line!\n");
+ printk ("%s: Too many \"wd7000=\" configurations in "
+ "command line!\n", __FUNCTION__);
return;
}
if ((ints[0] < 3) || (ints[0] > 5))
- printk ("wd7000_setup: Error in command line! "
- "Usage: wd7000=<IRQ>,<DMA>,IO>[,<BUS_ON>[,<BUS_OFF>]]\n");
+ printk ("%s: Error in command line! "
+ "Usage: wd7000=<IRQ>,<DMA>,<IO>[,<BUS_ON>[,<BUS_OFF>]]\n",
+ __FUNCTION__);
else {
for (i = 0; i < NUM_IRQS; i++)
if (ints[1] == wd7000_irq[i])
@@ -660,7 +335,7 @@
configs[wd7000_card_num].bus_on = BUS_ON;
}
else
- configs[wd7000_card_num].bus_on = ints[4] / 125.0;
+ configs[wd7000_card_num].bus_on = ints[4] / 125;
}
else
configs[wd7000_card_num].bus_on = BUS_ON;
@@ -672,12 +347,12 @@
configs[wd7000_card_num].bus_off = BUS_OFF;
}
else
- configs[wd7000_card_num].bus_off = ints[5] / 125.0;
+ configs[wd7000_card_num].bus_off = ints[5] / 125;
}
else
configs[wd7000_card_num].bus_off = BUS_OFF;
- if (wd7000_card_num)
+ if (wd7000_card_num) {
for (i = 0; i < (wd7000_card_num - 1); i++)
for (j = i + 1; j < wd7000_card_num; j++)
if (configs[i].irq == configs[j].irq) {
@@ -692,9 +367,11 @@
setup_error ("duplicated I/O base address!", ints);
return;
}
+ }
#ifdef WD7000_DEBUG
- printk ("wd7000_setup: IRQ=%d, DMA=%d, I/O=0x%x, BUS_ON=%dns, BUS_OFF=%dns\n",
+ printk ("%s: IRQ=%d, DMA=%d, I/O=0x%x, BUS_ON=%dns, BUS_OFF=%dns\n",
+ __FUNCTION__,
configs[wd7000_card_num].irq,
configs[wd7000_card_num].dma,
configs[wd7000_card_num].iobase,
@@ -707,7 +384,6 @@
}
-#ifdef ANY2SCSI_INLINE
/*
* Since they're used a lot, I've redone the following from the macros
* formerly in wd7000.h, hopefully to speed them up by getting rid of
@@ -716,45 +392,25 @@
* xany2scsi and xscsi2int were not being used, and are no longer defined.
* (They were simply 4-byte versions of these routines).
*/
-typedef union { /* let's cheat... */
- int i;
- unchar u[sizeof (int)]; /* the sizeof(int) makes it more portable */
-} i_u;
-
-
-static inline void any2scsi (unchar * scsi, int any)
+static inline void any2scsi (unchar *scsi, int any)
{
*scsi++ = ((i_u) any).u[2];
*scsi++ = ((i_u) any).u[1];
- *scsi++ = ((i_u) any).u[0];
+ *scsi = ((i_u) any).u[0];
}
-static inline int scsi2int (unchar * scsi)
+static inline int scsi2int (unchar *scsi)
{
i_u result;
result.i = 0; /* clears unused bytes */
- *(result.u + 2) = *scsi++;
- *(result.u + 1) = *scsi++;
- *(result.u) = *scsi++;
+ result.u[2] = *scsi++;
+ result.u[1] = *scsi++;
+ result.u[0] = *scsi;
return (result.i);
}
-#else
-/*
- * These are the old ones - I've just moved them here...
- */
-#undef any2scsi
-#define any2scsi(up, p) (up)[0] = (((unsigned long) (p)) >> 16); \
- (up)[1] = ((unsigned long) (p)) >> 8; \
- (up)[2] = ((unsigned long) (p));
-
-#undef scsi2int
-#define scsi2int(up) ( (((unsigned long) *(up)) << 16) + \
- (((unsigned long) (up)[1]) << 8) + \
- ((unsigned long) (up)[2]) )
-#endif
static inline void wd7000_enable_intr (Adapter *host)
@@ -773,12 +429,10 @@
}
-#define WAITnexttimeout 200 /* 2 seconds */
-
-static inline short WAIT (unsigned port, unsigned mask, unsigned allof, unsigned noneof)
+static inline short WAIT (uint port, uint mask, uint allof, uint noneof)
{
- register unsigned WAITbits;
- register unsigned long WAITtimeout = jiffies + WAITnexttimeout;
+ register uint WAITbits;
+ register ulong WAITtimeout = jiffies + WAITnexttimeout;
while (jiffies <= WAITtimeout) {
WAITbits = inb (port) & mask;
@@ -791,131 +445,97 @@
}
-static inline void delay (unsigned how_long)
+static inline void delay (uint how_long)
{
- register unsigned long time = jiffies + how_long;
+ register ulong time = jiffies + how_long;
while (jiffies < time);
}
-static inline int command_out (Adapter * host, unchar * cmd, int len)
+static inline int wd7000_command_out (Adapter *host, unchar *cmd, int len)
{
- if (!WAIT (host->iobase + ASC_STAT, ASC_STATMASK, CMD_RDY, 0)) {
- while (len--) {
+ if (! WAIT (host->iobase + ASC_STAT, ASC_STATMASK, CMD_RDY, 0)) {
+ for ( ; len--; cmd++)
do {
outb (*cmd, host->iobase + ASC_COMMAND);
WAIT (host->iobase + ASC_STAT, ASC_STATMASK, CMD_RDY, 0);
} while (inb (host->iobase + ASC_STAT) & CMD_REJ);
- cmd++;
- }
-
return (1);
}
- printk ("wd7000 command_out: WAIT failed(%d)\n", len + 1);
+ printk ("%s: WAIT failed (%d)\n", __FUNCTION__, len + 1);
return (0);
}
-/*
- * This version of alloc_scbs is in preparation for supporting multiple
- * commands per lun and command chaining, by queueing pending commands.
- * We will need to allocate Scbs in blocks since they will wait to be
- * executed so there is the possibility of deadlock otherwise.
- * Also, to keep larger requests from being starved by smaller requests,
- * we limit access to this routine with an internal busy flag, so that
- * the satisfiability of a request is not dependent on the size of the
- * request.
- */
-static inline Scb *alloc_scbs (int needed)
+static inline void scbs_init (void)
{
- register Scb *scb, *p;
- register unsigned long flags;
- register unsigned long timeout = jiffies + WAITnexttimeout;
- register unsigned long now;
- static int busy = 0;
- int i;
-
- if (needed <= 0)
- return (NULL); /* sanity check */
-
- save_flags (flags);
- cli ();
- while (busy) { /* someone else is allocating */
- sti (); /* Yes this is really needed here */
- for (now = jiffies; now == jiffies; ); /* wait a jiffy */
- cli ();
- }
- busy = 1; /* not busy now; it's our turn */
-
- while (freescbs < needed) {
- timeout = jiffies + WAITnexttimeout;
- do {
- sti (); /* Yes this is really needed here */
- for (now = jiffies; now == jiffies; ); /* wait a jiffy */
- cli ();
- } while (freescbs < needed && jiffies <= timeout);
- /*
- * If we get here with enough free Scbs, we can take them.
- * Otherwise, we timed out and didn't get enough.
- */
- if (freescbs < needed) {
- busy = 0;
- panic ("wd7000: can't get enough free SCBs.\n");
- restore_flags (flags);
- return (NULL);
- }
- }
- scb = scbfree;
- freescbs -= needed;
- for (i = 0; i < needed; i++) {
- p = scbfree;
- scbfree = p->next;
- }
- p->next = NULL;
- busy = 0; /* we're done */
-
- restore_flags (flags);
+ short i;
- return (scb);
+ for (i = 0; i < MAX_SCBS; i++)
+ memset ((void *) &(scbs[i]), 0, sizeof (Scb));
}
-static inline void free_scb (Scb *scb)
+static inline Scb *scb_alloc (void)
{
- register unsigned long flags;
+ Scb *scb = NULL;
+ ulong flags;
+ short i;
+#ifdef WD7000_DEBUG
+ short free_scbs = 0;
+#endif
save_flags (flags);
cli ();
- memset (scb, 0, sizeof (Scb));
- scb->next = scbfree;
- scbfree = scb;
- freescbs++;
+ for (i = 0; i < MAX_SCBS; i++)
+ if (! scbs[i].used) {
+ scbs[i].used = 1;
+ scb = &(scbs[i]);
+
+ break;
+ }
+
+#ifdef WD7000_DEBUG
+ for (i = 0; i < MAX_SCBS; i++)
+ free_scbs += scbs[i].used ? 0 : 1;
+
+ printk ("wd7000_%s: allocating scb (0x%08x), %d scbs free\n",
+ __FUNCTION__, (int) scb, free_scbs);
+#endif
restore_flags (flags);
+
+ return (scb);
}
-static inline void init_scbs (void)
+static inline void scb_free (Scb *scb)
{
- int i;
- unsigned long flags;
+ short i;
+ ulong flags;
save_flags (flags);
cli ();
- scbfree = &(scbs[0]);
- memset (scbs, 0, sizeof (scbs));
- for (i = 0; i < MAX_SCBS - 1; i++) {
- scbs[i].next = &(scbs[i + 1]);
- scbs[i].SCpnt = NULL;
- }
- scbs[MAX_SCBS - 1].next = NULL;
- scbs[MAX_SCBS - 1].SCpnt = NULL;
+ for (i = 0; i < MAX_SCBS; i++)
+ if (&(scbs[i]) == scb) {
+ memset ((void *) &(scbs[i]), 0, sizeof (Scb));
+
+ break;
+ }
+
+ if (i == MAX_SCBS)
+ printk ("wd7000_%s: trying to free alien scb (0x%08x)...\n",
+ __FUNCTION__, (int) scb);
+#ifdef WD7000_DEBUG
+ else
+ printk ("wd7000_%s: freeing scb (0x%08x)\n", __FUNCTION__, (int) scb);
+#endif
restore_flags (flags);
}
@@ -927,18 +547,19 @@
*/
{
register int i, ogmb;
- register unsigned long flags;
+ ulong flags;
unchar start_ogmb;
Mailbox *ogmbs = host->mb.ogmb;
int *next_ogmb = &(host->next_ogmb);
#ifdef WD7000_DEBUG
- printk ("wd7000 mail_out: 0x%06lx", (long) scbptr);
+ printk ("wd7000_%s: 0x%08x", __FUNCTION__, (int) scbptr);
#endif
/* We first look for a free outgoing mailbox */
save_flags (flags);
cli ();
+
ogmb = *next_ogmb;
for (i = 0; i < OGMB_CNT; i++) {
if (ogmbs[ogmb].status == 0) {
@@ -954,10 +575,11 @@
else
ogmb = (++ogmb) % OGMB_CNT;
}
+
restore_flags (flags);
#ifdef WD7000_DEBUG
- printk (", scb is 0x%06lx", (long) scbptr);
+ printk (", scb is 0x%08x", (int) scbptr);
#endif
if (i >= OGMB_CNT) {
@@ -978,7 +600,7 @@
wd7000_enable_intr (host);
start_ogmb = START_OGMB | ogmb;
- command_out (host, &start_ogmb, 1);
+ wd7000_command_out (host, &start_ogmb, 1);
#ifdef WD7000_DEBUG
printk (", awaiting interrupt.\n");
@@ -988,7 +610,7 @@
}
-int make_code (unsigned hosterr, unsigned scsierr)
+int make_code (uint hosterr, uint scsierr)
{
#ifdef WD7000_DEBUG
int in_error = hosterr;
@@ -998,40 +620,51 @@
case 0: /* Reserved */
hosterr = DID_ERROR;
break;
+
case 1: /* Command Complete, no errors */
hosterr = DID_OK;
break;
+
case 2: /* Command complete, error logged in scb status (scsierr) */
hosterr = DID_OK;
break;
+
case 4: /* Command failed to complete - timeout */
hosterr = DID_TIME_OUT;
break;
+
case 5: /* Command terminated; Bus reset by external device */
hosterr = DID_RESET;
break;
+
case 6: /* Unexpected Command Received w/ host as target */
hosterr = DID_BAD_TARGET;
break;
+
case 80: /* Unexpected Reselection */
case 81: /* Unexpected Selection */
hosterr = DID_BAD_INTR;
break;
+
case 82: /* Abort Command Message */
hosterr = DID_ABORT;
break;
+
case 83: /* SCSI Bus Software Reset */
case 84: /* SCSI Bus Hardware Reset */
hosterr = DID_RESET;
break;
+
default: /* Reserved */
hosterr = DID_ERROR;
}
+
#ifdef WD7000_DEBUG
if (scsierr || hosterr)
printk ("\nSCSI command error: SCSI 0x%02x host 0x%04x return %d\n",
scsierr, in_error, hosterr);
#endif
+
return (scsierr | (hosterr << 16));
}
@@ -1039,14 +672,18 @@
static void wd7000_scsi_done (Scsi_Cmnd *SCpnt)
{
#ifdef WD7000_DEBUG
- printk ("wd7000_scsi_done: 0x%06lx\n", (long) SCpnt);
+ printk ("%s: 0x%08x\n", __FUNCTION__, (int) SCpnt);
#endif
SCpnt->SCp.phase = 0;
}
-#define wd7000_intr_ack(host) outb (0, host->iobase + ASC_INTR_ACK)
+static inline void wd7000_intr_ack (Adapter *host)
+{
+ outb (0, host->iobase + ASC_INTR_ACK);
+}
+
void wd7000_intr_handle (int irq, void *dev_id, struct pt_regs *regs)
{
@@ -1061,16 +698,16 @@
host->int_counter++;
#ifdef WD7000_DEBUG
- printk ("wd7000_intr_handle: irq = %d, host = 0x%06lx\n", irq, (long) host);
+ printk ("%s: irq = %d, host = 0x%08x\n", __FUNCTION__, irq, (int) host);
#endif
flag = inb (host->iobase + ASC_INTR_STAT);
#ifdef WD7000_DEBUG
- printk ("wd7000_intr_handle: intr stat = 0x%02x\n", flag);
+ printk ("%s: intr stat = 0x%02x\n", __FUNCTION__, flag);
#endif
- if (!(inb (host->iobase + ASC_STAT) & INT_IM)) {
+ if (! (inb (host->iobase + ASC_STAT) & INT_IM)) {
/* NB: these are _very_ possible if IRQ 15 is being used, since
* it's the "garbage collector" on the 2nd 8259 PIC. Specifically,
* any interrupt signal into the 8259 which can't be identified
@@ -1080,7 +717,7 @@
* problems would be indistinguishable from valid interrupts...
*/
#ifdef WD7000_DEBUG
- printk ("wd7000_intr_handle: phantom interrupt...\n");
+ printk ("%s: phantom interrupt...\n", __FUNCTION__);
#endif
wd7000_intr_ack (host);
return;
@@ -1088,9 +725,9 @@
if (flag & MB_INTR) {
/* The interrupt is for a mailbox */
- if (!(flag & IMB_INTR)) {
+ if (! (flag & IMB_INTR)) {
#ifdef WD7000_DEBUG
- printk ("wd7000_intr_handle: free outgoing mailbox\n");
+ printk ("%s: free outgoing mailbox\n", __FUNCTION__);
#endif
/*
* If sleep_on() and the "interrupt on free OGMB" command are
@@ -1104,15 +741,19 @@
/* The interrupt is for an incoming mailbox */
icmb = flag & MB_MASK;
icmb_status = icmbs[icmb].status;
+
if (icmb_status & 0x80) { /* unsolicited - result in ICMB */
#ifdef WD7000_DEBUG
- printk ("wd7000_intr_handle: unsolicited interrupt 0x%02xh\n",
- icmb_status);
+ printk ("%s: unsolicited interrupt 0x%02x\n",
+ __FUNCTION__, icmb_status);
#endif
wd7000_intr_ack (host);
return;
}
- scb = (struct scb *) scsi2int ((unchar *) icmbs[icmb].scbptr);
+
+ /* Aaaargh! (Zaga) */
+ scb = (Scb *) bus_to_virt (scsi2int ((unchar *) icmbs[icmb].scbptr));
+
icmbs[icmb].status = 0;
if (!(scb->op & ICB_OP_MASK)) { /* an SCB is done */
SCpnt = scb->SCpnt;
@@ -1122,7 +763,7 @@
errstatus = make_code (host_error, scsi_error);
SCpnt->result = errstatus;
- free_scb (scb);
+ scb_free (scb);
SCpnt->scsi_done (SCpnt);
}
@@ -1136,6 +777,26 @@
}
wd7000_intr_ack (host);
+
+#ifdef WD7000_DEBUG
+ printk ("%s: return from interrupt handler\n", __FUNCTION__);
+#endif
+}
+
+
+void do_wd7000_intr_handle (int irq, void *dev_id, struct pt_regs *regs)
+{
+#if (LINUX_VERSION_CODE >= 0x020100)
+ ulong flags;
+
+ spin_lock_irqsave (&io_request_lock, flags);
+#endif
+
+ wd7000_intr_handle (irq, dev_id, regs);
+
+#if (LINUX_VERSION_CODE >= 0x020100)
+ spin_unlock_irqrestore (&io_request_lock, flags);
+#endif
}
@@ -1143,33 +804,31 @@
{
register Scb *scb;
register Sgb *sgb;
- register unchar *cdb = (unchar *) SCpnt->cmnd;
- register unchar idlun;
- register short cdblen;
- Adapter *host = (Adapter *) SCpnt->host->hostdata;
+ register Adapter *host = (Adapter *) SCpnt->host->hostdata;
+
+ if ((scb = scb_alloc ()) == NULL) {
+ printk ("%s: Cannot allocate SCB!\n", __FUNCTION__);
+ return (0);
+ }
- cdblen = SCpnt->cmd_len;
- idlun = ((SCpnt->target << 5) & 0xe0) | (SCpnt->lun & 7);
SCpnt->scsi_done = done;
SCpnt->SCp.phase = 1;
- scb = alloc_scbs (1);
- scb->idlun = idlun;
- memcpy (scb->cdb, cdb, cdblen);
+ SCpnt->host_scribble = (unchar *) scb;
+ scb->idlun = ((SCpnt->target << 5) & 0xe0) | (SCpnt->lun & 7);
scb->direc = 0x40; /* Disable direction check */
-
scb->SCpnt = SCpnt; /* so we can find stuff later */
- SCpnt->host_scribble = (unchar *) scb;
scb->host = host;
+ memcpy (scb->cdb, SCpnt->cmnd, SCpnt->cmd_len);
if (SCpnt->use_sg) {
struct scatterlist *sg = (struct scatterlist *) SCpnt->request_buffer;
- unsigned i;
+ uint i;
- if (SCpnt->host->sg_tablesize == SG_NONE) {
- panic ("wd7000_queuecommand: scatter/gather not supported.\n");
- }
+ if (SCpnt->host->sg_tablesize == SG_NONE)
+ panic ("%s: scatter/gather not supported.\n", __FUNCTION__);
#ifdef WD7000_DEBUG
- printk ("Using scatter/gather with %d elements.\n", SCpnt->use_sg);
+ else
+ printk ("Using scatter/gather with %d elements.\n", SCpnt->use_sg);
#endif
sgb = scb->sgb;
@@ -1188,7 +847,7 @@
any2scsi (scb->maxlen, SCpnt->request_bufflen);
}
- while (!mail_out (host, scb)); /* keep trying */
+ while (! mail_out (host, scb)); /* keep trying */
return (1);
}
@@ -1196,7 +855,8 @@
int wd7000_command (Scsi_Cmnd *SCpnt)
{
- wd7000_queuecommand (SCpnt, wd7000_scsi_done);
+ if (! wd7000_queuecommand (SCpnt, wd7000_scsi_done))
+ return (-1);
while (SCpnt->SCp.phase > 0)
barrier (); /* phase counts scbs down to 0 */
@@ -1207,32 +867,35 @@
int wd7000_diagnostics (Adapter *host, int code)
{
- static IcbDiag icb =
- {ICB_OP_DIAGNOSTICS};
+ static IcbDiag icb = { ICB_OP_DIAGNOSTICS };
static unchar buf[256];
- unsigned long timeout;
+ ulong timeout;
+ /*
+ * This routine is only called at init, so there should be OGMBs
+ * available. I'm assuming so here. If this is going to
+ * fail, I can just let the timeout catch the failure.
+ */
icb.type = code;
any2scsi (icb.len, sizeof (buf));
any2scsi (icb.ptr, (int) &buf);
icb.phase = 1;
+
+ mail_out (host, (Scb *) &icb);
+
/*
- * This routine is only called at init, so there should be OGMBs
- * available. I'm assuming so here. If this is going to
- * fail, I can just let the timeout catch the failure.
+ * Wait up to 2 seconds for completion.
*/
- mail_out (host, (struct scb *) &icb);
- timeout = jiffies + WAITnexttimeout; /* wait up to 2 seconds */
- while (icb.phase && jiffies < timeout)
- barrier (); /* wait for completion */
+ for (timeout = jiffies + WAITnexttimeout; icb.phase && (jiffies < timeout); )
+ barrier ();
if (icb.phase) {
- printk ("wd7000_diagnostics: timed out.\n");
+ printk ("%s: timed out.\n", __FUNCTION__);
return (0);
}
+
if (make_code (icb.vue | (icb.status << 8), 0)) {
- printk ("wd7000_diagnostics: failed (0x%02x,0x%02x)\n",
- icb.vue, icb.status);
+ printk ("%s: failed (0x%02x,0x%02x)\n", __FUNCTION__, icb.vue, icb.status);
return (0);
}
@@ -1265,28 +928,35 @@
host->control = 0; /* this must always shadow ASC_CONTROL */
if (WAIT (host->iobase + ASC_STAT, ASC_STATMASK, CMD_RDY, 0)) {
- printk ("wd7000_init: WAIT timed out.\n");
+ printk ("%s: WAIT timed out.\n", __FUNCTION__);
return (0); /* 0 = not ok */
}
if ((diag = inb (host->iobase + ASC_INTR_STAT)) != 1) {
- printk ("wd7000_init: ");
+ printk ("%s: ", __FUNCTION__);
switch (diag) {
case 2: printk ("RAM failure.\n");
break;
+
case 3: printk ("FIFO R/W failed\n");
break;
+
case 4: printk ("SBIC register R/W failed\n");
break;
+
case 5: printk ("Initialization D-FF failed.\n");
break;
+
case 6: printk ("Host IRQ D-FF failed.\n");
break;
+
case 7: printk ("ROM checksum error.\n");
break;
+
default: printk ("diagnostic code 0x%02Xh received.\n", diag);
}
+
return (0);
}
@@ -1294,30 +964,33 @@
memset (&(host->mb), 0, sizeof (host->mb));
/* Execute init command */
- any2scsi ((unchar *) & (init_cmd.mailboxes), (int) &(host->mb));
- if (!command_out (host, (unchar *) &init_cmd, sizeof (init_cmd))) {
- printk ("wd7000_init: adapter initialization failed.\n");
+ any2scsi ((unchar *) &(init_cmd.mailboxes), (int) &(host->mb));
+
+ if (! wd7000_command_out (host, (unchar *) &init_cmd, sizeof (init_cmd))) {
+ printk ("%s: adapter initialization failed.\n", __FUNCTION__);
return (0);
}
if (WAIT (host->iobase + ASC_STAT, ASC_STATMASK, ASC_INIT, 0)) {
- printk ("wd7000_init: WAIT timed out.\n");
+ printk ("%s: WAIT timed out.\n", __FUNCTION__);
return (0);
}
- if (request_irq (host->irq, wd7000_intr_handle, SA_INTERRUPT, "wd7000", NULL)) {
- printk ("wd7000_init: can't get IRQ %d.\n", host->irq);
+ if (request_irq (host->irq, do_wd7000_intr_handle, SA_INTERRUPT, "wd7000", NULL)) {
+ printk ("%s: can't get IRQ %d.\n", __FUNCTION__, host->irq);
return (0);
}
+
if (request_dma (host->dma, "wd7000")) {
- printk ("wd7000_init: can't get DMA channel %d.\n", host->dma);
+ printk ("%s: can't get DMA channel %d.\n", __FUNCTION__, host->dma);
free_irq (host->irq, NULL);
return (0);
}
+
wd7000_enable_dma (host);
wd7000_enable_intr (host);
- if (!wd7000_diagnostics (host, ICB_DIAG_FULL)) {
+ if (! wd7000_diagnostics (host, ICB_DIAG_FULL)) {
free_dma (host->dma);
free_irq (host->irq, NULL);
return (0);
@@ -1329,30 +1002,31 @@
void wd7000_revision (Adapter *host)
{
- static IcbRevLvl icb =
- {ICB_OP_GET_REVISION};
+ static IcbRevLvl icb = { ICB_OP_GET_REVISION };
- icb.phase = 1;
/*
* Like diagnostics, this is only done at init time, in fact, from
* wd7000_detect, so there should be OGMBs available. If it fails,
* the only damage will be that the revision will show up as 0.0,
* which in turn means that scatter/gather will be disabled.
*/
- mail_out (host, (struct scb *) &icb);
+ icb.phase = 1;
+ mail_out (host, (Scb *) &icb);
+
while (icb.phase)
barrier (); /* wait for completion */
+
host->rev1 = icb.primary;
host->rev2 = icb.secondary;
}
#undef SPRINTF
-#define SPRINTF(args...) { if (pos < (buffer + length)) pos += sprintf (pos, ## args); }
+#define SPRINTF(args...) { if (pos < (buffer + length)) pos += sprintf (pos, ## args); }
int wd7000_set_info (char *buffer, int length, struct Scsi_Host *host)
{
- unsigned long flags;
+ ulong flags;
save_flags (flags);
cli ();
@@ -1375,9 +1049,9 @@
int wd7000_proc_info (char *buffer, char **start, off_t offset, int length, int hostno, int inout)
{
struct Scsi_Host *host = NULL;
- Scsi_Device *scd = scsi_devices;
+ Scsi_Device *scd;
Adapter *adapter;
- unsigned long flags;
+ ulong flags;
char *pos = buffer;
short i;
@@ -1399,7 +1073,7 @@
/*
* Host not found!
*/
- if (!host)
+ if (! host)
return (-ESRCH);
/*
@@ -1455,9 +1129,15 @@
/*
* Display driver information for each device attached to the board.
*/
+#if (LINUX_VERSION_CODE >= 0x020100)
+ scd = host->host_queue;
+#else
+ scd = scsi_devices;
+#endif
+
SPRINTF ("\nAttached devices: %s\n", scd ? "" : "none");
- for (; scd; scd = scd->next)
+ for ( ; scd; scd = scd->next)
if (scd->host->host_no == hostno) {
SPRINTF (" [Channel: %02d, Id: %02d, Lun: %02d] ",
scd->channel, scd->id, scd->lun);
@@ -1505,50 +1185,73 @@
{
short present = 0, biosaddr_ptr, sig_ptr, i, pass;
short biosptr[NUM_CONFIGS];
- unsigned iobase;
+ uint iobase;
Adapter *host = NULL;
struct Scsi_Host *sh;
- for (i = 0; i < IRQS; wd7000_host[i++] = NULL) ;
- for (i = 0; i < NUM_CONFIGS; biosptr[i++] = -1) ;
-
- tpnt->proc_dir = &proc_scsi_wd7000;
- tpnt->proc_info = &wd7000_proc_info;
+#ifdef WD7000_DEBUG
+ printk ("%s: started\n", __FUNCTION__);
+#endif
/*
* Set up SCB free list, which is shared by all adapters
*/
- init_scbs ();
+ scbs_init ();
+
+ for (i = 0; i < IRQS; wd7000_host[i++] = NULL);
+ for (i = 0; i < NUM_CONFIGS; biosptr[i++] = -1);
+
+ tpnt->proc_dir = &proc_scsi_wd7000;
+ tpnt->proc_info = &wd7000_proc_info;
for (pass = 0; pass < NUM_CONFIGS; pass++) {
+ short bios_match = 1;
+
+#ifdef WD7000_DEBUG
+ printk ("%s: pass %d\n", __FUNCTION__, pass + 1);
+#endif
+
/*
* First, search for BIOS SIGNATURE...
*/
- for (biosaddr_ptr = 0; biosaddr_ptr < NUM_ADDRS; biosaddr_ptr++)
- for (sig_ptr = 0; sig_ptr < NUM_SIGNATURES; sig_ptr++) {
+ for (biosaddr_ptr = 0; bios_match && (biosaddr_ptr < NUM_ADDRS); biosaddr_ptr++)
+ for (sig_ptr = 0; bios_match && (sig_ptr < NUM_SIGNATURES); sig_ptr++) {
for (i = 0; i < pass; i++)
if (biosptr[i] == biosaddr_ptr)
break;
- if ((i == pass) &&
- !memcmp ((void *) (wd7000_biosaddr[biosaddr_ptr] +
- signatures[sig_ptr].ofs), signatures[sig_ptr].sig,
- signatures[sig_ptr].len))
- goto bios_matched;
- }
+ if (i == pass) {
+#if (LINUX_VERSION_CODE >= 0x020100)
+ char *biosaddr = (char *) ioremap (wd7000_biosaddr[biosaddr_ptr] +
+ signatures[sig_ptr].ofs,
+ signatures[sig_ptr].len);
+#else
+ char *biosaddr = (char *) (wd7000_biosaddr[biosaddr_ptr] +
+ signatures[sig_ptr].ofs);
+#endif
+ bios_match = memcmp (biosaddr, signatures[sig_ptr].sig,
+ signatures[sig_ptr].len);
- bios_matched:
- /*
- * BIOS SIGNATURE has been found.
- */
+#if (LINUX_VERSION_CODE >= 0x020100)
+ iounmap (biosaddr);
+#else
+#endif
+ if (! bios_match) {
+ /*
+ * BIOS SIGNATURE has been found.
+ */
+ biosptr[pass] = biosaddr_ptr;
#ifdef WD7000_DEBUG
- printk ("wd7000_detect: pass %d\n", pass + 1);
+ printk ("WD-7000 SST BIOS detected at 0x%lx: checking...\n",
+ wd7000_biosaddr[biosaddr_ptr]);
+#endif
+ }
+ }
+ }
- if (biosaddr_ptr == NUM_ADDRS)
+#ifdef WD7000_DEBUG
+ if (bios_match)
printk ("WD-7000 SST BIOS not detected...\n");
- else
- printk ("WD-7000 SST BIOS detected at 0x%lx: checking...\n",
- wd7000_biosaddr[biosaddr_ptr]);
#endif
if (configs[pass].irq < 0)
@@ -1557,13 +1260,12 @@
iobase = configs[pass].iobase;
#ifdef WD7000_DEBUG
- printk ("wd7000_detect: check IO 0x%x region...\n", iobase);
+ printk ("%s: check IO 0x%x region...\n", __FUNCTION__, iobase);
#endif
- if (!check_region (iobase, 4)) {
-
+ if (! check_region (iobase, 4)) {
#ifdef WD7000_DEBUG
- printk ("wd7000_detect: ASC reset (IO 0x%x) ...", iobase);
+ printk ("%s: ASC reset (IO 0x%x) ...", __FUNCTION__, iobase);
#endif
/*
* ASC reset...
@@ -1596,7 +1298,7 @@
host = (Adapter *) sh->hostdata;
#ifdef WD7000_DEBUG
- printk ("wd7000_detect: adapter allocated at 0x%x\n", (int) host);
+ printk ("%s: adapter allocated at 0x%x\n", __FUNCTION__, (int) host);
#endif
memset (host, 0, sizeof (Adapter));
@@ -1610,14 +1312,12 @@
host->sh = wd7000_host[host->irq - IRQ_MIN] = sh;
#ifdef WD7000_DEBUG
- printk ("wd7000_detect: Trying init WD-7000 card at IO "
- "0x%x, IRQ %d, DMA %d...\n",
- host->iobase, host->irq, host->dma);
+ printk ("%s: Trying to init WD-7000 card at IO 0x%x, IRQ %d, DMA %d...\n",
+ __FUNCTION__, host->iobase, host->irq, host->dma);
#endif
- if (!wd7000_init (host)) { /* Initialization failed */
+ if (! wd7000_init (host)) { /* Initialization failed */
scsi_unregister (sh);
-
continue;
}
@@ -1639,9 +1339,6 @@
present++; /* count it */
- if (biosaddr_ptr != NUM_ADDRS)
- biosptr[pass] = biosaddr_ptr;
-
printk ("Western Digital WD-7000 (rev %d.%d) ",
host->rev1, host->rev2);
printk ("using IO 0x%x, IRQ %d, DMA %d.\n",
@@ -1653,12 +1350,12 @@
#ifdef WD7000_DEBUG
else
- printk ("wd7000_detect: IO 0x%x region already allocated!\n", iobase);
+ printk ("%s: IO 0x%x region is already allocated!\n", __FUNCTION__, iobase);
#endif
}
- if (!present)
+ if (! present)
printk ("Failed initialization of WD-7000 SCSI card!\n");
return (present);
@@ -1673,7 +1370,7 @@
Adapter *host = (Adapter *) SCpnt->host->hostdata;
if (inb (host->iobase + ASC_STAT) & INT_IM) {
- printk ("wd7000_abort: lost interrupt\n");
+ printk ("%s: lost interrupt\n", __FUNCTION__);
wd7000_intr_handle (host->irq, NULL, NULL);
return (SCSI_ABORT_SUCCESS);
@@ -1686,7 +1383,7 @@
/*
* I also have no idea how to do a reset...
*/
-int wd7000_reset (Scsi_Cmnd *SCpnt, unsigned int flags)
+int wd7000_reset (Scsi_Cmnd *SCpnt, uint flags)
{
return (SCSI_RESET_PUNT);
}
@@ -1698,7 +1395,7 @@
int wd7000_biosparam (Disk *disk, kdev_t dev, int *ip)
{
#ifdef WD7000_DEBUG
- printk ("wd7000_biosparam: dev=%s, size=%d, ", kdevname (dev), disk->capacity);
+ printk ("%s: dev=%s, size=%d, ", __FUNCTION__, kdevname (dev), disk->capacity);
#endif
/*
@@ -1720,8 +1417,9 @@
if ((scsicam_bios_param (disk, dev, info) < 0) ||
!(((info[0] == 64) && (info[1] == 32)) ||
((info[0] == 255) && (info[1] == 63)))) {
- printk ("wd7000_biosparam: unable to verify geometry for disk with >1GB.\n"
- " using extended translation.\n");
+ printk ("%s: unable to verify geometry for disk with >1GB.\n"
+ " using extended translation.\n",
+ __FUNCTION__);
ip[0] = 255;
ip[1] = 63;
@@ -1733,7 +1431,8 @@
ip[2] = info[2];
if (info[0] == 255)
- printk ("wd7000_biosparam: current partition table is using extended translation.\n");
+ printk ("%s: current partition table is using extended translation.\n",
+ __FUNCTION__);
}
}
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov