patch-2.0.1 linux/drivers/scsi/qlogicisp.c

Next file: linux/drivers/scsi/qlogicisp.h
Previous file: linux/drivers/scsi/hosts.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.0.0/linux/drivers/scsi/qlogicisp.c linux/drivers/scsi/qlogicisp.c
@@ -63,7 +63,7 @@
    the latest firmware provided by QLogic.  This may be an earlier/later
    revision than supplied by your board. */
 
-#define RELOAD_FIRMWARE		1
+#define RELOAD_FIRMWARE		0
 
 /* Set the following macro to 1 to reload the ISP1020's defaults from nvram.
    If you are not sure of your settings, leave this alone, the driver will
@@ -76,6 +76,7 @@
 #define DEBUG_ISP1020		0
 #define DEBUG_ISP1020_INT	0
 #define DEBUG_ISP1020_SETUP	0
+#define TRACE_ISP		0
 
 #define DEFAULT_LOOP_COUNT	1000000
 
@@ -83,6 +84,38 @@
 
 #include <linux/module.h>
 
+#if TRACE_ISP
+
+# define TRACE_BUF_LEN	(32*1024)
+
+struct {
+	u_long		next;
+	struct {
+		u_long		time;
+		u_int		index;
+		u_int		addr;
+		u_char *	name;
+	} buf[TRACE_BUF_LEN];
+} trace;
+
+#define TRACE(w, i, a)						\
+{								\
+	unsigned long flags;					\
+								\
+	save_flags(flags);					\
+	cli();							\
+	trace.buf[trace.next].name  = (w);			\
+	trace.buf[trace.next].time  = jiffies;			\
+	trace.buf[trace.next].index = (i);			\
+	trace.buf[trace.next].addr  = (long) (a);		\
+	trace.next = (trace.next + 1) & (TRACE_BUF_LEN - 1);	\
+	restore_flags(flags);					\
+}
+
+#else
+# define TRACE(w, i, a)
+#endif
+
 #if DEBUG_ISP1020
 #define ENTER(x)	printk("isp1020 : entering %s()\n", x);
 #define LEAVE(x)	printk("isp1020 : leaving %s()\n", x);
@@ -146,10 +179,10 @@
 #define EXECUTION_TIMEOUT_RESET		0x8006
 
 struct Entry_header {
-    u_char    entry_type;
-    u_char    entry_cnt;
-    u_char    sys_def_1;
-    u_char    flags;
+	u_char	entry_type;
+	u_char	entry_cnt;
+	u_char	sys_def_1;
+	u_char	flags;
 };
 
 /* entry header type commands */
@@ -166,25 +199,22 @@
 #define EFLAG_BAD_PAYLOAD	8
 
 struct dataseg {
-    u_int   d_base;
-    u_int   d_count;
+	u_int			d_base;
+	u_int			d_count;
 };
 
 struct Command_Entry {
-    struct    Entry_header    hdr;
-    u_int     handle;
-    u_char    target_lun;
-    u_char    target_id;
-    u_short   cdb_length;
-    u_short   control_flags;
-    u_short   rsvd;
-    u_short   time_out;
-    u_short   segment_cnt;
-    u_char    cdb[12];
-    struct    dataseg    dataseg0;
-    struct    dataseg    dataseg1;
-    struct    dataseg    dataseg2;
-    struct    dataseg    dataseg3;
+	struct Entry_header	hdr;
+	u_int			handle;
+	u_char			target_lun;
+	u_char			target_id;
+	u_short			cdb_length;
+	u_short			control_flags;
+	u_short			rsvd;
+	u_short			time_out;
+	u_short			segment_cnt;
+	u_char			cdb[12];
+	struct dataseg		dataseg[4];
 };
 
 /* command entry control flag definitions */
@@ -197,38 +227,32 @@
 #define CFLAG_WRITE		0x40
 
 struct Ext_Command_Entry {
-    struct    Entry_header    hdr;
-    u_int     handle;
-    u_char    target_lun;
-    u_char    target_id;
-    u_short   cdb_length;
-    u_short   control_flags;
-    u_short   rsvd;
-    u_short   time_out;
-    u_short   segment_cnt;
-    u_char    cdb[44];
+	struct Entry_header	hdr;
+	u_int			handle;
+	u_char			target_lun;
+	u_char			target_id;
+	u_short			cdb_length;
+	u_short			control_flags;
+	u_short			rsvd;
+	u_short			time_out;
+	u_short			segment_cnt;
+	u_char			cdb[44];
 };
 
 struct Continuation_Entry {
-    struct    Entry_header    hdr;
-    u_int     reserved;
-    struct    dataseg    dataseg0;
-    struct    dataseg    dataseg1;
-    struct    dataseg    dataseg2;
-    struct    dataseg    dataseg3;
-    struct    dataseg    dataseg4;
-    struct    dataseg    dataseg5;
-    struct    dataseg    dataseg6;
+	struct Entry_header	hdr;
+	u_int			reserved;
+	struct dataseg		dataseg[7];
 };
 
 struct Marker_Entry {
-    struct    Entry_header    hdr;
-    u_int     reserved;
-    u_char    target_lun;
-    u_char    target_id;
-    u_char    modifier;
-    u_char    rsvd;
-    u_char    rsvds[52];
+	struct Entry_header	hdr;
+	u_int			reserved;
+	u_char			target_lun;
+	u_char			target_id;
+	u_char			modifier;
+	u_char			rsvd;
+	u_char			rsvds[52];
 };
 
 /* marker entry modifier definitions */
@@ -237,17 +261,17 @@
 #define SYNC_ALL	2
 
 struct Status_Entry {
-    struct    Entry_header    hdr;
-    u_int     handle;
-    u_short   scsi_status;
-    u_short   completion_status;
-    u_short   state_flags;
-    u_short   status_flags;
-    u_short   time;
-    u_short   req_sense_len;
-    u_int     residual;
-    u_char    rsvd[8];
-    u_char    req_sense_data[32];
+	struct Entry_header	hdr;
+	u_int			handle;
+	u_short			scsi_status;
+	u_short			completion_status;
+	u_short			state_flags;
+	u_short			status_flags;
+	u_short			time;
+	u_short			req_sense_len;
+	u_int			residual;
+	u_char			rsvd[8];
+	u_char			req_sense_data[32];
 };
 
 /* status entry completion status definitions */
@@ -366,93 +390,93 @@
 
 #define PACKB(a, b)			(((a)<<4)|(b))
 
-u_char mbox_param[] = {
-    PACKB(1, 1),	/* MBOX_NO_OP */
-    PACKB(5, 5),	/* MBOX_LOAD_RAM */
-    PACKB(2, 0),	/* MBOX_EXEC_FIRMWARE */
-    PACKB(5, 5),	/* MBOX_DUMP_RAM */
-    PACKB(3, 3),	/* MBOX_WRITE_RAM_WORD */
-    PACKB(2, 3),	/* MBOX_READ_RAM_WORD */
-    PACKB(6, 6),	/* MBOX_MAILBOX_REG_TEST */
-    PACKB(2, 3),	/* MBOX_VERIFY_CHECKSUM	*/
-    PACKB(1, 3),	/* MBOX_ABOUT_FIRMWARE */
-    PACKB(0, 0),	/* 0x0009 */
-    PACKB(0, 0),	/* 0x000a */
-    PACKB(0, 0),	/* 0x000b */
-    PACKB(0, 0),	/* 0x000c */
-    PACKB(0, 0),	/* 0x000d */
-    PACKB(1, 2),	/* MBOX_CHECK_FIRMWARE */
-    PACKB(0, 0),	/* 0x000f */
-    PACKB(5, 5),	/* MBOX_INIT_REQ_QUEUE */
-    PACKB(6, 6),	/* MBOX_INIT_RES_QUEUE */
-    PACKB(4, 4),	/* MBOX_EXECUTE_IOCB */
-    PACKB(2, 2),	/* MBOX_WAKE_UP	*/
-    PACKB(1, 6),	/* MBOX_STOP_FIRMWARE */
-    PACKB(4, 4),	/* MBOX_ABORT */
-    PACKB(2, 2),	/* MBOX_ABORT_DEVICE */
-    PACKB(3, 3),	/* MBOX_ABORT_TARGET */
-    PACKB(2, 2),	/* MBOX_BUS_RESET */
-    PACKB(2, 3),	/* MBOX_STOP_QUEUE */
-    PACKB(2, 3),	/* MBOX_START_QUEUE */
-    PACKB(2, 3),	/* MBOX_SINGLE_STEP_QUEUE */
-    PACKB(2, 3),	/* MBOX_ABORT_QUEUE */
-    PACKB(2, 4),	/* MBOX_GET_DEV_QUEUE_STATUS */
-    PACKB(0, 0),	/* 0x001e */
-    PACKB(1, 3),	/* MBOX_GET_FIRMWARE_STATUS */
-    PACKB(1, 2),	/* MBOX_GET_INIT_SCSI_ID */
-    PACKB(1, 2),	/* MBOX_GET_SELECT_TIMEOUT */
-    PACKB(1, 3),	/* MBOX_GET_RETRY_COUNT	*/
-    PACKB(1, 2),	/* MBOX_GET_TAG_AGE_LIMIT */
-    PACKB(1, 2),	/* MBOX_GET_CLOCK_RATE */
-    PACKB(1, 2),	/* MBOX_GET_ACT_NEG_STATE */
-    PACKB(1, 2),	/* MBOX_GET_ASYNC_DATA_SETUP_TIME */
-    PACKB(1, 3),	/* MBOX_GET_PCI_PARAMS */
-    PACKB(2, 4),	/* MBOX_GET_TARGET_PARAMS */
-    PACKB(2, 4),	/* MBOX_GET_DEV_QUEUE_PARAMS */
-    PACKB(0, 0),	/* 0x002a */
-    PACKB(0, 0),	/* 0x002b */
-    PACKB(0, 0),	/* 0x002c */
-    PACKB(0, 0),	/* 0x002d */
-    PACKB(0, 0),	/* 0x002e */
-    PACKB(0, 0),	/* 0x002f */
-    PACKB(2, 2),	/* MBOX_SET_INIT_SCSI_ID */
-    PACKB(2, 2),	/* MBOX_SET_SELECT_TIMEOUT */
-    PACKB(3, 3),	/* MBOX_SET_RETRY_COUNT	*/
-    PACKB(2, 2),	/* MBOX_SET_TAG_AGE_LIMIT */
-    PACKB(2, 2),	/* MBOX_SET_CLOCK_RATE */
-    PACKB(2, 2),	/* MBOX_SET_ACTIVE_NEG_STATE */
-    PACKB(2, 2),	/* MBOX_SET_ASYNC_DATA_SETUP_TIME */
-    PACKB(3, 3),	/* MBOX_SET_PCI_CONTROL_PARAMS */
-    PACKB(4, 4),	/* MBOX_SET_TARGET_PARAMS */
-    PACKB(4, 4),	/* MBOX_SET_DEV_QUEUE_PARAMS */
-    PACKB(0, 0),	/* 0x003a */
-    PACKB(0, 0),	/* 0x003b */
-    PACKB(0, 0),	/* 0x003c */
-    PACKB(0, 0),	/* 0x003d */
-    PACKB(0, 0),	/* 0x003e */
-    PACKB(0, 0),	/* 0x003f */
-    PACKB(1, 2),	/* MBOX_RETURN_BIOS_BLOCK_ADDR */
-    PACKB(6, 1),	/* MBOX_WRITE_FOUR_RAM_WORDS */
-    PACKB(2, 3)		/* MBOX_EXEC_BIOS_IOCB */
+const u_char mbox_param[] = {
+	PACKB(1, 1),	/* MBOX_NO_OP */
+	PACKB(5, 5),	/* MBOX_LOAD_RAM */
+	PACKB(2, 0),	/* MBOX_EXEC_FIRMWARE */
+	PACKB(5, 5),	/* MBOX_DUMP_RAM */
+	PACKB(3, 3),	/* MBOX_WRITE_RAM_WORD */
+	PACKB(2, 3),	/* MBOX_READ_RAM_WORD */
+	PACKB(6, 6),	/* MBOX_MAILBOX_REG_TEST */
+	PACKB(2, 3),	/* MBOX_VERIFY_CHECKSUM	*/
+	PACKB(1, 3),	/* MBOX_ABOUT_FIRMWARE */
+	PACKB(0, 0),	/* 0x0009 */
+	PACKB(0, 0),	/* 0x000a */
+	PACKB(0, 0),	/* 0x000b */
+	PACKB(0, 0),	/* 0x000c */
+	PACKB(0, 0),	/* 0x000d */
+	PACKB(1, 2),	/* MBOX_CHECK_FIRMWARE */
+	PACKB(0, 0),	/* 0x000f */
+	PACKB(5, 5),	/* MBOX_INIT_REQ_QUEUE */
+	PACKB(6, 6),	/* MBOX_INIT_RES_QUEUE */
+	PACKB(4, 4),	/* MBOX_EXECUTE_IOCB */
+	PACKB(2, 2),	/* MBOX_WAKE_UP	*/
+	PACKB(1, 6),	/* MBOX_STOP_FIRMWARE */
+	PACKB(4, 4),	/* MBOX_ABORT */
+	PACKB(2, 2),	/* MBOX_ABORT_DEVICE */
+	PACKB(3, 3),	/* MBOX_ABORT_TARGET */
+	PACKB(2, 2),	/* MBOX_BUS_RESET */
+	PACKB(2, 3),	/* MBOX_STOP_QUEUE */
+	PACKB(2, 3),	/* MBOX_START_QUEUE */
+	PACKB(2, 3),	/* MBOX_SINGLE_STEP_QUEUE */
+	PACKB(2, 3),	/* MBOX_ABORT_QUEUE */
+	PACKB(2, 4),	/* MBOX_GET_DEV_QUEUE_STATUS */
+	PACKB(0, 0),	/* 0x001e */
+	PACKB(1, 3),	/* MBOX_GET_FIRMWARE_STATUS */
+	PACKB(1, 2),	/* MBOX_GET_INIT_SCSI_ID */
+	PACKB(1, 2),	/* MBOX_GET_SELECT_TIMEOUT */
+	PACKB(1, 3),	/* MBOX_GET_RETRY_COUNT	*/
+	PACKB(1, 2),	/* MBOX_GET_TAG_AGE_LIMIT */
+	PACKB(1, 2),	/* MBOX_GET_CLOCK_RATE */
+	PACKB(1, 2),	/* MBOX_GET_ACT_NEG_STATE */
+	PACKB(1, 2),	/* MBOX_GET_ASYNC_DATA_SETUP_TIME */
+	PACKB(1, 3),	/* MBOX_GET_PCI_PARAMS */
+	PACKB(2, 4),	/* MBOX_GET_TARGET_PARAMS */
+	PACKB(2, 4),	/* MBOX_GET_DEV_QUEUE_PARAMS */
+	PACKB(0, 0),	/* 0x002a */
+	PACKB(0, 0),	/* 0x002b */
+	PACKB(0, 0),	/* 0x002c */
+	PACKB(0, 0),	/* 0x002d */
+	PACKB(0, 0),	/* 0x002e */
+	PACKB(0, 0),	/* 0x002f */
+	PACKB(2, 2),	/* MBOX_SET_INIT_SCSI_ID */
+	PACKB(2, 2),	/* MBOX_SET_SELECT_TIMEOUT */
+	PACKB(3, 3),	/* MBOX_SET_RETRY_COUNT	*/
+	PACKB(2, 2),	/* MBOX_SET_TAG_AGE_LIMIT */
+	PACKB(2, 2),	/* MBOX_SET_CLOCK_RATE */
+	PACKB(2, 2),	/* MBOX_SET_ACTIVE_NEG_STATE */
+	PACKB(2, 2),	/* MBOX_SET_ASYNC_DATA_SETUP_TIME */
+	PACKB(3, 3),	/* MBOX_SET_PCI_CONTROL_PARAMS */
+	PACKB(4, 4),	/* MBOX_SET_TARGET_PARAMS */
+	PACKB(4, 4),	/* MBOX_SET_DEV_QUEUE_PARAMS */
+	PACKB(0, 0),	/* 0x003a */
+	PACKB(0, 0),	/* 0x003b */
+	PACKB(0, 0),	/* 0x003c */
+	PACKB(0, 0),	/* 0x003d */
+	PACKB(0, 0),	/* 0x003e */
+	PACKB(0, 0),	/* 0x003f */
+	PACKB(1, 2),	/* MBOX_RETURN_BIOS_BLOCK_ADDR */
+	PACKB(6, 1),	/* MBOX_WRITE_FOUR_RAM_WORDS */
+	PACKB(2, 3)	/* MBOX_EXEC_BIOS_IOCB */
 };
 
 #define MAX_MBOX_COMMAND	(sizeof(mbox_param)/sizeof(u_short))
 
 struct host_param {
-    u_short    fifo_threshold;
-    u_short    host_adapter_enable;
-    u_short    initiator_scsi_id;
-    u_short    bus_reset_delay;
-    u_short    retry_count;
-    u_short    retry_delay;
-    u_short    async_data_setup_time;
-    u_short    req_ack_active_negation;
-    u_short    data_line_active_negation;
-    u_short    data_dma_burst_enable;
-    u_short    command_dma_burst_enable;
-    u_short    tag_aging;
-    u_short    selection_timeout;
-    u_short    max_queue_depth;
+	u_short		fifo_threshold;
+	u_short		host_adapter_enable;
+	u_short		initiator_scsi_id;
+	u_short		bus_reset_delay;
+	u_short		retry_count;
+	u_short		retry_delay;
+	u_short		async_data_setup_time;
+	u_short		req_ack_active_negation;
+	u_short		data_line_active_negation;
+	u_short		data_dma_burst_enable;
+	u_short		command_dma_burst_enable;
+	u_short		tag_aging;
+	u_short		selection_timeout;
+	u_short		max_queue_depth;
 };
 
 /*
@@ -471,1082 +495,1219 @@
  */
 
 struct dev_param {
-    u_short    device_flags;
-    u_short    execution_throttle;
-    u_short    synchronous_period;
-    u_short    synchronous_offset;
-    u_short    device_enable;
-    u_short    reserved; /* pad */
+	u_short		device_flags;
+	u_short		execution_throttle;
+	u_short		synchronous_period;
+	u_short		synchronous_offset;
+	u_short		device_enable;
+	u_short		reserved; /* pad */
 };
 
-#define REQ_QUEUE_LEN		32
-#define RES_QUEUE_LEN		32
+/*
+ * The result queue can be quite a bit smaller since continuation entries
+ * do not show up there:
+ */
+#define RES_QUEUE_LEN		((QLOGICISP_REQ_QUEUE_LEN + 1) / 8 - 1)
 #define QUEUE_ENTRY_LEN		64
 
 struct isp1020_hostdata {
-    u_int     io_base;
-    u_char    irq;
-    u_char    bus;
-    u_char    revision;
-    u_char    device_fn;
-    u_short   res_queue_in_ptr;
-    u_short   res_queue_out_ptr;
-    u_short   req_queue_in_ptr;
-    u_short   req_queue_out_ptr;
-    struct    host_param host_param;
-    struct    dev_param dev_param[MAX_TARGETS];
-    char      res_queue[RES_QUEUE_LEN][QUEUE_ENTRY_LEN];
-    char      req_queue[REQ_QUEUE_LEN][QUEUE_ENTRY_LEN];
-};
+	u_char	bus;
+	u_char	revision;
+	u_char	device_fn;
+	struct	host_param host_param;
+	struct	dev_param dev_param[MAX_TARGETS];
+	
+	/* result and request queues (shared with isp1020): */
+	u_int	req_in_ptr;		/* index of next request slot */
+	u_int	res_out_ptr;		/* index of next result slot */
 
-struct isp1020_hostdata *irq2host[NR_IRQS];
+	/* this is here so the queues are nicely aligned */
+	long	send_marker;		/* do we need to send a marker? */
 
-void isp1020_enable_irqs(struct isp1020_hostdata *);
-void isp1020_disable_irqs(struct isp1020_hostdata *);
-int isp1020_init(struct Scsi_Host *);
-int isp1020_reset_hardware(struct isp1020_hostdata *);
-int isp1020_get_defaults(struct isp1020_hostdata *);
-int isp1020_set_defaults(struct isp1020_hostdata *);
-int isp1020_load_parameters(struct isp1020_hostdata *);
-int isp1020_mbox_command(struct isp1020_hostdata *, u_short []); 
-u_short isp1020_read_nvram_word(struct isp1020_hostdata *, u_short);
-int isp1020_verify_nvram(struct isp1020_hostdata *);
-void isp1020_print_status_entry(struct Status_Entry *);
-void isp1020_print_scsi_cmd(Scsi_Cmnd *);
-void isp1020_scsi_done(Scsi_Cmnd *);
-int isp1020_return_status(struct Status_Entry *);
-void isp1020_intr_handler(int, void *, struct pt_regs *);
-
-struct proc_dir_entry proc_scsi_isp1020 = {
-    PROC_SCSI_QLOGICISP, 7, "isp1020",
-    S_IFDIR | S_IRUGO | S_IXUGO, 2
+	char	res[RES_QUEUE_LEN+1][QUEUE_ENTRY_LEN];
+	char	req[QLOGICISP_REQ_QUEUE_LEN+1][QUEUE_ENTRY_LEN];
 };
 
-int isp1020_detect(Scsi_Host_Template *tmpt)
-{
-    int hosts = 0;
-    u_short index;
-    u_char bus, device_fn;
-    struct Scsi_Host *scsihost;
-    struct isp1020_hostdata *hostdata;
+/* queue length's _must_ be power of two: */
+#define QUEUE_DEPTH(in, out, ql)	((in - out) & (ql))
+#define REQ_QUEUE_DEPTH(in, out)	QUEUE_DEPTH(in, out, 		     \
+						    QLOGICISP_REQ_QUEUE_LEN)
+#define RES_QUEUE_DEPTH(in, out)	QUEUE_DEPTH(in, out, RES_QUEUE_LEN)
+
+struct Scsi_Host *irq2host[NR_IRQS];
+
+static void	isp1020_enable_irqs(struct Scsi_Host *);
+static void	isp1020_disable_irqs(struct Scsi_Host *);
+static int	isp1020_init(struct Scsi_Host *);
+static int	isp1020_reset_hardware(struct Scsi_Host *);
+static int	isp1020_set_defaults(struct Scsi_Host *);
+static int	isp1020_load_parameters(struct Scsi_Host *);
+static int	isp1020_mbox_command(struct Scsi_Host *, u_short []); 
+static int	isp1020_return_status(struct Status_Entry *);
+static void	isp1020_intr_handler(int, void *, struct pt_regs *);
+
+#if USE_NVRAM_DEFAULTS
+static int	isp1020_get_defaults(struct Scsi_Host *);
+static int	isp1020_verify_nvram(struct Scsi_Host *);
+static u_short	isp1020_read_nvram_word(struct Scsi_Host *, u_short);
+#endif
+
+#if DEBUG_ISP1020
+static void	isp1020_print_scsi_cmd(Scsi_Cmnd *);
+#endif
+#if DEBUG_ISP1020_INTR
+static void	isp1020_print_status_entry(struct Status_Entry *);
+#endif
 
-    ENTER("isp1020_detect");
+static struct proc_dir_entry proc_scsi_isp1020 = {
+	PROC_SCSI_QLOGICISP, 7, "isp1020",
+	S_IFDIR | S_IRUGO | S_IXUGO, 2
+};
 
-    tmpt->proc_dir = &proc_scsi_isp1020;
 
-    if (pcibios_present() == 0) {
-        printk("qlogicisp : PCI bios not present\n");
-        return 0;
-    }
+static inline void isp1020_enable_irqs(struct Scsi_Host *host)
+{
+	outw(ISP_EN_INT|ISP_EN_RISC, host->io_port + PCI_INTF_CTL);
+}
 
-    memset(irq2host, 0, sizeof(irq2host));
 
-    for (index = 0; pcibios_find_device(PCI_VENDOR_ID_QLOGIC,
-            PCI_DEVICE_ID_QLOGIC_ISP1020, index, &bus, &device_fn) == 0;
-                index++) {
+static inline void isp1020_disable_irqs(struct Scsi_Host *host)
+{
+	outw(0x0, host->io_port + PCI_INTF_CTL);
+}
 
-        scsihost = scsi_register(tmpt, sizeof(struct isp1020_hostdata));
-        hostdata = (struct isp1020_hostdata *) scsihost->hostdata;
 
-        memset(hostdata, 0, sizeof(struct isp1020_hostdata));
-        hostdata->bus = bus;
-        hostdata->device_fn = device_fn;
+int isp1020_detect(Scsi_Host_Template *tmpt)
+{
+	int hosts = 0;
+	u_short index;
+	u_char bus, device_fn;
+	struct Scsi_Host *host;
+	struct isp1020_hostdata *hostdata;
+
+	ENTER("isp1020_detect");
+
+	tmpt->proc_dir = &proc_scsi_isp1020;
+
+	if (pcibios_present() == 0) {
+		printk("qlogicisp : PCI bios not present\n");
+		return 0;
+	}
+
+	memset(irq2host, 0, sizeof(irq2host));
+
+	for (index = 0; pcibios_find_device(PCI_VENDOR_ID_QLOGIC,
+					    PCI_DEVICE_ID_QLOGIC_ISP1020,
+					    index, &bus, &device_fn) == 0;
+	     index++)
+	{
+		host = scsi_register(tmpt, sizeof(struct isp1020_hostdata));
+		hostdata = (struct isp1020_hostdata *) host->hostdata;
+
+		memset(hostdata, 0, sizeof(struct isp1020_hostdata));
+		hostdata->bus = bus;
+		hostdata->device_fn = device_fn;
 
-        if (isp1020_init(scsihost) || isp1020_reset_hardware(hostdata)
+		if (isp1020_init(host) || isp1020_reset_hardware(host)
 #if USE_NVRAM_DEFAULTS
-                || isp1020_get_defaults(hostdata)
+		    || isp1020_get_defaults(host)
 #else
-                || isp1020_set_defaults(hostdata)
+		    || isp1020_set_defaults(host)
 #endif /* USE_NVRAM_DEFAULTS */
-                || isp1020_load_parameters(hostdata)) {
-            scsi_unregister(scsihost);
-            continue;
-        }
-
-        scsihost->this_id = hostdata->host_param.initiator_scsi_id;
-
-        if (request_irq(hostdata->irq, isp1020_intr_handler, SA_INTERRUPT,
-                "qlogicisp", NULL)) {
-            printk("qlogicisp : interrupt %d already in use\n", hostdata->irq);
-            scsi_unregister(scsihost);
-            continue;
-        }
-
-        if (check_region(hostdata->io_base, 0xff)) {
-            printk("qlogicisp : i/o region 0x%04x-0x%04x already in use\n",
-                hostdata->io_base, hostdata->io_base + 0xff);
-            free_irq(hostdata->irq, NULL);
-            scsi_unregister(scsihost);
-            continue;
-        }
-
-        request_region(hostdata->io_base, 0xff, "qlogicisp");
-        irq2host[hostdata->irq] = hostdata;
-
-        outw(0x0, hostdata->io_base + PCI_SEMAPHORE);
-	outw(HCCR_CLEAR_RISC_INTR, hostdata->io_base + HOST_HCCR);
-        isp1020_enable_irqs(hostdata);
+		    || isp1020_load_parameters(host)) {
+			scsi_unregister(host);
+			continue;
+		}
+
+		host->this_id = hostdata->host_param.initiator_scsi_id;
+
+		if (request_irq(host->irq, isp1020_intr_handler, SA_INTERRUPT,
+				"qlogicisp", NULL))
+		{
+			printk("qlogicisp : interrupt %d already in use\n",
+			       host->irq);
+			scsi_unregister(host);
+			continue;
+		}
+
+		if (check_region(host->io_port, 0xff)) {
+			printk("qlogicisp : i/o region 0x%04x-0x%04x already "
+			       "in use\n",
+			       host->io_port, host->io_port + 0xff);
+			free_irq(host->irq, NULL);
+			scsi_unregister(host);
+			continue;
+		}
+
+		request_region(host->io_port, 0xff, "qlogicisp");
+		irq2host[host->irq] = host;
+
+		outw(0x0, host->io_port + PCI_SEMAPHORE);
+		outw(HCCR_CLEAR_RISC_INTR, host->io_port + HOST_HCCR);
+		isp1020_enable_irqs(host);
 
-        hosts++;
-    }
+		hosts++;
+	}
 
-    LEAVE("isp1020_detect");
+	LEAVE("isp1020_detect");
 
-    return hosts;
+	return hosts;
 }
 
 
 int isp1020_release(struct Scsi_Host *host)
 {
-    struct isp1020_hostdata *hostdata;
+	struct isp1020_hostdata *hostdata;
 
-    ENTER("isp1020_release");
+	ENTER("isp1020_release");
 
-    hostdata = (struct isp1020_hostdata *) host->hostdata;
+	hostdata = (struct isp1020_hostdata *) host->hostdata;
 
-    outw(0x0, hostdata->io_base + PCI_INTF_CTL);
-    free_irq(hostdata->irq, NULL);
+	outw(0x0, host->io_port + PCI_INTF_CTL);
+	free_irq(host->irq, NULL);
 
-    release_region(hostdata->io_base, 0xff);
+	release_region(host->io_port, 0xff);
 
-    LEAVE("isp1020_release");
+	LEAVE("isp1020_release");
 
-    return 0;
+	return 0;
 }
 
 
 const char *isp1020_info(struct Scsi_Host *host)
 {
-    static char buf[80];
-    struct isp1020_hostdata *hostdata;
+	static char buf[80];
+	struct isp1020_hostdata *hostdata;
 
-    ENTER("isp1020_info");
+	ENTER("isp1020_info");
 
-    hostdata = (struct isp1020_hostdata *) host->hostdata;
-    sprintf(buf, "QLogic ISP1020 SCSI on PCI bus %d device %d irq %d base 0x%x",
-	    hostdata->bus, (hostdata->device_fn & 0xf8) >> 3, hostdata->irq,
-	    hostdata->io_base);
+	hostdata = (struct isp1020_hostdata *) host->hostdata;
+	sprintf(buf,
+		"QLogic ISP1020 SCSI on PCI bus %d device %d irq %d base 0x%x",
+		hostdata->bus, (hostdata->device_fn & 0xf8) >> 3, host->irq,
+		host->io_port);
 
-    LEAVE("isp1020_info");
+	LEAVE("isp1020_info");
 
-    return buf;
+	return buf;
 }
 
 
-#define REQ_QUEUE_DEPTH() \
-    (hostdata->req_queue_in_ptr >= hostdata->req_queue_out_ptr \
-        ? hostdata->req_queue_in_ptr - hostdata->req_queue_out_ptr \
-        : (REQ_QUEUE_LEN - hostdata->req_queue_out_ptr) \
-        + hostdata->req_queue_in_ptr)
-    
-
-int isp1020_queuecommand(Scsi_Cmnd *Cmnd, void (* done)(Scsi_Cmnd *))
+/*
+ * The middle SCSI layer ensures that queuecommand never gets invoked
+ * concurrently with itself or the interrupt handler (though the
+ * interrupt handler may call this routine as part of
+ * request-completion handling).
+ */
+int isp1020_queuecommand(Scsi_Cmnd *Cmnd, void (*done)(Scsi_Cmnd *))
 {
-    int i, *iptr, sg_count;
-    struct scatterlist *sg;
-    struct Command_Entry *cmd;
-    struct isp1020_hostdata *hostdata;
-    unsigned long flags;
-
-    ENTER("isp1020_queuecommand");
+	int i, sg_count, n, num_free;
+	u_int in_ptr, out_ptr;
+	struct dataseg * ds;
+	struct scatterlist *sg;
+	struct Command_Entry *cmd;
+	struct Continuation_Entry *cont;
+	struct Scsi_Host *host;
+	struct isp1020_hostdata *hostdata;
+
+	ENTER("isp1020_queuecommand");
+
+	host = Cmnd->host;
+	hostdata = (struct isp1020_hostdata *) host->hostdata;
+	Cmnd->scsi_done = done;
+
+	DEBUG(isp1020_print_scsi_cmd(Cmnd));
+
+	out_ptr = inw(host->io_port + MBOX4);
+	in_ptr  = hostdata->req_in_ptr;
+
+	DEBUG(printk("qlogicisp : request queue depth %d\n",
+		     REQ_QUEUE_DEPTH(in_ptr, out_ptr)));
+
+	cmd = (struct Command_Entry *) &hostdata->req[in_ptr][0];
+	in_ptr = (in_ptr + 1) & QLOGICISP_REQ_QUEUE_LEN;
+	if (in_ptr == out_ptr) {
+		printk("qlogicisp : request queue overflow\n");
+		return 1;
+	}
+
+	if (hostdata->send_marker) {
+		struct Marker_Entry *marker;
+
+		TRACE("queue marker", in_ptr, 0);
+
+		DEBUG(printk("qlogicisp : adding marker entry\n"));
+		marker = (struct Marker_Entry *) cmd;
+		memset(marker, 0, sizeof(struct Marker_Entry));
+
+		marker->hdr.entry_type = ENTRY_MARKER;
+		marker->hdr.entry_cnt = 1;
+		marker->modifier = SYNC_ALL;
+
+		hostdata->send_marker = 0;
+
+		if (((in_ptr + 1) & QLOGICISP_REQ_QUEUE_LEN) == out_ptr) {
+			outw(in_ptr, host->io_port + MBOX4);
+			hostdata->req_in_ptr = in_ptr;
+			printk("qlogicisp : request queue overflow\n");
+			return 1;
+		}
+		cmd = (struct Command_Entry *) &hostdata->req[in_ptr][0];
+		in_ptr = (in_ptr + 1) & QLOGICISP_REQ_QUEUE_LEN;
+	}
+
+	TRACE("queue command", in_ptr, Cmnd);
+
+	memset(cmd, 0, sizeof(struct Command_Entry));
+
+	cmd->hdr.entry_type = ENTRY_COMMAND;
+	cmd->hdr.entry_cnt = 1;
+
+	cmd->handle = (u_int) virt_to_bus(Cmnd);
+	cmd->target_lun = Cmnd->lun;
+	cmd->target_id = Cmnd->target;
+	cmd->cdb_length = Cmnd->cmd_len;
+	cmd->control_flags = CFLAG_READ | CFLAG_WRITE;
+	cmd->time_out = 30;
+
+	memcpy(cmd->cdb, Cmnd->cmnd, Cmnd->cmd_len);
+
+	if (Cmnd->use_sg) {
+		cmd->segment_cnt = sg_count = Cmnd->use_sg;
+		sg = (struct scatterlist *) Cmnd->request_buffer;
+		ds = cmd->dataseg;
+
+		/* fill in first four sg entries: */
+		n = sg_count;
+		if (n > 4)
+			n = 4;
+		for (i = 0; i < n; i++) {
+			ds[i].d_base  = (u_int) virt_to_bus(sg->address);
+			ds[i].d_count = sg->length;
+			++sg;
+		}
+		sg_count -= 4;
+
+		while (sg_count > 0) {
+			++cmd->hdr.entry_cnt;
+			cont = (struct Continuation_Entry *)
+				&hostdata->req[in_ptr][0];
+			in_ptr = (in_ptr + 1) & QLOGICISP_REQ_QUEUE_LEN;
+			if (in_ptr == out_ptr) {
+				printk("isp1020: unexpected request queue "
+				       "overflow\n");
+				return 1;
+			}
+			TRACE("queue continuation", in_ptr, 0);
+			cont->hdr.entry_type = ENTRY_CONTINUATION;
+			cont->hdr.entry_cnt  = 0;
+			cont->hdr.sys_def_1  = 0;
+			cont->hdr.flags      = 0;
+			cont->reserved = 0;
+			ds = cont->dataseg;
+			n = sg_count;
+			if (n > 7)
+				n = 7;
+			for (i = 0; i < n; ++i) {
+				ds[i].d_base = (u_int)virt_to_bus(sg->address);
+				ds[i].d_count = sg->length;
+				++sg;
+			}
+			sg_count -= n;
+		}
+	} else {
+		cmd->dataseg[0].d_base =
+			(u_int) virt_to_bus(Cmnd->request_buffer);
+		cmd->dataseg[0].d_count =
+			(u_int) Cmnd->request_bufflen;
+		cmd->segment_cnt = 1;
+	}
+
+	outw(in_ptr, host->io_port + MBOX4);
+	hostdata->req_in_ptr = in_ptr;
+
+	num_free = QLOGICISP_REQ_QUEUE_LEN - REQ_QUEUE_DEPTH(in_ptr, out_ptr);
+	host->can_queue = host->host_busy + num_free;
+	host->sg_tablesize = QLOGICISP_MAX_SG(num_free);
 
-    hostdata = (struct isp1020_hostdata *) Cmnd->host->hostdata;
-    Cmnd->scsi_done = done;
+	LEAVE("isp1020_queuecommand");
 
-    DEBUG(isp1020_print_scsi_cmd(Cmnd);)
-
-    save_flags(flags);
-    cli();
-
-    hostdata->req_queue_out_ptr = inw(hostdata->io_base + MBOX4);
-
-    if ((hostdata->req_queue_in_ptr + 1) % REQ_QUEUE_LEN ==
-            hostdata->req_queue_out_ptr) {
-        restore_flags(flags);
-        printk("qlogicisp : request queue overflow\n");
-        return 1;
-    }
-
-    DEBUG(printk("qlogicisp : request queue depth %d\n", REQ_QUEUE_DEPTH()));
+	return 0;
+}
 
-    cmd = (struct Command_Entry *)
-        &hostdata->req_queue[hostdata->req_queue_in_ptr][0];
 
-    memset(cmd, 0, sizeof(struct Command_Entry));
+#define ASYNC_EVENT_INTERRUPT	0x01
 
-    cmd->hdr.entry_type = ENTRY_COMMAND;
-    cmd->hdr.entry_cnt = 1;
+void isp1020_intr_handler(int irq, void *dev_id, struct pt_regs *regs)
+{
+	Scsi_Cmnd *Cmnd;
+	struct Status_Entry *sts;
+	struct Scsi_Host *host;
+	struct isp1020_hostdata *hostdata;
+	u_int in_ptr, out_ptr;
+	u_short status;
+
+	ENTER_INTR("isp1020_intr_handler");
+
+	host = irq2host[irq];
+	if (!host) {
+		printk("qlogicisp : unexpected interrupt on line %d\n", irq);
+		return;
+	}
+	hostdata = (struct isp1020_hostdata *) host->hostdata;
+
+	DEBUG_INTR(printk("qlogicisp : interrupt on line %d\n", irq));
+
+	if (!(inw(host->io_port + PCI_INTF_STS) & 0x04)) {
+		/* spurious interrupts can happen legally */
+		DEBUG_INTR(printk("qlogicisp: got spurious interrupt\n"));
+		return;
+	}
+	in_ptr = inw(host->io_port + MBOX5);
+	outw(HCCR_CLEAR_RISC_INTR, host->io_port + HOST_HCCR);
+
+	if ((inw(host->io_port + PCI_SEMAPHORE) & ASYNC_EVENT_INTERRUPT)) {
+		status = inw(host->io_port + MBOX0);
+
+		DEBUG_INTR(printk("qlogicisp : mbox completion status: %x\n",
+				  status));
+
+		switch (status) {
+		      case ASYNC_SCSI_BUS_RESET:
+		      case EXECUTION_TIMEOUT_RESET:
+			hostdata->send_marker = 1;
+			break;
+		      case INVALID_COMMAND:
+		      case HOST_INTERFACE_ERROR:
+		      case COMMAND_ERROR:
+		      case COMMAND_PARAM_ERROR:
+			printk("qlogicisp : bad mailbox return status\n");
+			break;
+		}
+		outw(0x0, host->io_port + PCI_SEMAPHORE);
+	}
+	out_ptr = hostdata->res_out_ptr;
+
+	DEBUG_INTR(printk("qlogicisp : response queue update\n"));
+	DEBUG_INTR(printk("qlogicisp : response queue depth %d\n",
+			  QUEUE_DEPTH(in_ptr, out_ptr)));
+
+	while (out_ptr != in_ptr) {
+		sts = (struct Status_Entry *) &hostdata->res[out_ptr][0];
+		out_ptr = (out_ptr + 1) & RES_QUEUE_LEN;
+
+		Cmnd = (Scsi_Cmnd *) bus_to_virt(sts->handle);
+
+		TRACE("done", out_ptr, Cmnd);
+
+		if (sts->completion_status == CS_RESET_OCCURRED
+		    || sts->completion_status == CS_ABORTED
+		    || (sts->status_flags & STF_BUS_RESET))
+			hostdata->send_marker = 1;
+
+		if (sts->state_flags & SF_GOT_SENSE)
+			memcpy(Cmnd->sense_buffer, sts->req_sense_data,
+			       sizeof(Cmnd->sense_buffer));
+
+		DEBUG_INTR(isp1020_print_status_entry(sts));
+
+		if (sts->hdr.entry_type == ENTRY_STATUS)
+			Cmnd->result = isp1020_return_status(sts);
+		else
+			Cmnd->result = DID_ERROR << 16;
+
+		outw(out_ptr, host->io_port + MBOX5);
+		(*Cmnd->scsi_done)(Cmnd);
+	}
+	hostdata->res_out_ptr = out_ptr;
 
-    cmd->handle = (u_int) virt_to_bus(Cmnd);
-    cmd->target_lun = Cmnd->lun;
-    cmd->target_id = Cmnd->target;
-    cmd->cdb_length = Cmnd->cmd_len;
-    cmd->control_flags = CFLAG_READ | CFLAG_WRITE;
-    cmd->time_out = 30;
+	LEAVE_INTR("isp1020_intr_handler");
+}
 
-    for (i = 0; i < Cmnd->cmd_len; i++)
-        cmd->cdb[i] = Cmnd->cmnd[i];
 
-    if (Cmnd->use_sg) {
-        cmd->segment_cnt = sg_count = Cmnd->use_sg;
-        sg = (struct scatterlist *) Cmnd->request_buffer;
-        iptr = (int *) &cmd->dataseg0.d_base;
+static int isp1020_return_status(struct Status_Entry *sts)
+{
+	int host_status = DID_ERROR;
+#if DEBUG_ISP1020_INTR
+	static char *reason[] = {
+		"DID_OK",
+		"DID_NO_CONNECT",
+		"DID_BUS_BUSY",
+		"DID_TIME_OUT",
+		"DID_BAD_TARGET",
+		"DID_ABORT",
+		"DID_PARITY",
+		"DID_ERROR",
+		"DID_RESET",
+		"DID_BAD_INTR"
+	};
+#endif /* DEBUG_ISP1020_INTR */
 
-        for (i = 0; sg_count > 0; sg_count--, i++) {
-            *iptr++ = (int) virt_to_bus(sg[i].address);
-            *iptr++ = sg[i].length;
-        }
-    }
-    else {
-        cmd->dataseg0.d_base = (u_int) virt_to_bus(Cmnd->request_buffer);
-        cmd->dataseg0.d_count = (u_int) Cmnd->request_bufflen;
-        cmd->segment_cnt = 1;
-    }
+	ENTER("isp1020_return_status");
 
-    hostdata->req_queue_in_ptr = (hostdata->req_queue_in_ptr + 1)
-        % REQ_QUEUE_LEN;
+	DEBUG(printk("qlogicisp : completion status = 0x%04x\n",
+		     sts->completion_status));
 
-    outw(hostdata->req_queue_in_ptr, hostdata->io_base + MBOX4);
+	switch(sts->completion_status) {
+	      case CS_COMPLETE:
+		host_status = DID_OK;
+		break;
+	      case CS_INCOMPLETE:
+		if (!(sts->state_flags & SF_GOT_BUS))
+			host_status = DID_NO_CONNECT;
+		else if (!(sts->state_flags & SF_GOT_TARGET))
+			host_status = DID_BAD_TARGET;
+		else if (!(sts->state_flags & SF_SENT_CDB))
+			host_status = DID_ERROR;
+		else if (!(sts->state_flags & SF_TRANSFERRED_DATA))
+			host_status = DID_ERROR;
+		else if (!(sts->state_flags & SF_GOT_STATUS))
+			host_status = DID_ERROR;
+		else if (!(sts->state_flags & SF_GOT_SENSE))
+			host_status = DID_ERROR;
+		break;
+	      case CS_DMA_ERROR:
+	      case CS_TRANSPORT_ERROR:
+		host_status = DID_ERROR;
+		break;
+	      case CS_RESET_OCCURRED:
+		host_status = DID_RESET;
+		break;
+	      case CS_ABORTED:
+		host_status = DID_ABORT;
+		break;
+	      case CS_TIMEOUT:
+		host_status = DID_TIME_OUT;
+		break;
+	      case CS_DATA_OVERRUN:
+	      case CS_COMMAND_OVERRUN:
+	      case CS_STATUS_OVERRUN:
+	      case CS_BAD_MESSAGE:
+	      case CS_NO_MESSAGE_OUT:
+	      case CS_EXT_ID_FAILED:
+	      case CS_IDE_MSG_FAILED:
+	      case CS_ABORT_MSG_FAILED:
+	      case CS_NOP_MSG_FAILED:
+	      case CS_PARITY_ERROR_MSG_FAILED:
+	      case CS_DEVICE_RESET_MSG_FAILED:
+	      case CS_ID_MSG_FAILED:
+	      case CS_UNEXP_BUS_FREE:
+		host_status = DID_ERROR;
+		break;
+	      case CS_DATA_UNDERRUN:
+		host_status = DID_OK;
+		break;
+	      default:
+		printk("qlogicisp : unknown completion status 0x%04x\n",
+		       sts->completion_status);
+		host_status = DID_ERROR;
+		break;
+	}
 
-    restore_flags(flags);
+	DEBUG_INTR(printk("qlogicisp : host status (%s) scsi status %x\n",
+			  reason[host_status], sts->scsi_status));
 
-    LEAVE("isp1020_queuecommand");
+	LEAVE("isp1020_return_status");
 
-    return 0;
+	return (sts->scsi_status & STATUS_MASK) | (host_status << 16);
 }
 
 
-#define RES_QUEUE_DEPTH() \
-    (hostdata->res_queue_in_ptr >= hostdata->res_queue_out_ptr \
-        ? hostdata->res_queue_in_ptr - hostdata->res_queue_out_ptr \
-        : (RES_QUEUE_LEN - hostdata->res_queue_out_ptr) \
-        + hostdata->res_queue_in_ptr)
- 
-
 int isp1020_abort(Scsi_Cmnd *Cmnd)
 {
-    u_short param[6];
-    struct isp1020_hostdata *hostdata;
-    int return_status = SCSI_ABORT_SUCCESS;
-    u_int cmdaddr = virt_to_bus(Cmnd);
-
-    ENTER("isp1020_abort");
+	u_short param[6];
+	struct Scsi_Host *host;
+	struct isp1020_hostdata *hostdata;
+	int return_status = SCSI_ABORT_SUCCESS;
+	u_int cmdaddr = virt_to_bus(Cmnd);
 
-    hostdata = (struct isp1020_hostdata *) Cmnd->host->hostdata;
+	ENTER("isp1020_abort");
 
-    isp1020_disable_irqs(hostdata);
+	host = Cmnd->host;
+	hostdata = (struct isp1020_hostdata *) host->hostdata;
 
-    DEBUG(printk("qlogicisp : response queue depth %d\n", RES_QUEUE_DEPTH()));
+	isp1020_disable_irqs(host);
 
-    param[0] = MBOX_ABORT;
-    param[1] = (((u_short) Cmnd->target) << 8) | Cmnd->lun;
-    param[2] = cmdaddr >> 16;
-    param[3] = cmdaddr & 0xffff;
+	param[0] = MBOX_ABORT;
+	param[1] = (((u_short) Cmnd->target) << 8) | Cmnd->lun;
+	param[2] = cmdaddr >> 16;
+	param[3] = cmdaddr & 0xffff;
 
-    isp1020_mbox_command(hostdata, param);
+	isp1020_mbox_command(host, param);
 
-    if (param[0] != MBOX_COMMAND_COMPLETE) {
-        printk("qlogicisp : scsi abort failure: %x\n", param[0]);
-        return_status = SCSI_ABORT_ERROR;
-    }
+	if (param[0] != MBOX_COMMAND_COMPLETE) {
+		printk("qlogicisp : scsi abort failure: %x\n", param[0]);
+		return_status = SCSI_ABORT_ERROR;
+	}
 
-    isp1020_enable_irqs(hostdata);
+	isp1020_enable_irqs(host);
 
-    LEAVE("isp1020_abort");
+	LEAVE("isp1020_abort");
 
-    return return_status;
+	return return_status;
 }
 
 
 int isp1020_reset(Scsi_Cmnd *Cmnd, unsigned int reset_flags)
 {
-    u_short param[6];
-    struct isp1020_hostdata *hostdata;
-    int return_status = SCSI_RESET_SUCCESS;
+	u_short param[6];
+	struct Scsi_Host *host;
+	struct isp1020_hostdata *hostdata;
+	int return_status = SCSI_RESET_SUCCESS;
 
-    ENTER("isp1020_reset");
+	ENTER("isp1020_reset");
 
-    hostdata = (struct isp1020_hostdata *) Cmnd->host->hostdata;
+	host = Cmnd->host;
+	hostdata = (struct isp1020_hostdata *) host->hostdata;
 
-    param[0] = MBOX_BUS_RESET;
-    param[1] = hostdata->host_param.bus_reset_delay;
+	param[0] = MBOX_BUS_RESET;
+	param[1] = hostdata->host_param.bus_reset_delay;
 
-    isp1020_disable_irqs(hostdata);
+	isp1020_disable_irqs(host);
 
-    isp1020_mbox_command(hostdata, param);
+	isp1020_mbox_command(host, param);
 
-    if (param[0] != MBOX_COMMAND_COMPLETE) {
-        printk("qlogicisp : scsi bus reset failure: %x\n", param[0]);
-        return_status = SCSI_RESET_ERROR;
-    }
-	
-    isp1020_enable_irqs(hostdata);
+	if (param[0] != MBOX_COMMAND_COMPLETE) {
+		printk("qlogicisp : scsi bus reset failure: %x\n", param[0]);
+		return_status = SCSI_RESET_ERROR;
+	}
+
+	isp1020_enable_irqs(host);
 
-    LEAVE("isp1020_reset");
+	LEAVE("isp1020_reset");
 
-    return return_status;;
+	return return_status;;
 }
 
 
 int isp1020_biosparam(Disk *disk, kdev_t n, int ip[])
 {
-    int size = disk->capacity;
+	int size = disk->capacity;
 
-    ENTER("isp1020_biosparam");
+	ENTER("isp1020_biosparam");
 
-    ip[0] = 64;
-    ip[1] = 32;
-    ip[2] = size >> 11;
-    if (ip[2] > 1024) {
-        ip[0] = 255;
-        ip[1] = 63;
-        ip[2] = size / (ip[0] * ip[1]);
-        if (ip[2] > 1023)
-            ip[2] = 1023;
-    }
+	ip[0] = 64;
+	ip[1] = 32;
+	ip[2] = size >> 11;
+	if (ip[2] > 1024) {
+		ip[0] = 255;
+		ip[1] = 63;
+		ip[2] = size / (ip[0] * ip[1]);
+		if (ip[2] > 1023)
+			ip[2] = 1023;
+	}
 
-    LEAVE("isp1020_biosparam");
+	LEAVE("isp1020_biosparam");
 
-    return 0;
+	return 0;
 }
 
 
-int isp1020_reset_hardware(struct isp1020_hostdata *hostdata)
+static int isp1020_reset_hardware(struct Scsi_Host *host)
 {
-    u_short param[6];
-    int loop_count;
+	u_short param[6];
+	int loop_count;
 
-    ENTER("isp1020_reset_hardware");
+	ENTER("isp1020_reset_hardware");
 
-    outw(ISP_RESET, hostdata->io_base + PCI_INTF_CTL);
-    outw(HCCR_RESET, hostdata->io_base + HOST_HCCR);
-    outw(HCCR_RELEASE, hostdata->io_base + HOST_HCCR);
-    outw(HCCR_BIOS_DISABLE, hostdata->io_base + HOST_HCCR);
+	outw(ISP_RESET, host->io_port + PCI_INTF_CTL);
+	outw(HCCR_RESET, host->io_port + HOST_HCCR);
+	outw(HCCR_RELEASE, host->io_port + HOST_HCCR);
+	outw(HCCR_BIOS_DISABLE, host->io_port + HOST_HCCR);
 
-    loop_count = DEFAULT_LOOP_COUNT;
-    while (--loop_count && inw(hostdata->io_base + HOST_HCCR) == RISC_BUSY)
-        barrier();
-    if (!loop_count)
-        printk("qlogicisp: reset_hardware loop timeout\n");
+	loop_count = DEFAULT_LOOP_COUNT;
+	while (--loop_count && inw(host->io_port + HOST_HCCR) == RISC_BUSY)
+		barrier();
+	if (!loop_count)
+		printk("qlogicisp: reset_hardware loop timeout\n");
 
-    outw(0, hostdata->io_base + ISP_CFG1);
+	outw(0, host->io_port + ISP_CFG1);
 
 #if DEBUG_ISP1020
-    printk("qlogicisp : mbox 0 0x%04x \n", inw(hostdata->io_base + MBOX0));
-    printk("qlogicisp : mbox 1 0x%04x \n", inw(hostdata->io_base + MBOX1));
-    printk("qlogicisp : mbox 2 0x%04x \n", inw(hostdata->io_base + MBOX2));
-    printk("qlogicisp : mbox 3 0x%04x \n", inw(hostdata->io_base + MBOX3));
-    printk("qlogicisp : mbox 4 0x%04x \n", inw(hostdata->io_base + MBOX4));
-    printk("qlogicisp : mbox 5 0x%04x \n", inw(hostdata->io_base + MBOX5));
+	printk("qlogicisp : mbox 0 0x%04x \n", inw(host->io_port + MBOX0));
+	printk("qlogicisp : mbox 1 0x%04x \n", inw(host->io_port + MBOX1));
+	printk("qlogicisp : mbox 2 0x%04x \n", inw(host->io_port + MBOX2));
+	printk("qlogicisp : mbox 3 0x%04x \n", inw(host->io_port + MBOX3));
+	printk("qlogicisp : mbox 4 0x%04x \n", inw(host->io_port + MBOX4));
+	printk("qlogicisp : mbox 5 0x%04x \n", inw(host->io_port + MBOX5));
 #endif /* DEBUG_ISP1020 */
 
-    DEBUG(printk("qlogicisp : loading risc ram\n");)
+	DEBUG(printk("qlogicisp : loading risc ram\n"));
 
 #if RELOAD_FIRMWARE
-    { int i;
-        for (i = 0; i < risc_code_length01; i++) {
-            param[0] = MBOX_WRITE_RAM_WORD;
-            param[1] = risc_code_addr01 + i;
-            param[2] = risc_code01[i];
-
-            isp1020_mbox_command(hostdata, param);
-
-            if (param[0] != MBOX_COMMAND_COMPLETE) {
-                printk("qlogicisp : firmware load failure\n");
-                return 1;
-            }
-        }
-    }
+	{
+		int i;
+		for (i = 0; i < risc_code_length01; i++) {
+			param[0] = MBOX_WRITE_RAM_WORD;
+			param[1] = risc_code_addr01 + i;
+			param[2] = risc_code01[i];
+
+			isp1020_mbox_command(host, param);
+
+			if (param[0] != MBOX_COMMAND_COMPLETE) {
+				printk("qlogicisp : firmware load failure\n");
+				return 1;
+			}
+		}
+	}
 #endif /* RELOAD_FIRMWARE */
 
-    DEBUG(printk("qlogicisp : verifying checksum\n");)
+	DEBUG(printk("qlogicisp : verifying checksum\n"));
 
-    param[0] = MBOX_VERIFY_CHECKSUM;
-    param[1] = risc_code_addr01;
+	param[0] = MBOX_VERIFY_CHECKSUM;
+	param[1] = risc_code_addr01;
 
-    isp1020_mbox_command(hostdata, param);
+	isp1020_mbox_command(host, param);
 
-    if (param[0] != MBOX_COMMAND_COMPLETE) {
-        printk("qlogicisp : ram checksum failure\n");
-        return 1;
-    }
+	if (param[0] != MBOX_COMMAND_COMPLETE) {
+		printk("qlogicisp : ram checksum failure\n");
+		return 1;
+	}
 
-    DEBUG(printk("qlogicisp : executing firmware\n");)
+	DEBUG(printk("qlogicisp : executing firmware\n"));
 
-    param[0] = MBOX_EXEC_FIRMWARE;
-    param[1] = risc_code_addr01;
+	param[0] = MBOX_EXEC_FIRMWARE;
+	param[1] = risc_code_addr01;
 
-    isp1020_mbox_command(hostdata, param);
+	isp1020_mbox_command(host, param);
 
-    param[0] = MBOX_ABOUT_FIRMWARE;
+	param[0] = MBOX_ABOUT_FIRMWARE;
 
-    isp1020_mbox_command(hostdata, param);
+	isp1020_mbox_command(host, param);
 
-    if (param[0] != MBOX_COMMAND_COMPLETE) {
-        printk("qlogicisp : about firmware failure\n");
-        return 1;
-    }
+	if (param[0] != MBOX_COMMAND_COMPLETE) {
+		printk("qlogicisp : about firmware failure\n");
+		return 1;
+	}
 
-    DEBUG(printk("qlogicisp : firmware major revision %d\n", param[1]);)
-    DEBUG(printk("qlogicisp : firmware minor revision %d\n", param[2]);)
+	DEBUG(printk("qlogicisp : firmware major revision %d\n", param[1]));
+	DEBUG(printk("qlogicisp : firmware minor revision %d\n", param[2]));
 
-    LEAVE("isp1020_reset_hardware");
+	LEAVE("isp1020_reset_hardware");
 
-    return 0;
+	return 0;
 }
 
 
-int isp1020_init(struct Scsi_Host *sh)
+static int isp1020_init(struct Scsi_Host *sh)
 {
-    u_int io_base;
-    struct isp1020_hostdata *hostdata;
-    u_char bus, device_fn, revision, irq;
-    u_short vendor_id, device_id, command;
+	u_int io_base;
+	struct isp1020_hostdata *hostdata;
+	u_char bus, device_fn, revision, irq;
+	u_short vendor_id, device_id, command;
 
-    ENTER("isp1020_init");
+	ENTER("isp1020_init");
 
-    hostdata = (struct isp1020_hostdata *) sh->hostdata;
-    bus = hostdata->bus;
-    device_fn = hostdata->device_fn;
+	hostdata = (struct isp1020_hostdata *) sh->hostdata;
+	bus = hostdata->bus;
+	device_fn = hostdata->device_fn;
 
-    if (pcibios_read_config_word(bus, device_fn, PCI_VENDOR_ID, &vendor_id)
+	if (pcibios_read_config_word(bus, device_fn, PCI_VENDOR_ID, &vendor_id)
             || pcibios_read_config_word(bus, device_fn,
-                PCI_DEVICE_ID, &device_id)
+					PCI_DEVICE_ID, &device_id)
             || pcibios_read_config_word(bus, device_fn,
-                PCI_COMMAND, &command)
+					PCI_COMMAND, &command)
             || pcibios_read_config_dword(bus, device_fn,
-                PCI_BASE_ADDRESS_0, &io_base)
+					 PCI_BASE_ADDRESS_0, &io_base)
 	    || pcibios_read_config_byte(bus, device_fn,
-                PCI_CLASS_REVISION, &revision)
+					PCI_CLASS_REVISION, &revision)
             || pcibios_read_config_byte(bus, device_fn,
-                PCI_INTERRUPT_LINE, &irq)) {
-        printk("qlogicisp : error reading PCI configuration\n");
-        return 1;
-    }
-
-    if (vendor_id != PCI_VENDOR_ID_QLOGIC) {
-        printk("qlogicisp : 0x%04x is not QLogic vendor ID\n", vendor_id);
-        return 1;
-    }
-
-    if (device_id != PCI_DEVICE_ID_QLOGIC_ISP1020) {
-        printk("qlogicisp : 0x%04x does not match ISP1020 device id\n",
-            device_id);
-        return 1;
-    }
-
-    if (command & PCI_COMMAND_IO && (io_base & 3) == 1)
-        io_base &= PCI_BASE_ADDRESS_IO_MASK;
-    else {
-        printk("qlogicisp : i/o mapping is disabled\n");
-        return 1;
-    }
-
-    if (!(command & PCI_COMMAND_MASTER)) {
-        printk("qlogicisp : bus mastering is disabled\n");
-        return 1;
-    }
-
-    if (revision != ISP1020_REV_ID)
-       printk("qlogicisp : new isp1020 revision ID (%d)\n", revision);
-
-    if (inw(io_base + PCI_ID_LOW) != PCI_VENDOR_ID_QLOGIC
-            || inw(io_base + PCI_ID_HIGH) != PCI_DEVICE_ID_QLOGIC_ISP1020) {
-        printk("qlogicisp : can't decode i/o address space\n");
-        return 1;
-    }
-
-    hostdata->io_base = io_base;
-    hostdata->revision = revision;
-    hostdata->irq = irq;
-
-    LEAVE("isp1020_init");
-
-    return 0;
-}
-
-
-int isp1020_get_defaults(struct isp1020_hostdata *hostdata)
-{
-    int i;
-    u_short value;
-
-    ENTER("isp1020_get_defaults");
-
-    if (!isp1020_verify_nvram(hostdata)) {
-        printk("qlogicisp : nvram checksum failure\n");
-        printk("qlogicisp : attempting to use default parameters\n");
-        return isp1020_set_defaults(hostdata);
-    }
-
-    value = isp1020_read_nvram_word(hostdata, 2);
-    hostdata->host_param.fifo_threshold = (value >> 8) & 0x03;
-    hostdata->host_param.host_adapter_enable = (value >> 11) & 0x01;
-    hostdata->host_param.initiator_scsi_id = (value >> 12) & 0x0f;
-
-    value = isp1020_read_nvram_word(hostdata, 3);
-    hostdata->host_param.bus_reset_delay = value & 0xff;
-    hostdata->host_param.retry_count = value >> 8;
-
-    value = isp1020_read_nvram_word(hostdata, 4);
-    hostdata->host_param.retry_delay = value & 0xff;
-    hostdata->host_param.async_data_setup_time = (value >> 8) & 0x0f;
-    hostdata->host_param.req_ack_active_negation = (value >> 12) & 0x01;
-    hostdata->host_param.data_line_active_negation = (value >> 13) & 0x01;
-    hostdata->host_param.data_dma_burst_enable = (value >> 14) & 0x01;
-    hostdata->host_param.command_dma_burst_enable = (value >> 15);
+					PCI_INTERRUPT_LINE, &irq))
+	{
+		printk("qlogicisp : error reading PCI configuration\n");
+		return 1;
+	}
+
+	if (vendor_id != PCI_VENDOR_ID_QLOGIC) {
+		printk("qlogicisp : 0x%04x is not QLogic vendor ID\n",
+		       vendor_id);
+		return 1;
+	}
+
+	if (device_id != PCI_DEVICE_ID_QLOGIC_ISP1020) {
+		printk("qlogicisp : 0x%04x does not match ISP1020 device id\n",
+		       device_id);
+		return 1;
+	}
+
+	if (command & PCI_COMMAND_IO && (io_base & 3) == 1)
+		io_base &= PCI_BASE_ADDRESS_IO_MASK;
+	else {
+		printk("qlogicisp : i/o mapping is disabled\n");
+		return 1;
+	}
+
+	if (!(command & PCI_COMMAND_MASTER)) {
+		printk("qlogicisp : bus mastering is disabled\n");
+		return 1;
+	}
+
+	if (revision != ISP1020_REV_ID)
+		printk("qlogicisp : new isp1020 revision ID (%d)\n", revision);
+
+	if (inw(io_base + PCI_ID_LOW) != PCI_VENDOR_ID_QLOGIC
+	    || inw(io_base + PCI_ID_HIGH) != PCI_DEVICE_ID_QLOGIC_ISP1020)
+	{
+		printk("qlogicisp : can't decode i/o address space\n");
+		return 1;
+	}
 
-    value = isp1020_read_nvram_word(hostdata, 5);
-    hostdata->host_param.tag_aging = value & 0xff;
+	hostdata->revision = revision;
 
-    value = isp1020_read_nvram_word(hostdata, 6);
-    hostdata->host_param.selection_timeout = value & 0xffff;
+	sh->irq = irq;
+	sh->io_port = io_base;
 
-    value = isp1020_read_nvram_word(hostdata, 7);
-    hostdata->host_param.max_queue_depth = value & 0xffff;
+	LEAVE("isp1020_init");
 
-#if DEBUG_ISP1020_SETUP
-    printk("qlogicisp : fifo threshold=%d\n",
-        hostdata->host_param.fifo_threshold);
-    printk("qlogicisp : initiator scsi id=%d\n",
-        hostdata->host_param.initiator_scsi_id);
-    printk("qlogicisp : bus reset delay=%d\n",
-        hostdata->host_param.bus_reset_delay);
-    printk("qlogicisp : retry count=%d\n",
-	hostdata->host_param.retry_count);
-    printk("qlogicisp : retry delay=%d\n",
-        hostdata->host_param.retry_delay);
-    printk("qlogicisp : async data setup time=%d\n",
-        hostdata->host_param.async_data_setup_time);
-    printk("qlogicisp : req/ack active negation=%d\n",
-        hostdata->host_param.req_ack_active_negation);
-    printk("qlogicisp : data line active negation=%d\n",
-        hostdata->host_param.data_line_active_negation);
-    printk("qlogicisp : data DMA burst enable=%d\n",
-        hostdata->host_param.data_dma_burst_enable);
-    printk("qlogicisp : command DMA burst enable=%d\n",
-        hostdata->host_param.command_dma_burst_enable);
-    printk("qlogicisp : tag age limit=%d\n",
-        hostdata->host_param.tag_aging);
-    printk("qlogicisp : selection timeout limit=%d\n",
-        hostdata->host_param.selection_timeout);
-    printk("qlogicisp : max queue depth=%d\n",
-        hostdata->host_param.max_queue_depth);
-#endif /* DEBUG_ISP1020_SETUP */
-
-    for (i = 0; i < MAX_TARGETS; i++) {
-
-        value = isp1020_read_nvram_word(hostdata, 14 + i * 3);
-        hostdata->dev_param[i].device_flags = value & 0xff;
-        hostdata->dev_param[i].execution_throttle = value >> 8;
-
-        value = isp1020_read_nvram_word(hostdata, 15 + i * 3);
-        hostdata->dev_param[i].synchronous_period = value & 0xff;
-        hostdata->dev_param[i].synchronous_offset = (value >> 8) & 0x0f;
-        hostdata->dev_param[i].device_enable = (value >> 12) & 0x01;
-
-#if DEBUG_ISP1020_SETUP
-        printk("qlogicisp : target 0x%02x\n", i);
-        printk("qlogicisp :     device flags=0x%02x\n",
-            hostdata->dev_param[i].device_flags);
-        printk("qlogicisp :     execution throttle=%d\n",
-            hostdata->dev_param[i].execution_throttle);
-        printk("qlogicisp :     synchronous period=%d\n",
-            hostdata->dev_param[i].synchronous_period);
-        printk("qlogicisp :     synchronous offset=%d\n",
-            hostdata->dev_param[i].synchronous_offset);
-        printk("qlogicisp :     device enable=%d\n",
-            hostdata->dev_param[i].device_enable);
-#endif /* DEBUG_ISP1020_SETUP */
-    }
-
-    LEAVE("isp1020_get_defaults");
-
-    return 0;
+	return 0;
 }
 
 
-int isp1020_set_defaults(struct isp1020_hostdata *hostdata)
-{
-    int i;
-
-    ENTER("isp1020_set_defaults");
-
-    hostdata->host_param.fifo_threshold = 2;
-    hostdata->host_param.host_adapter_enable = 1;
-    hostdata->host_param.initiator_scsi_id = 7;
-    hostdata->host_param.bus_reset_delay = 3;
-    hostdata->host_param.retry_count = 0;
-    hostdata->host_param.retry_delay = 1;
-    hostdata->host_param.async_data_setup_time = 6;
-    hostdata->host_param.req_ack_active_negation = 1;
-    hostdata->host_param.data_line_active_negation = 1;
-    hostdata->host_param.data_dma_burst_enable = 1;
-    hostdata->host_param.command_dma_burst_enable = 1;
-    hostdata->host_param.tag_aging = 8;
-    hostdata->host_param.selection_timeout = 250;
-    hostdata->host_param.max_queue_depth = 256;
-
-    for (i = 0; i < MAX_TARGETS; i++) {
-        hostdata->dev_param[i].device_flags = 0xfd;
-        hostdata->dev_param[i].execution_throttle = 16;
-        hostdata->dev_param[i].synchronous_period = 25;
-        hostdata->dev_param[i].synchronous_offset = 12;
-        hostdata->dev_param[i].device_enable = 1;
-    }
-
-    LEAVE("isp1020_set_defaults");
-
-    return 0;
-}
-
+#if USE_NVRAM_DEFAULTS
 
-int isp1020_load_parameters(struct isp1020_hostdata *hostdata)
+static int isp1020_get_defaults(struct Scsi_Host *host)
 {
-    int i, k;
-    u_int queue_addr;
-    u_short param[6];
-    u_short isp_cfg1;
-    unsigned long flags;
-
-    ENTER("isp1020_load_parameters");
-
-    save_flags(flags);
-    cli();
-
-    outw(hostdata->host_param.fifo_threshold, hostdata->io_base + ISP_CFG1);
-
-    param[0] = MBOX_SET_INIT_SCSI_ID;
-    param[1] = hostdata->host_param.initiator_scsi_id;
+	int i;
+	u_short value;
+	struct isp1020_hostdata *hostdata =
+		(struct isp1020_hostdata *) host->hostdata;
+
+	ENTER("isp1020_get_defaults");
+
+	if (!isp1020_verify_nvram(host)) {
+		printk("qlogicisp : nvram checksum failure\n");
+		printk("qlogicisp : attempting to use default parameters\n");
+		return isp1020_set_defaults(host);
+	}
+
+	value = isp1020_read_nvram_word(host, 2);
+	hostdata->host_param.fifo_threshold = (value >> 8) & 0x03;
+	hostdata->host_param.host_adapter_enable = (value >> 11) & 0x01;
+	hostdata->host_param.initiator_scsi_id = (value >> 12) & 0x0f;
+
+	value = isp1020_read_nvram_word(host, 3);
+	hostdata->host_param.bus_reset_delay = value & 0xff;
+	hostdata->host_param.retry_count = value >> 8;
+
+	value = isp1020_read_nvram_word(host, 4);
+	hostdata->host_param.retry_delay = value & 0xff;
+	hostdata->host_param.async_data_setup_time = (value >> 8) & 0x0f;
+	hostdata->host_param.req_ack_active_negation = (value >> 12) & 0x01;
+	hostdata->host_param.data_line_active_negation = (value >> 13) & 0x01;
+	hostdata->host_param.data_dma_burst_enable = (value >> 14) & 0x01;
+	hostdata->host_param.command_dma_burst_enable = (value >> 15);
 
-    isp1020_mbox_command(hostdata, param);
+	value = isp1020_read_nvram_word(host, 5);
+	hostdata->host_param.tag_aging = value & 0xff;
 
-    if (param[0] != MBOX_COMMAND_COMPLETE) {
-	restore_flags(flags);
-        printk("qlogicisp : set initiator id failure\n");
-        return 1;
-    }
-
-    param[0] = MBOX_SET_RETRY_COUNT;
-    param[1] = hostdata->host_param.retry_count;
-    param[2] = hostdata->host_param.retry_delay;
-
-    isp1020_mbox_command(hostdata, param);
-
-    if (param[0] != MBOX_COMMAND_COMPLETE) {
-	restore_flags(flags);
-        printk("qlogicisp : set retry count failure\n");
-        return 1;
-    }
+	value = isp1020_read_nvram_word(host, 6);
+	hostdata->host_param.selection_timeout = value & 0xffff;
 
-    param[0] = MBOX_SET_ASYNC_DATA_SETUP_TIME;
-    param[1] = hostdata->host_param.async_data_setup_time;
+	value = isp1020_read_nvram_word(host, 7);
+	hostdata->host_param.max_queue_depth = value & 0xffff;
 
-    isp1020_mbox_command(hostdata, param);
-
-    if (param[0] != MBOX_COMMAND_COMPLETE) {
-	restore_flags(flags);
-        printk("qlogicisp : async data setup time failure\n");
-        return 1;
-    }
-
-    param[0] = MBOX_SET_ACTIVE_NEG_STATE;
-    param[1] = (hostdata->host_param.req_ack_active_negation << 4)
-        | (hostdata->host_param.data_line_active_negation << 5);
-
-    isp1020_mbox_command(hostdata, param);
-
-    if (param[0] != MBOX_COMMAND_COMPLETE) {
-	restore_flags(flags);
-        printk("qlogicisp : set active negation state failure\n");
-        return 1;
-    }
-
-    param[0] = MBOX_SET_PCI_CONTROL_PARAMS;
-    param[1] = hostdata->host_param.data_dma_burst_enable << 1;
-    param[2] = hostdata->host_param.command_dma_burst_enable << 1;
-
-    isp1020_mbox_command(hostdata, param);
-
-    if (param[0] != MBOX_COMMAND_COMPLETE) {
-	restore_flags(flags);
-        printk("qlogicisp : set pci control parameter failure\n");
-        return 1;
-    }
-
-    isp_cfg1 = inw(hostdata->io_base + ISP_CFG1);
-
-    if (hostdata->host_param.data_dma_burst_enable 
-            || hostdata->host_param.command_dma_burst_enable)
-        isp_cfg1 |= 0x0004;
-    else
-        isp_cfg1 &= 0xfffb;
-
-    outw(isp_cfg1, hostdata->io_base + ISP_CFG1);
-			
-    param[0] = MBOX_SET_TAG_AGE_LIMIT;
-    param[1] = hostdata->host_param.tag_aging;
-
-    isp1020_mbox_command(hostdata, param);
-
-    if (param[0] != MBOX_COMMAND_COMPLETE) {
-	restore_flags(flags);
-        printk("qlogicisp : set tag age limit failure\n");
-        return 1;
-    }
-
-    param[0] = MBOX_SET_SELECT_TIMEOUT;
-    param[1] = hostdata->host_param.selection_timeout;
-
-    isp1020_mbox_command(hostdata, param);
-
-    if (param[0] != MBOX_COMMAND_COMPLETE) {
-	restore_flags(flags);
-        printk("qlogicisp : set selection timeout failure\n");
-        return 1;
-    }
-
-    for (i = 0; i < MAX_TARGETS; i++) {
-
-        if (!hostdata->dev_param[i].device_enable)
-            continue;
-
-        param[0] = MBOX_SET_TARGET_PARAMS;
-        param[1] = i << 8;
-        param[2] = hostdata->dev_param[i].device_flags << 8;
-        param[3] = (hostdata->dev_param[i].synchronous_offset << 8)
-            | hostdata->dev_param[i].synchronous_period;
-
-        isp1020_mbox_command(hostdata, param);
-
-        if (param[0] != MBOX_COMMAND_COMPLETE) {
-	    restore_flags(flags);
-            printk("qlogicisp : set target parameter failure\n");
-            return 1;
-        }
-
-        for (k = 0; k < MAX_LUNS; k++) {
-
-            param[0] = MBOX_SET_DEV_QUEUE_PARAMS;
-            param[1] = (i << 8) | k;
-            param[2] = hostdata->host_param.max_queue_depth;
-            param[3] = hostdata->dev_param[i].execution_throttle;
-
-            isp1020_mbox_command(hostdata, param);
-
-            if (param[0] != MBOX_COMMAND_COMPLETE) {
-	        restore_flags(flags);
-                printk("qlogicisp : set device queue parameter failure\n");
-                return 1;
-            }
-        }
-    }
-
-    queue_addr = (u_int) virt_to_bus(&hostdata->res_queue[0][0]);
-
-    param[0] = MBOX_INIT_RES_QUEUE;
-    param[1] = RES_QUEUE_LEN;
-    param[2] = (u_short) (queue_addr >> 16);
-    param[3] = (u_short) (queue_addr & 0xffff);
-    param[4] = 0;
-    param[5] = 0;
+#if DEBUG_ISP1020_SETUP
+	printk("qlogicisp : fifo threshold=%d\n",
+	       hostdata->host_param.fifo_threshold);
+	printk("qlogicisp : initiator scsi id=%d\n",
+	       hostdata->host_param.initiator_scsi_id);
+	printk("qlogicisp : bus reset delay=%d\n",
+	       hostdata->host_param.bus_reset_delay);
+	printk("qlogicisp : retry count=%d\n",
+	       hostdata->host_param.retry_count);
+	printk("qlogicisp : retry delay=%d\n",
+	       hostdata->host_param.retry_delay);
+	printk("qlogicisp : async data setup time=%d\n",
+	       hostdata->host_param.async_data_setup_time);
+	printk("qlogicisp : req/ack active negation=%d\n",
+	       hostdata->host_param.req_ack_active_negation);
+	printk("qlogicisp : data line active negation=%d\n",
+	       hostdata->host_param.data_line_active_negation);
+	printk("qlogicisp : data DMA burst enable=%d\n",
+	       hostdata->host_param.data_dma_burst_enable);
+	printk("qlogicisp : command DMA burst enable=%d\n",
+	       hostdata->host_param.command_dma_burst_enable);
+	printk("qlogicisp : tag age limit=%d\n",
+	       hostdata->host_param.tag_aging);
+	printk("qlogicisp : selection timeout limit=%d\n",
+	       hostdata->host_param.selection_timeout);
+	printk("qlogicisp : max queue depth=%d\n",
+	       hostdata->host_param.max_queue_depth);
+#endif /* DEBUG_ISP1020_SETUP */
 
-    isp1020_mbox_command(hostdata, param);
+	for (i = 0; i < MAX_TARGETS; i++) {
 
-    if (param[0] != MBOX_COMMAND_COMPLETE) {
-	restore_flags(flags);
-        printk("qlogicisp : set response queue failure\n");
-        return 1;
-    }
+		value = isp1020_read_nvram_word(host, 14 + i * 3);
+		hostdata->dev_param[i].device_flags = value & 0xff;
+		hostdata->dev_param[i].execution_throttle = value >> 8;
+
+		value = isp1020_read_nvram_word(host, 15 + i * 3);
+		hostdata->dev_param[i].synchronous_period = value & 0xff;
+		hostdata->dev_param[i].synchronous_offset = (value >> 8) & 0x0f;
+		hostdata->dev_param[i].device_enable = (value >> 12) & 0x01;
 
-    queue_addr = (u_int) virt_to_bus(&hostdata->req_queue[0][0]);
+#if DEBUG_ISP1020_SETUP
+		printk("qlogicisp : target 0x%02x\n", i);
+		printk("qlogicisp :     device flags=0x%02x\n",
+		       hostdata->dev_param[i].device_flags);
+		printk("qlogicisp :     execution throttle=%d\n",
+		       hostdata->dev_param[i].execution_throttle);
+		printk("qlogicisp :     synchronous period=%d\n",
+		       hostdata->dev_param[i].synchronous_period);
+		printk("qlogicisp :     synchronous offset=%d\n",
+		       hostdata->dev_param[i].synchronous_offset);
+		printk("qlogicisp :     device enable=%d\n",
+		       hostdata->dev_param[i].device_enable);
+#endif /* DEBUG_ISP1020_SETUP */
+	}
 
-    param[0] = MBOX_INIT_REQ_QUEUE;
-    param[1] = REQ_QUEUE_LEN;
-    param[2] = (u_short) (queue_addr >> 16);
-    param[3] = (u_short) (queue_addr & 0xffff);
-    param[4] = 0;
+	LEAVE("isp1020_get_defaults");
 
-    isp1020_mbox_command(hostdata, param);
+	return 0;
+}
 
-    if (param[0] != MBOX_COMMAND_COMPLETE) {
-	restore_flags(flags);
-        printk("qlogicisp : set request queue failure\n");
-        return 1;
-    }
 
-    restore_flags(flags);
+#define ISP1020_NVRAM_LEN	0x40
+#define ISP1020_NVRAM_SIG1	0x5349
+#define ISP1020_NVRAM_SIG2	0x2050
 
-    LEAVE("isp1020_load_parameters");
+static int isp1020_verify_nvram(struct Scsi_Host *host)
+{
+	int	i;
+	u_short value;
+	u_char checksum = 0;
+
+	for (i = 0; i < ISP1020_NVRAM_LEN; i++) {
+		value = isp1020_read_nvram_word(host, i);
+
+		switch (i) {
+		      case 0:
+			if (value != ISP1020_NVRAM_SIG1) return 0;
+			break;
+		      case 1:
+			if (value != ISP1020_NVRAM_SIG2) return 0;
+			break;
+		      case 2:
+			if ((value & 0xff) != 0x02) return 0;
+			break;
+		}
+		checksum += value & 0xff;
+		checksum += value >> 8;
+	}
 
-    return 0;
+	return (checksum == 0);
 }
 
+#define NVRAM_DELAY() udelay(2) /* 2 microsecond delay */
 
-/*
- * currently, this is only called during initialization or abort/reset,
- * at which times interrupts are disabled, so polling is OK, I guess...
- */
-int isp1020_mbox_command(struct isp1020_hostdata *hostdata, u_short param[])
+
+u_short isp1020_read_nvram_word(struct Scsi_Host *host, u_short byte)
 {
-    int loop_count;
+	int i;
+	u_short value, output, input;
 
-    if (mbox_param[param[0]] == 0)
-        return 1;
+	byte &= 0x3f; byte |= 0x0180;
 
-    loop_count = DEFAULT_LOOP_COUNT;
-    while (--loop_count && inw(hostdata->io_base + HOST_HCCR) & 0x0080)
-        barrier();
-    if (!loop_count)
-        printk("qlogicisp: mbox_command loop timeout #1\n");
-
-    switch(mbox_param[param[0]] >> 4) {
-        case 6: outw(param[5], hostdata->io_base + MBOX5);
-        case 5: outw(param[4], hostdata->io_base + MBOX4);
-        case 4: outw(param[3], hostdata->io_base + MBOX3);
-        case 3: outw(param[2], hostdata->io_base + MBOX2);
-        case 2: outw(param[1], hostdata->io_base + MBOX1);
-        case 1: outw(param[0], hostdata->io_base + MBOX0);
-    }
-
-    outw(0x0, hostdata->io_base + PCI_SEMAPHORE);
-    outw(HCCR_CLEAR_RISC_INTR, hostdata->io_base + HOST_HCCR);
-    outw(HCCR_SET_HOST_INTR, hostdata->io_base + HOST_HCCR);
-
-    loop_count = DEFAULT_LOOP_COUNT;
-    while (--loop_count && !(inw(hostdata->io_base + PCI_INTF_STS) & 0x04))
-        barrier();
-    if (!loop_count)
-        printk("qlogicisp: mbox_command loop timeout #2\n");
-
-    loop_count = DEFAULT_LOOP_COUNT;
-    while (--loop_count && inw(hostdata->io_base + MBOX0) == 0x04)
-        barrier();
-    if (!loop_count)
-        printk("qlogicisp: mbox_command loop timeout #3\n");
-
-    switch(mbox_param[param[0]] & 0xf) {
-        case 6: param[5] = inw(hostdata->io_base + MBOX5);
-        case 5: param[4] = inw(hostdata->io_base + MBOX4);
-        case 4: param[3] = inw(hostdata->io_base + MBOX3);
-        case 3: param[2] = inw(hostdata->io_base + MBOX2);
-        case 2: param[1] = inw(hostdata->io_base + MBOX1);
-        case 1: param[0] = inw(hostdata->io_base + MBOX0);
-    }
+	for (i = 8; i >= 0; i--) {
+		output = ((byte >> i) & 0x1) ? 0x4 : 0x0;
+		outw(output | 0x2, host->io_port + PCI_NVRAM); NVRAM_DELAY();
+		outw(output | 0x3, host->io_port + PCI_NVRAM); NVRAM_DELAY();
+		outw(output | 0x2, host->io_port + PCI_NVRAM); NVRAM_DELAY();
+	}
+
+	for (i = 0xf, value = 0; i >= 0; i--) {
+		value <<= 1;
+		outw(0x3, host->io_port + PCI_NVRAM); NVRAM_DELAY();
+		input = inw(host->io_port + PCI_NVRAM); NVRAM_DELAY();
+		outw(0x2, host->io_port + PCI_NVRAM); NVRAM_DELAY();
+		if (input & 0x8) value |= 1;
+	}
 
-    outw(0x0, hostdata->io_base + PCI_SEMAPHORE);
-    outw(HCCR_CLEAR_RISC_INTR, hostdata->io_base + HOST_HCCR);
+	outw(0x0, host->io_port + PCI_NVRAM); NVRAM_DELAY();
 
-    return 0;
+	return value;
 }
 
+#endif /* USE_NVRAM_DEFAULTS */
 
-#define MAILBOX_INTERRUPT	0x01
 
-void isp1020_intr_handler(int irq, void *dev_id, struct pt_regs *regs)
+static int isp1020_set_defaults(struct Scsi_Host *host)
 {
-    Scsi_Cmnd *Cmnd;
-    struct Status_Entry *sts;
-    struct Marker_Entry *marker;
-    u_short status, add_marker = 0;
-    struct isp1020_hostdata *hostdata;
-    int loop_count;
-
-    ENTER_INTR("isp1020_intr_handler");
-
-    if ((hostdata = irq2host[irq]) == NULL) {
-        printk("qlogicisp : unexpected interrupt on line %d\n", irq);
-        return;
-    }
-
-    DEBUG_INTR(printk("qlogicisp : interrupt on line %d\n", irq);)
-
-    loop_count = DEFAULT_LOOP_COUNT;
-    while (--loop_count && !(inw(hostdata->io_base + PCI_INTF_STS) & 0x04))
-        barrier();
-    if (!loop_count)
-        printk("qlogicisp: intr_handler loop timeout\n");
-
-    status = inw(hostdata->io_base + PCI_SEMAPHORE);
-
-    if ((status & MAILBOX_INTERRUPT) == 0) {
+	struct isp1020_hostdata *hostdata =
+		(struct isp1020_hostdata *) host->hostdata;
+	int i;
+
+	ENTER("isp1020_set_defaults");
+
+	hostdata->host_param.fifo_threshold = 2;
+	hostdata->host_param.host_adapter_enable = 1;
+	hostdata->host_param.initiator_scsi_id = 7;
+	hostdata->host_param.bus_reset_delay = 3;
+	hostdata->host_param.retry_count = 0;
+	hostdata->host_param.retry_delay = 1;
+	hostdata->host_param.async_data_setup_time = 6;
+	hostdata->host_param.req_ack_active_negation = 1;
+	hostdata->host_param.data_line_active_negation = 1;
+	hostdata->host_param.data_dma_burst_enable = 1;
+	hostdata->host_param.command_dma_burst_enable = 1;
+	hostdata->host_param.tag_aging = 8;
+	hostdata->host_param.selection_timeout = 250;
+	hostdata->host_param.max_queue_depth = 256;
+
+	for (i = 0; i < MAX_TARGETS; i++) {
+		hostdata->dev_param[i].device_flags = 0xfd;
+		hostdata->dev_param[i].execution_throttle = 16;
+		hostdata->dev_param[i].synchronous_period = 25;
+		hostdata->dev_param[i].synchronous_offset = 12;
+		hostdata->dev_param[i].device_enable = 1;
+	}
+
+	LEAVE("isp1020_set_defaults");
+
+	return 0;
+}
 
-        hostdata->res_queue_in_ptr = inw(hostdata->io_base + MBOX5);
-	outw(HCCR_CLEAR_RISC_INTR, hostdata->io_base + HOST_HCCR);
 
-        DEBUG_INTR(printk("qlogicisp : response queue update\n");)
-        DEBUG_INTR(printk("qlogicisp : response queue depth %d\n",
-            RES_QUEUE_DEPTH());)
+static int isp1020_load_parameters(struct Scsi_Host *host)
+{
+	int i, k;
+	u_int queue_addr;
+	u_short param[6];
+	u_short isp_cfg1;
+	unsigned long flags;
+	struct isp1020_hostdata *hostdata =
+		(struct isp1020_hostdata *) host->hostdata;
 
-        while (hostdata->res_queue_out_ptr != hostdata->res_queue_in_ptr) {
+	ENTER("isp1020_load_parameters");
 
-            sts = (struct Status_Entry *)
-                &hostdata->res_queue[hostdata->res_queue_out_ptr][0];
+	save_flags(flags);
+	cli();
 
-            Cmnd = (Scsi_Cmnd *) bus_to_virt(sts->handle);
+	outw(hostdata->host_param.fifo_threshold, host->io_port + ISP_CFG1);
 
-            if (sts->completion_status == CS_RESET_OCCURRED
-                    || sts->completion_status == CS_ABORTED
-                    || (sts->status_flags & STF_BUS_RESET))
-                add_marker++;
+	param[0] = MBOX_SET_INIT_SCSI_ID;
+	param[1] = hostdata->host_param.initiator_scsi_id;
 
-            if (sts->state_flags & SF_GOT_SENSE)
-                memcpy(Cmnd->sense_buffer, sts->req_sense_data,
-		       sizeof(Cmnd->sense_buffer));
+	isp1020_mbox_command(host, param);
 
-            DEBUG_INTR(isp1020_print_status_entry(sts);)
+	if (param[0] != MBOX_COMMAND_COMPLETE) {
+		restore_flags(flags);
+		printk("qlogicisp : set initiator id failure\n");
+		return 1;
+	}
 
-            if (sts->hdr.entry_type == ENTRY_STATUS)
-                Cmnd->result = isp1020_return_status(sts);
-            else
-                Cmnd->result = DID_ERROR << 16;
+	param[0] = MBOX_SET_RETRY_COUNT;
+	param[1] = hostdata->host_param.retry_count;
+	param[2] = hostdata->host_param.retry_delay;
 
-            hostdata->res_queue_out_ptr = (hostdata->res_queue_out_ptr + 1)
-                % RES_QUEUE_LEN;
+	isp1020_mbox_command(host, param);
 
-            outw(hostdata->res_queue_out_ptr, hostdata->io_base + MBOX5);
+	if (param[0] != MBOX_COMMAND_COMPLETE) {
+		restore_flags(flags);
+		printk("qlogicisp : set retry count failure\n");
+		return 1;
+	}
 
-            (Cmnd->scsi_done)(Cmnd);
-        }
-    }
-    else {
+	param[0] = MBOX_SET_ASYNC_DATA_SETUP_TIME;
+	param[1] = hostdata->host_param.async_data_setup_time;
 
-        status = inw(hostdata->io_base + MBOX0);
+	isp1020_mbox_command(host, param);
 
-        DEBUG_INTR(printk("qlogicisp : mbox completion status: %x\n", status);)
+	if (param[0] != MBOX_COMMAND_COMPLETE) {
+		restore_flags(flags);
+		printk("qlogicisp : async data setup time failure\n");
+		return 1;
+	}
 
-        switch (status) {
-            case ASYNC_SCSI_BUS_RESET:
-            case EXECUTION_TIMEOUT_RESET:
-                add_marker++;
-                break;
-            case INVALID_COMMAND:
-            case HOST_INTERFACE_ERROR:
-            case COMMAND_ERROR:
-            case COMMAND_PARAM_ERROR:
-                printk("qlogicisp : bad mailbox return status\n");
-                break;
-        }
+	param[0] = MBOX_SET_ACTIVE_NEG_STATE;
+	param[1] = (hostdata->host_param.req_ack_active_negation << 4)
+		| (hostdata->host_param.data_line_active_negation << 5);
 
-        outw(0x0, hostdata->io_base + PCI_SEMAPHORE);
-	outw(HCCR_CLEAR_RISC_INTR, hostdata->io_base + HOST_HCCR);
-    }
+	isp1020_mbox_command(host, param);
 
-    if (add_marker) {
-#if 0
-        unsigned long flags;
+	if (param[0] != MBOX_COMMAND_COMPLETE) {
+		restore_flags(flags);
+		printk("qlogicisp : set active negation state failure\n");
+		return 1;
+	}
 
-	save_flags(flags);
-	cli();
-#endif
+	param[0] = MBOX_SET_PCI_CONTROL_PARAMS;
+	param[1] = hostdata->host_param.data_dma_burst_enable << 1;
+	param[2] = hostdata->host_param.command_dma_burst_enable << 1;
 
-        DEBUG_INTR(printk("qlogicisp : adding marker entry\n");)
+	isp1020_mbox_command(host, param);
 
-        if ((hostdata->req_queue_in_ptr + 1) % REQ_QUEUE_LEN
-                == hostdata->req_queue_out_ptr) {
-#if 0
-	    restore_flags(flags);
-#endif
-            printk("qlogicisp : request queue overflow\n");
-            return;
-        }
+	if (param[0] != MBOX_COMMAND_COMPLETE) {
+		restore_flags(flags);
+		printk("qlogicisp : set pci control parameter failure\n");
+		return 1;
+	}
 
-        marker = (struct Marker_Entry *)
-            &hostdata->req_queue[hostdata->req_queue_in_ptr][0];
+	isp_cfg1 = inw(host->io_port + ISP_CFG1);
 
-        memset(marker, 0, sizeof(struct Marker_Entry));
-
-        marker->hdr.entry_type = ENTRY_MARKER;
-        marker->hdr.entry_cnt = 1;
-        marker->modifier = SYNC_ALL;
-
-        hostdata->req_queue_in_ptr = (hostdata->req_queue_in_ptr + 1)
-            % REQ_QUEUE_LEN;
-
-        outw(hostdata->req_queue_in_ptr, hostdata->io_base + MBOX4);
+	if (hostdata->host_param.data_dma_burst_enable 
+            || hostdata->host_param.command_dma_burst_enable)
+		isp_cfg1 |= 0x0004;
+	else
+		isp_cfg1 &= 0xfffb;
+
+	outw(isp_cfg1, host->io_port + ISP_CFG1);
+
+	param[0] = MBOX_SET_TAG_AGE_LIMIT;
+	param[1] = hostdata->host_param.tag_aging;
+
+	isp1020_mbox_command(host, param);
+
+	if (param[0] != MBOX_COMMAND_COMPLETE) {
+		restore_flags(flags);
+		printk("qlogicisp : set tag age limit failure\n");
+		return 1;
+	}
+
+	param[0] = MBOX_SET_SELECT_TIMEOUT;
+	param[1] = hostdata->host_param.selection_timeout;
+
+	isp1020_mbox_command(host, param);
+
+	if (param[0] != MBOX_COMMAND_COMPLETE) {
+		restore_flags(flags);
+		printk("qlogicisp : set selection timeout failure\n");
+		return 1;
+	}
+
+	for (i = 0; i < MAX_TARGETS; i++) {
+
+		if (!hostdata->dev_param[i].device_enable)
+			continue;
+
+		param[0] = MBOX_SET_TARGET_PARAMS;
+		param[1] = i << 8;
+		param[2] = hostdata->dev_param[i].device_flags << 8;
+		param[3] = (hostdata->dev_param[i].synchronous_offset << 8)
+			| hostdata->dev_param[i].synchronous_period;
+
+		isp1020_mbox_command(host, param);
+
+		if (param[0] != MBOX_COMMAND_COMPLETE) {
+			restore_flags(flags);
+			printk("qlogicisp : set target parameter failure\n");
+			return 1;
+		}
+
+		for (k = 0; k < MAX_LUNS; k++) {
+
+			param[0] = MBOX_SET_DEV_QUEUE_PARAMS;
+			param[1] = (i << 8) | k;
+			param[2] = hostdata->host_param.max_queue_depth;
+			param[3] = hostdata->dev_param[i].execution_throttle;
+
+			isp1020_mbox_command(host, param);
+
+			if (param[0] != MBOX_COMMAND_COMPLETE) {
+				restore_flags(flags);
+				printk("qlogicisp : set device queue "
+				       "parameter failure\n");
+				return 1;
+			}
+		}
+	}
+
+	queue_addr = (u_int) virt_to_bus(&hostdata->res[0][0]);
+
+	param[0] = MBOX_INIT_RES_QUEUE;
+	param[1] = RES_QUEUE_LEN + 1;
+	param[2] = (u_short) (queue_addr >> 16);
+	param[3] = (u_short) (queue_addr & 0xffff);
+	param[4] = 0;
+	param[5] = 0;
+
+	isp1020_mbox_command(host, param);
+
+	if (param[0] != MBOX_COMMAND_COMPLETE) {
+		restore_flags(flags);
+		printk("qlogicisp : set response queue failure\n");
+		return 1;
+	}
+
+	queue_addr = (u_int) virt_to_bus(&hostdata->req[0][0]);
+
+	param[0] = MBOX_INIT_REQ_QUEUE;
+	param[1] = QLOGICISP_REQ_QUEUE_LEN + 1;
+	param[2] = (u_short) (queue_addr >> 16);
+	param[3] = (u_short) (queue_addr & 0xffff);
+	param[4] = 0;
+
+	isp1020_mbox_command(host, param);
+
+	if (param[0] != MBOX_COMMAND_COMPLETE) {
+		restore_flags(flags);
+		printk("qlogicisp : set request queue failure\n");
+		return 1;
+	}
 
-#if 0
 	restore_flags(flags);
-#endif
-    }
 
-    isp1020_enable_irqs(hostdata);
+	LEAVE("isp1020_load_parameters");
 
-    LEAVE_INTR("isp1020_intr_handler");
+	return 0;
 }
 
 
-#define NVRAM_DELAY() udelay(2) /* 2 microsecond delay */
-
-
-u_short isp1020_read_nvram_word(struct isp1020_hostdata *hostdata, u_short byte)
-{
-    int i;
-    u_short value, output, input;
-
-    byte &= 0x3f; byte |= 0x0180;
-
-    for (i = 8; i >= 0; i--) {
-        output = ((byte >> i) & 0x1) ? 0x4 : 0x0;
-        outw(output | 0x2, hostdata->io_base + PCI_NVRAM); NVRAM_DELAY();
-        outw(output | 0x3, hostdata->io_base + PCI_NVRAM); NVRAM_DELAY();
-        outw(output | 0x2, hostdata->io_base + PCI_NVRAM); NVRAM_DELAY();
-    }
-
-    for (i = 0xf, value = 0; i >= 0; i--) {
-        value <<= 1;
-        outw(0x3, hostdata->io_base + PCI_NVRAM); NVRAM_DELAY();
-        input = inw(hostdata->io_base + PCI_NVRAM); NVRAM_DELAY();
-        outw(0x2, hostdata->io_base + PCI_NVRAM); NVRAM_DELAY();
-        if (input & 0x8) value |= 1;
-    }
-
-    outw(0x0, hostdata->io_base + PCI_NVRAM); NVRAM_DELAY();
-
-    return(value);
-}
-
-#define ISP1020_NVRAM_LEN	0x40
-#define ISP1020_NVRAM_SIG1	0x5349
-#define ISP1020_NVRAM_SIG2	0x2050
-
-int isp1020_verify_nvram(struct isp1020_hostdata *hostdata)
+/*
+ * currently, this is only called during initialization or abort/reset,
+ * at which times interrupts are disabled, so polling is OK, I guess...
+ */
+static int isp1020_mbox_command(struct Scsi_Host *host, u_short param[])
 {
-    int	i;
-    u_short value;
-    u_char checksum = 0;
-
-    for (i = 0; i < ISP1020_NVRAM_LEN; i++) {
-        value = isp1020_read_nvram_word(hostdata, i);
-
-        switch (i) {
-            case 0:
-                if (value != ISP1020_NVRAM_SIG1) return 0;
-                break;
-            case 1:
-                if (value != ISP1020_NVRAM_SIG2) return 0;
-                break;
-            case 2:
-                if ((value & 0xff) != 0x02) return 0;
-                break;
-        }
-        checksum += value & 0xff;
-        checksum += value >> 8;
-    }
-
-    return (checksum == 0);
-}
+	int loop_count;
 
+	if (mbox_param[param[0]] == 0)
+		return 1;
 
-void isp1020_enable_irqs(struct isp1020_hostdata *hostdata)
-{
-    outw(ISP_EN_INT|ISP_EN_RISC, hostdata->io_base + PCI_INTF_CTL);
-}
+	loop_count = DEFAULT_LOOP_COUNT;
+	while (--loop_count && inw(host->io_port + HOST_HCCR) & 0x0080)
+		barrier();
+	if (!loop_count)
+		printk("qlogicisp: mbox_command loop timeout #1\n");
+
+	switch(mbox_param[param[0]] >> 4) {
+	      case 6: outw(param[5], host->io_port + MBOX5);
+	      case 5: outw(param[4], host->io_port + MBOX4);
+	      case 4: outw(param[3], host->io_port + MBOX3);
+	      case 3: outw(param[2], host->io_port + MBOX2);
+	      case 2: outw(param[1], host->io_port + MBOX1);
+	      case 1: outw(param[0], host->io_port + MBOX0);
+	}
+
+	outw(0x0, host->io_port + PCI_SEMAPHORE);
+	outw(HCCR_CLEAR_RISC_INTR, host->io_port + HOST_HCCR);
+	outw(HCCR_SET_HOST_INTR, host->io_port + HOST_HCCR);
+
+	loop_count = DEFAULT_LOOP_COUNT;
+	while (--loop_count && !(inw(host->io_port + PCI_INTF_STS) & 0x04))
+		barrier();
+	if (!loop_count)
+		printk("qlogicisp: mbox_command loop timeout #2\n");
+
+	loop_count = DEFAULT_LOOP_COUNT;
+	while (--loop_count && inw(host->io_port + MBOX0) == 0x04)
+		barrier();
+	if (!loop_count)
+		printk("qlogicisp: mbox_command loop timeout #3\n");
+
+	switch(mbox_param[param[0]] & 0xf) {
+	      case 6: param[5] = inw(host->io_port + MBOX5);
+	      case 5: param[4] = inw(host->io_port + MBOX4);
+	      case 4: param[3] = inw(host->io_port + MBOX3);
+	      case 3: param[2] = inw(host->io_port + MBOX2);
+	      case 2: param[1] = inw(host->io_port + MBOX1);
+	      case 1: param[0] = inw(host->io_port + MBOX0);
+	}
 
+	outw(0x0, host->io_port + PCI_SEMAPHORE);
+	outw(HCCR_CLEAR_RISC_INTR, host->io_port + HOST_HCCR);
 
-void isp1020_disable_irqs(struct isp1020_hostdata *hostdata)
-{
-    outw(0x0, hostdata->io_base + PCI_INTF_CTL);
+	return 0;
 }
 
 
@@ -1554,20 +1715,20 @@
 
 void isp1020_print_status_entry(struct Status_Entry *status)
 {
-    int i;
+	int i;
 
-    printk("qlogicisp : entry count = 0x%02x, type = 0x%02x, flags = 0x%02x\n",
-        status->hdr.entry_cnt, status->hdr.entry_type, status->hdr.flags);
-    printk("qlogicisp : scsi status = 0x%04x, completion status = 0x%04x\n",
-        status->scsi_status, status->completion_status);
-    printk("qlogicisp : state flags = 0x%04x, status flags = 0x%04x\n",
-        status->state_flags, status->status_flags);
-    printk("qlogicisp : time = 0x%04x, request sense length = 0x%04x\n",
-        status->time, status->req_sense_len);
-    printk("qlogicisp : residual transfer length = 0x%08x\n", status->residual);
+	printk("qlogicisp : entry count = 0x%02x, type = 0x%02x, flags = 0x%02x\n",
+	       status->hdr.entry_cnt, status->hdr.entry_type, status->hdr.flags);
+	printk("qlogicisp : scsi status = 0x%04x, completion status = 0x%04x\n",
+	       status->scsi_status, status->completion_status);
+	printk("qlogicisp : state flags = 0x%04x, status flags = 0x%04x\n",
+	       status->state_flags, status->status_flags);
+	printk("qlogicisp : time = 0x%04x, request sense length = 0x%04x\n",
+	       status->time, status->req_sense_len);
+	printk("qlogicisp : residual transfer length = 0x%08x\n", status->residual);
 
-    for (i = 0; i < status->req_sense_len; i++)
-        printk("qlogicisp : sense data = 0x%02x\n", status->req_sense_data[i]);
+	for (i = 0; i < status->req_sense_len; i++)
+		printk("qlogicisp : sense data = 0x%02x\n", status->req_sense_data[i]);
 }
 
 #endif /* DEBUG_ISP1020_INTR */
@@ -1577,105 +1738,18 @@
 
 void isp1020_print_scsi_cmd(Scsi_Cmnd *cmd)
 {
-    int i;
+	int i;
 
-    printk("qlogicisp : target = 0x%02x, lun = 0x%02x, cmd_len = 0x%02x\n",
-	cmd->target, cmd->lun, cmd->cmd_len);
-    printk("qlogicisp : command = ");
-    for (i = 0; i < cmd->cmd_len; i++)
-        printk("0x%02x ", cmd->cmnd[i]);
-    printk("\n");
+	printk("qlogicisp : target = 0x%02x, lun = 0x%02x, cmd_len = 0x%02x\n",
+	       cmd->target, cmd->lun, cmd->cmd_len);
+	printk("qlogicisp : command = ");
+	for (i = 0; i < cmd->cmd_len; i++)
+		printk("0x%02x ", cmd->cmnd[i]);
+	printk("\n");
 }
 
 #endif /* DEBUG_ISP1020 */
 
-
-int isp1020_return_status(struct Status_Entry *sts)
-{
-    int host_status = DID_ERROR;
-#if DEBUG_ISP1020_INTR
-    static char *reason[] = {
-        "DID_OK",
-        "DID_NO_CONNECT",
-        "DID_BUS_BUSY",
-        "DID_TIME_OUT",
-        "DID_BAD_TARGET",
-        "DID_ABORT",
-        "DID_PARITY",
-        "DID_ERROR",
-        "DID_RESET",
-        "DID_BAD_INTR"
-    };
-#endif /* DEBUG_ISP1020_INTR */
-
-    ENTER("isp1020_return_status");
-
-    DEBUG(printk("qlogicisp : completion status = 0x%04x\n",
-        sts->completion_status);)
-
-    switch(sts->completion_status) {
-        case CS_COMPLETE:
-            host_status = DID_OK;
-            break;
-        case CS_INCOMPLETE:
-            if (!(sts->state_flags & SF_GOT_BUS))
-                host_status = DID_NO_CONNECT;
-            else if (!(sts->state_flags & SF_GOT_TARGET))
-                host_status = DID_BAD_TARGET;
-            else if (!(sts->state_flags & SF_SENT_CDB))
-                host_status = DID_ERROR;
-            else if (!(sts->state_flags & SF_TRANSFERRED_DATA))
-                host_status = DID_ERROR;
-            else if (!(sts->state_flags & SF_GOT_STATUS))
-                host_status = DID_ERROR;
-            else if (!(sts->state_flags & SF_GOT_SENSE))
-                host_status = DID_ERROR;
-                break;
-        case CS_DMA_ERROR:
-        case CS_TRANSPORT_ERROR:
-            host_status = DID_ERROR;
-            break;
-        case CS_RESET_OCCURRED:
-            host_status = DID_RESET;
-            break;
-        case CS_ABORTED:
-            host_status = DID_ABORT;
-            break;
-        case CS_TIMEOUT:
-            host_status = DID_TIME_OUT;
-            break;
-        case CS_DATA_OVERRUN:
-        case CS_COMMAND_OVERRUN:
-        case CS_STATUS_OVERRUN:
-        case CS_BAD_MESSAGE:
-        case CS_NO_MESSAGE_OUT:
-        case CS_EXT_ID_FAILED:
-        case CS_IDE_MSG_FAILED:
-        case CS_ABORT_MSG_FAILED:
-        case CS_NOP_MSG_FAILED:
-        case CS_PARITY_ERROR_MSG_FAILED:
-        case CS_DEVICE_RESET_MSG_FAILED:
-        case CS_ID_MSG_FAILED:
-        case CS_UNEXP_BUS_FREE:
-            host_status = DID_ERROR;
-            break;
-        case CS_DATA_UNDERRUN:
-            host_status = DID_OK;
-            break;
-        default:
-            printk("qlogicisp : unknown completion status 0x%04x\n",
-                sts->completion_status);
-            host_status = DID_ERROR;
-            break;
-    }
-
-    DEBUG_INTR(printk("qlogicisp : host status (%s) scsi status %x\n",
-        reason[host_status], sts->scsi_status);)
-
-    LEAVE("isp1020_return_status");
-
-    return (sts->scsi_status & STATUS_MASK) | (host_status << 16);
-}
 
 #ifdef MODULE
 Scsi_Host_Template driver_template = QLOGICISP;

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov