Merge branch 'linus'

Conflicts:

	drivers/scsi/ipr.c

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

27 files changed, 408 insertions, 266 deletions

diff --git a/drivers/scsi/NCR53C9x.c b/drivers/scsi/NCR53C9x.c
index 3c912ee29da0..8b5334c56f0a 100644
--- a/drivers/scsi/NCR53C9x.c
+++ b/drivers/scsi/NCR53C9x.c
@@ -528,12 +528,16 @@ void esp_bootup_reset(struct NCR_ESP *esp, struct ESP_regs *eregs)
 /* Allocate structure and insert basic data such as SCSI chip frequency
  * data and a pointer to the device
  */
-struct NCR_ESP* esp_allocate(struct scsi_host_template *tpnt, void *esp_dev)
+struct NCR_ESP* esp_allocate(struct scsi_host_template *tpnt, void *esp_dev,
+                             int hotplug)
 {
         struct NCR_ESP *esp, *elink;
         struct Scsi_Host *esp_host;
 
-        esp_host = scsi_register(tpnt, sizeof(struct NCR_ESP));
+        if (hotplug)
+                esp_host = scsi_host_alloc(tpnt, sizeof(struct NCR_ESP));
+        else
+                esp_host = scsi_register(tpnt, sizeof(struct NCR_ESP));
         if(!esp_host)
                 panic("Cannot register ESP SCSI host");
         esp = (struct NCR_ESP *) esp_host->hostdata;
diff --git a/drivers/scsi/NCR53C9x.h b/drivers/scsi/NCR53C9x.h
index 521e3f842cfd..d85cb73a9f69 100644
--- a/drivers/scsi/NCR53C9x.h
+++ b/drivers/scsi/NCR53C9x.h
@@ -652,7 +652,7 @@ extern int nesps, esps_in_use, esps_running;
 
 /* External functions */
 extern void esp_bootup_reset(struct NCR_ESP *esp, struct ESP_regs *eregs);
-extern struct NCR_ESP *esp_allocate(struct scsi_host_template *, void *);
+extern struct NCR_ESP *esp_allocate(struct scsi_host_template *, void *, int);
 extern void esp_deallocate(struct NCR_ESP *);
 extern void esp_release(void);
 extern void esp_initialize(struct NCR_ESP *);
diff --git a/drivers/scsi/blz1230.c b/drivers/scsi/blz1230.c
index 329a8f297b31..23f7c24ab809 100644
--- a/drivers/scsi/blz1230.c
+++ b/drivers/scsi/blz1230.c
@@ -121,7 +121,8 @@ int __init blz1230_esp_detect(struct scsi_host_template *tpnt)
                  */
                 address = ZTWO_VADDR(board);
                 eregs = (struct ESP_regs *)(address + REAL_BLZ1230_ESP_ADDR);
-                esp = esp_allocate(tpnt, (void *)board+REAL_BLZ1230_ESP_ADDR);
+                esp = esp_allocate(tpnt, (void *)board + REAL_BLZ1230_ESP_ADDR,
+                                   0);
 
                 esp_write(eregs->esp_cfg1, (ESP_CONFIG1_PENABLE | 7));
                 udelay(5);
diff --git a/drivers/scsi/blz2060.c b/drivers/scsi/blz2060.c
index b6c137b97350..b6203ec00961 100644
--- a/drivers/scsi/blz2060.c
+++ b/drivers/scsi/blz2060.c
@@ -100,7 +100,7 @@ int __init blz2060_esp_detect(struct scsi_host_template *tpnt)
             unsigned long board = z->resource.start;
             if (request_mem_region(board+BLZ2060_ESP_ADDR,
                                    sizeof(struct ESP_regs), "NCR53C9x")) {
-                esp = esp_allocate(tpnt, (void *)board+BLZ2060_ESP_ADDR);
+                esp = esp_allocate(tpnt, (void *)board + BLZ2060_ESP_ADDR, 0);
 
                 /* Do command transfer with programmed I/O */
                 esp->do_pio_cmds = 1;
diff --git a/drivers/scsi/cyberstorm.c b/drivers/scsi/cyberstorm.c
index 7c7cfb54e897..c6b98a42e89d 100644
--- a/drivers/scsi/cyberstorm.c
+++ b/drivers/scsi/cyberstorm.c
@@ -126,7 +126,7 @@ int __init cyber_esp_detect(struct scsi_host_template *tpnt)
                                            sizeof(struct ESP_regs));
                         return 0;
                 }
-                esp = esp_allocate(tpnt, (void *)board+CYBER_ESP_ADDR);
+                esp = esp_allocate(tpnt, (void *)board + CYBER_ESP_ADDR, 0);
 
                 /* Do command transfer with programmed I/O */
                 esp->do_pio_cmds = 1;
diff --git a/drivers/scsi/cyberstormII.c b/drivers/scsi/cyberstormII.c
index d88cb9cf091e..e336e853e66f 100644
--- a/drivers/scsi/cyberstormII.c
+++ b/drivers/scsi/cyberstormII.c
@@ -98,7 +98,7 @@ int __init cyberII_esp_detect(struct scsi_host_template *tpnt)
                 address = (unsigned long)ZTWO_VADDR(board);
                 eregs = (struct ESP_regs *)(address + CYBERII_ESP_ADDR);
 
-                esp = esp_allocate(tpnt, (void *)board+CYBERII_ESP_ADDR);
+                esp = esp_allocate(tpnt, (void *)board + CYBERII_ESP_ADDR, 0);
 
                 esp_write(eregs->esp_cfg1, (ESP_CONFIG1_PENABLE | 7));
                 udelay(5);
diff --git a/drivers/scsi/dec_esp.c b/drivers/scsi/dec_esp.c
index c29ccbc44693..d42ad663ffee 100644
--- a/drivers/scsi/dec_esp.c
+++ b/drivers/scsi/dec_esp.c
@@ -18,7 +18,7 @@
  * 20001005     - Initialization fixes for 2.4.0-test9
  *                        Florian Lohoff <flo@rfc822.org>
  *
- *      Copyright (C) 2002, 2003, 2005  Maciej W. Rozycki
+ *      Copyright (C) 2002, 2003, 2005, 2006  Maciej W. Rozycki
  */
 
 #include <linux/kernel.h>
@@ -30,6 +30,7 @@
 #include <linux/proc_fs.h>
 #include <linux/spinlock.h>
 #include <linux/stat.h>
+#include <linux/tc.h>
 
 #include <asm/dma.h>
 #include <asm/irq.h>
@@ -42,7 +43,6 @@
 #include <asm/dec/ioasic_ints.h>
 #include <asm/dec/machtype.h>
 #include <asm/dec/system.h>
-#include <asm/dec/tc.h>
 
 #define DEC_SCSI_SREG 0
 #define DEC_SCSI_DMAREG 0x40000
@@ -98,51 +98,33 @@ static irqreturn_t scsi_dma_merr_int(int, void *);
 static irqreturn_t scsi_dma_err_int(int, void *);
 static irqreturn_t scsi_dma_int(int, void *);
 
-static int dec_esp_detect(struct scsi_host_template * tpnt);
-
-static int dec_esp_release(struct Scsi_Host *shost)
-{
-        if (shost->irq)
-                free_irq(shost->irq, NULL);
-        if (shost->io_port && shost->n_io_port)
-                release_region(shost->io_port, shost->n_io_port);
-        scsi_unregister(shost);
-        return 0;
-}
-
-static struct scsi_host_template driver_template = {
-        .proc_name              = "dec_esp",
-        .proc_info              = esp_proc_info,
+static struct scsi_host_template dec_esp_template = {
+        .module                 = THIS_MODULE,
         .name                   = "NCR53C94",
-        .detect                 = dec_esp_detect,
-        .slave_alloc            = esp_slave_alloc,
-        .slave_destroy          = esp_slave_destroy,
-        .release                = dec_esp_release,
         .info                   = esp_info,
         .queuecommand           = esp_queue,
         .eh_abort_handler       = esp_abort,
         .eh_bus_reset_handler   = esp_reset,
+        .slave_alloc            = esp_slave_alloc,
+        .slave_destroy          = esp_slave_destroy,
+        .proc_info              = esp_proc_info,
+        .proc_name              = "dec_esp",
         .can_queue              = 7,
-        .this_id                = 7,
         .sg_tablesize           = SG_ALL,
         .cmd_per_lun            = 1,
         .use_clustering         = DISABLE_CLUSTERING,
 };
 
-
-#include "scsi_module.c"
+static struct NCR_ESP *dec_esp_platform;
 
 /***************************************************************** Detection */
-static int dec_esp_detect(struct scsi_host_template * tpnt)
+static int dec_esp_platform_probe(void)
 {
         struct NCR_ESP *esp;
-        struct ConfigDev *esp_dev;
-        int slot;
-        unsigned long mem_start;
+        int err = 0;
 
         if (IOASIC) {
-                esp_dev = 0;
-                esp = esp_allocate(tpnt, (void *) esp_dev);
+                esp = esp_allocate(&dec_esp_template, NULL, 1);
 
                 /* Do command transfer with programmed I/O */
                 esp->do_pio_cmds = 1;
@@ -200,112 +182,175 @@ static int dec_esp_detect(struct scsi_host_template * tpnt)
                 /* Check for differential SCSI-bus */
                 esp->diff = 0;
 
+                err = request_irq(esp->irq, esp_intr, IRQF_DISABLED,
+                                  "ncr53c94", esp->ehost);
+                if (err)
+                        goto err_alloc;
+                err = request_irq(dec_interrupt[DEC_IRQ_ASC_MERR],
+                                  scsi_dma_merr_int, IRQF_DISABLED,
+                                  "ncr53c94 error", esp->ehost);
+                if (err)
+                        goto err_irq;
+                err = request_irq(dec_interrupt[DEC_IRQ_ASC_ERR],
+                                  scsi_dma_err_int, IRQF_DISABLED,
+                                  "ncr53c94 overrun", esp->ehost);
+                if (err)
+                        goto err_irq_merr;
+                err = request_irq(dec_interrupt[DEC_IRQ_ASC_DMA], scsi_dma_int,
+                                  IRQF_DISABLED, "ncr53c94 dma", esp->ehost);
+                if (err)
+                        goto err_irq_err;
+
                 esp_initialize(esp);
 
-                if (request_irq(esp->irq, esp_intr, IRQF_DISABLED,
-                                "ncr53c94", esp->ehost))
-                        goto err_dealloc;
-                if (request_irq(dec_interrupt[DEC_IRQ_ASC_MERR],
-                                scsi_dma_merr_int, IRQF_DISABLED,
-                                "ncr53c94 error", esp->ehost))
-                        goto err_free_irq;
-                if (request_irq(dec_interrupt[DEC_IRQ_ASC_ERR],
-                                scsi_dma_err_int, IRQF_DISABLED,
-                                "ncr53c94 overrun", esp->ehost))
-                        goto err_free_irq_merr;
-                if (request_irq(dec_interrupt[DEC_IRQ_ASC_DMA],
-                                scsi_dma_int, IRQF_DISABLED,
-                                "ncr53c94 dma", esp->ehost))
-                        goto err_free_irq_err;
+                err = scsi_add_host(esp->ehost, NULL);
+                if (err) {
+                        printk(KERN_ERR "ESP: Unable to register adapter\n");
+                        goto err_irq_dma;
+                }
+
+                scsi_scan_host(esp->ehost);
 
+                dec_esp_platform = esp;
         }
 
-        if (TURBOCHANNEL) {
-                while ((slot = search_tc_card("PMAZ-AA")) >= 0) {
-                        claim_tc_card(slot);
-
-                        esp_dev = 0;
-                        esp = esp_allocate(tpnt, (void *) esp_dev);
-
-                        mem_start = get_tc_base_addr(slot);
-
-                        /* Store base addr into esp struct */
-                        esp->slot = CPHYSADDR(mem_start);
-
-                        esp->dregs = 0;
-                        esp->eregs = (void *)CKSEG1ADDR(mem_start +
-                                                        DEC_SCSI_SREG);
-                        esp->do_pio_cmds = 1;
-
-                        /* Set the command buffer */
-                        esp->esp_command = (volatile unsigned char *) pmaz_cmd_buffer;
-
-                        /* get virtual dma address for command buffer */
-                        esp->esp_command_dvma = virt_to_phys(pmaz_cmd_buffer);
-
-                        esp->cfreq = get_tc_speed();
-
-                        esp->irq = get_tc_irq_nr(slot);
-
-                        /* Required functions */
-                        esp->dma_bytes_sent = &dma_bytes_sent;
-                        esp->dma_can_transfer = &dma_can_transfer;
-                        esp->dma_dump_state = &dma_dump_state;
-                        esp->dma_init_read = &pmaz_dma_init_read;
-                        esp->dma_init_write = &pmaz_dma_init_write;
-                        esp->dma_ints_off = &pmaz_dma_ints_off;
-                        esp->dma_ints_on = &pmaz_dma_ints_on;
-                        esp->dma_irq_p = &dma_irq_p;
-                        esp->dma_ports_p = &dma_ports_p;
-                        esp->dma_setup = &pmaz_dma_setup;
-
-                        /* Optional functions */
-                        esp->dma_barrier = 0;
-                        esp->dma_drain = &pmaz_dma_drain;
-                        esp->dma_invalidate = 0;
-                        esp->dma_irq_entry = 0;
-                        esp->dma_irq_exit = 0;
-                        esp->dma_poll = 0;
-                        esp->dma_reset = 0;
-                        esp->dma_led_off = 0;
-                        esp->dma_led_on = 0;
-
-                        esp->dma_mmu_get_scsi_one = pmaz_dma_mmu_get_scsi_one;
-                        esp->dma_mmu_get_scsi_sgl = 0;
-                        esp->dma_mmu_release_scsi_one = 0;
-                        esp->dma_mmu_release_scsi_sgl = 0;
-                        esp->dma_advance_sg = 0;
-
-                        if (request_irq(esp->irq, esp_intr, IRQF_DISABLED,
-                                         "PMAZ_AA", esp->ehost)) {
-                                esp_deallocate(esp);
-                                release_tc_card(slot);
-                                continue;
-                        }
-                        esp->scsi_id = 7;
-                        esp->diff = 0;
-                        esp_initialize(esp);
-                }
+        return 0;
+
+err_irq_dma:
+        free_irq(dec_interrupt[DEC_IRQ_ASC_DMA], esp->ehost);
+err_irq_err:
+        free_irq(dec_interrupt[DEC_IRQ_ASC_ERR], esp->ehost);
+err_irq_merr:
+        free_irq(dec_interrupt[DEC_IRQ_ASC_MERR], esp->ehost);
+err_irq:
+        free_irq(esp->irq, esp->ehost);
+err_alloc:
+        esp_deallocate(esp);
+        scsi_host_put(esp->ehost);
+        return err;
+}
+
+static int __init dec_esp_probe(struct device *dev)
+{
+        struct NCR_ESP *esp;
+        resource_size_t start, len;
+        int err;
+
+        esp = esp_allocate(&dec_esp_template,  NULL, 1);
+
+        dev_set_drvdata(dev, esp);
+
+        start = to_tc_dev(dev)->resource.start;
+        len = to_tc_dev(dev)->resource.end - start + 1;
+
+        if (!request_mem_region(start, len, dev->bus_id)) {
+                printk(KERN_ERR "%s: Unable to reserve MMIO resource\n",
+                       dev->bus_id);
+                err = -EBUSY;
+                goto err_alloc;
         }
 
-        if(nesps) {
-                printk("ESP: Total of %d ESP hosts found, %d actually in use.\n", nesps, esps_in_use);
-                esps_running = esps_in_use;
-                return esps_in_use;
+        /* Store base addr into esp struct.  */
+        esp->slot = start;
+
+        esp->dregs = 0;
+        esp->eregs = (void *)CKSEG1ADDR(start + DEC_SCSI_SREG);
+        esp->do_pio_cmds = 1;
+
+        /* Set the command buffer.  */
+        esp->esp_command = (volatile unsigned char *)pmaz_cmd_buffer;
+
+        /* Get virtual dma address for command buffer.  */
+        esp->esp_command_dvma = virt_to_phys(pmaz_cmd_buffer);
+
+        esp->cfreq = tc_get_speed(to_tc_dev(dev)->bus);
+
+        esp->irq = to_tc_dev(dev)->interrupt;
+
+        /* Required functions.  */
+        esp->dma_bytes_sent = &dma_bytes_sent;
+        esp->dma_can_transfer = &dma_can_transfer;
+        esp->dma_dump_state = &dma_dump_state;
+        esp->dma_init_read = &pmaz_dma_init_read;
+        esp->dma_init_write = &pmaz_dma_init_write;
+        esp->dma_ints_off = &pmaz_dma_ints_off;
+        esp->dma_ints_on = &pmaz_dma_ints_on;
+        esp->dma_irq_p = &dma_irq_p;
+        esp->dma_ports_p = &dma_ports_p;
+        esp->dma_setup = &pmaz_dma_setup;
+
+        /* Optional functions.  */
+        esp->dma_barrier = 0;
+        esp->dma_drain = &pmaz_dma_drain;
+        esp->dma_invalidate = 0;
+        esp->dma_irq_entry = 0;
+        esp->dma_irq_exit = 0;
+        esp->dma_poll = 0;
+        esp->dma_reset = 0;
+        esp->dma_led_off = 0;
+        esp->dma_led_on = 0;
+
+        esp->dma_mmu_get_scsi_one = pmaz_dma_mmu_get_scsi_one;
+        esp->dma_mmu_get_scsi_sgl = 0;
+        esp->dma_mmu_release_scsi_one = 0;
+        esp->dma_mmu_release_scsi_sgl = 0;
+        esp->dma_advance_sg = 0;
+
+        err = request_irq(esp->irq, esp_intr, IRQF_DISABLED, "PMAZ_AA",
+                          esp->ehost);
+        if (err) {
+                printk(KERN_ERR "%s: Unable to get IRQ %d\n",
+                       dev->bus_id, esp->irq);
+                goto err_resource;
+        }
+
+        esp->scsi_id = 7;
+        esp->diff = 0;
+        esp_initialize(esp);
+
+        err = scsi_add_host(esp->ehost, dev);
+        if (err) {
+                printk(KERN_ERR "%s: Unable to register adapter\n",
+                       dev->bus_id);
+                goto err_irq;
         }
+
+        scsi_scan_host(esp->ehost);
+
         return 0;
 
-err_free_irq_err:
-        free_irq(dec_interrupt[DEC_IRQ_ASC_ERR], scsi_dma_err_int);
-err_free_irq_merr:
-        free_irq(dec_interrupt[DEC_IRQ_ASC_MERR], scsi_dma_merr_int);
-err_free_irq:
-        free_irq(esp->irq, esp_intr);
-err_dealloc:
+err_irq:
+        free_irq(esp->irq, esp->ehost);
+
+err_resource:
+        release_mem_region(start, len);
+
+err_alloc:
         esp_deallocate(esp);
-        return 0;
+        scsi_host_put(esp->ehost);
+        return err;
+}
+
+static void __exit dec_esp_platform_remove(void)
+{
+        struct NCR_ESP *esp = dec_esp_platform;
+
+        free_irq(esp->irq, esp->ehost);
+        esp_deallocate(esp);
+        scsi_host_put(esp->ehost);
+        dec_esp_platform = NULL;
 }
 
+static void __exit dec_esp_remove(struct device *dev)
+{
+        struct NCR_ESP *esp = dev_get_drvdata(dev);
+
+        free_irq(esp->irq, esp->ehost);
+        esp_deallocate(esp);
+        scsi_host_put(esp->ehost);
+}
+
+
 /************************************************************* DMA Functions */
 static irqreturn_t scsi_dma_merr_int(int irq, void *dev_id)
 {
@@ -576,3 +621,67 @@ static void pmaz_dma_mmu_get_scsi_one(struct NCR_ESP *esp, struct scsi_cmnd * sp
 {
         sp->SCp.ptr = (char *)virt_to_phys(sp->request_buffer);
 }
+
+
+#ifdef CONFIG_TC
+static int __init dec_esp_tc_probe(struct device *dev);
+static int __exit dec_esp_tc_remove(struct device *dev);
+
+static const struct tc_device_id dec_esp_tc_table[] = {
+        { "DEC     ", "PMAZ-AA " },
+        { }
+};
+MODULE_DEVICE_TABLE(tc, dec_esp_tc_table);
+
+static struct tc_driver dec_esp_tc_driver = {
+        .id_table       = dec_esp_tc_table,
+        .driver         = {
+                .name   = "dec_esp",
+                .bus    = &tc_bus_type,
+                .probe  = dec_esp_tc_probe,
+                .remove = __exit_p(dec_esp_tc_remove),
+        },
+};
+
+static int __init dec_esp_tc_probe(struct device *dev)
+{
+        int status = dec_esp_probe(dev);
+        if (!status)
+                get_device(dev);
+        return status;
+}
+
+static int __exit dec_esp_tc_remove(struct device *dev)
+{
+        put_device(dev);
+        dec_esp_remove(dev);
+        return 0;
+}
+#endif
+
+static int __init dec_esp_init(void)
+{
+        int status;
+
+        status = tc_register_driver(&dec_esp_tc_driver);
+        if (!status)
+                dec_esp_platform_probe();
+
+        if (nesps) {
+                pr_info("ESP: Total of %d ESP hosts found, "
+                        "%d actually in use.\n", nesps, esps_in_use);
+                esps_running = esps_in_use;
+        }
+
+        return status;
+}
+
+static void __exit dec_esp_exit(void)
+{
+        dec_esp_platform_remove();
+        tc_unregister_driver(&dec_esp_tc_driver);
+}
+
+
+module_init(dec_esp_init);
+module_exit(dec_esp_exit);
diff --git a/drivers/scsi/fastlane.c b/drivers/scsi/fastlane.c
index 2a1c5c22b9e0..4266a2139b5f 100644
--- a/drivers/scsi/fastlane.c
+++ b/drivers/scsi/fastlane.c
@@ -142,7 +142,7 @@ int __init fastlane_esp_detect(struct scsi_host_template *tpnt)
                 if (board < 0x1000000) {
                         goto err_release;
                 }
-                esp = esp_allocate(tpnt, (void *)board+FASTLANE_ESP_ADDR);
+                esp = esp_allocate(tpnt, (void *)board + FASTLANE_ESP_ADDR, 0);
 
                 /* Do command transfer with programmed I/O */
                 esp->do_pio_cmds = 1;
diff --git a/drivers/scsi/iscsi_tcp.c b/drivers/scsi/iscsi_tcp.c
index 437684084377..8f55e1431433 100644
--- a/drivers/scsi/iscsi_tcp.c
+++ b/drivers/scsi/iscsi_tcp.c
@@ -1375,7 +1375,7 @@ iscsi_tcp_mtask_xmit(struct iscsi_conn *conn, struct iscsi_mgmt_task *mtask)
         }
 
         BUG_ON(tcp_mtask->xmstate != XMSTATE_IDLE);
-        if (mtask->hdr->itt == cpu_to_be32(ISCSI_RESERVED_TAG)) {
+        if (mtask->hdr->itt == RESERVED_ITT) {
                 struct iscsi_session *session = conn->session;
 
                 spin_lock_bh(&session->lock);
diff --git a/drivers/scsi/jazz_esp.c b/drivers/scsi/jazz_esp.c
index bfac4441d89f..19dd4b962e18 100644
--- a/drivers/scsi/jazz_esp.c
+++ b/drivers/scsi/jazz_esp.c
@@ -75,7 +75,7 @@ static int jazz_esp_detect(struct scsi_host_template *tpnt)
      */
     if (1) {
         esp_dev = NULL;
-        esp = esp_allocate(tpnt, (void *) esp_dev);
+        esp = esp_allocate(tpnt, esp_dev, 0);
         
         /* Do command transfer with programmed I/O */
         esp->do_pio_cmds = 1;
diff --git a/drivers/scsi/libiscsi.c b/drivers/scsi/libiscsi.c
index d37048c96eab..7c75771c77ff 100644
--- a/drivers/scsi/libiscsi.c
+++ b/drivers/scsi/libiscsi.c
@@ -113,8 +113,7 @@ static void iscsi_prep_scsi_cmd_pdu(struct iscsi_cmd_task *ctask)
         hdr->opcode = ISCSI_OP_SCSI_CMD;
         hdr->flags = ISCSI_ATTR_SIMPLE;
         int_to_scsilun(sc->device->lun, (struct scsi_lun *)hdr->lun);
-        hdr->itt = ctask->itt | (conn->id << ISCSI_CID_SHIFT) |
-                         (session->age << ISCSI_AGE_SHIFT);
+        hdr->itt = build_itt(ctask->itt, conn->id, session->age);
         hdr->data_length = cpu_to_be32(sc->request_bufflen);
         hdr->cmdsn = cpu_to_be32(session->cmdsn);
         session->cmdsn++;
@@ -270,7 +269,7 @@ invalid_datalen:
                         goto out;
                 }
 
-                senselen = be16_to_cpu(*(uint16_t *)data);
+                senselen = be16_to_cpu(*(__be16 *)data);
                 if (datalen < senselen)
                         goto invalid_datalen;
 
@@ -338,7 +337,7 @@ static int iscsi_handle_reject(struct iscsi_conn *conn, struct iscsi_hdr *hdr,
 
                 if (ntoh24(reject->dlength) >= sizeof(struct iscsi_hdr)) {
                         memcpy(&rejected_pdu, data, sizeof(struct iscsi_hdr));
-                        itt = rejected_pdu.itt & ISCSI_ITT_MASK;
+                        itt = get_itt(rejected_pdu.itt);
                         printk(KERN_ERR "itt 0x%x had pdu (op 0x%x) rejected "
                                 "due to DataDigest error.\n", itt,
                                 rejected_pdu.opcode);
@@ -367,10 +366,10 @@ int __iscsi_complete_pdu(struct iscsi_conn *conn, struct iscsi_hdr *hdr,
         struct iscsi_mgmt_task *mtask;
         uint32_t itt;
 
-        if (hdr->itt != cpu_to_be32(ISCSI_RESERVED_TAG))
-                itt = hdr->itt & ISCSI_ITT_MASK;
+        if (hdr->itt != RESERVED_ITT)
+                itt = get_itt(hdr->itt);
         else
-                itt = hdr->itt;
+                itt = ~0U;
 
         if (itt < session->cmds_max) {
                 ctask = session->cmds[itt];
@@ -440,7 +439,7 @@ int __iscsi_complete_pdu(struct iscsi_conn *conn, struct iscsi_hdr *hdr,
                         iscsi_tmf_rsp(conn, hdr);
                         break;
                 case ISCSI_OP_NOOP_IN:
-                        if (hdr->ttt != ISCSI_RESERVED_TAG || datalen) {
+                        if (hdr->ttt != cpu_to_be32(ISCSI_RESERVED_TAG) || datalen) {
                                 rc = ISCSI_ERR_PROTO;
                                 break;
                         }
@@ -457,7 +456,7 @@ int __iscsi_complete_pdu(struct iscsi_conn *conn, struct iscsi_hdr *hdr,
                         rc = ISCSI_ERR_BAD_OPCODE;
                         break;
                 }
-        } else if (itt == ISCSI_RESERVED_TAG) {
+        } else if (itt == ~0U) {
                 rc = iscsi_check_assign_cmdsn(session,
                                              (struct iscsi_nopin*)hdr);
                 if (rc)
@@ -470,7 +469,7 @@ int __iscsi_complete_pdu(struct iscsi_conn *conn, struct iscsi_hdr *hdr,
                                 break;
                         }
 
-                        if (hdr->ttt == ISCSI_RESERVED_TAG)
+                        if (hdr->ttt == cpu_to_be32(ISCSI_RESERVED_TAG))
                                 break;
 
                         if (iscsi_recv_pdu(conn->cls_conn, hdr, NULL, 0))
@@ -516,24 +515,24 @@ int iscsi_verify_itt(struct iscsi_conn *conn, struct iscsi_hdr *hdr,
         struct iscsi_cmd_task *ctask;
         uint32_t itt;
 
-        if (hdr->itt != cpu_to_be32(ISCSI_RESERVED_TAG)) {
-                if ((hdr->itt & ISCSI_AGE_MASK) !=
+        if (hdr->itt != RESERVED_ITT) {
+                if (((__force u32)hdr->itt & ISCSI_AGE_MASK) !=
                     (session->age << ISCSI_AGE_SHIFT)) {
                         printk(KERN_ERR "iscsi: received itt %x expected "
-                                "session age (%x)\n", hdr->itt,
+                                "session age (%x)\n", (__force u32)hdr->itt,
                                 session->age & ISCSI_AGE_MASK);
                         return ISCSI_ERR_BAD_ITT;
                 }
 
-                if ((hdr->itt & ISCSI_CID_MASK) !=
+                if (((__force u32)hdr->itt & ISCSI_CID_MASK) !=
                     (conn->id << ISCSI_CID_SHIFT)) {
                         printk(KERN_ERR "iscsi: received itt %x, expected "
-                                "CID (%x)\n", hdr->itt, conn->id);
+                                "CID (%x)\n", (__force u32)hdr->itt, conn->id);
                         return ISCSI_ERR_BAD_ITT;
                 }
-                itt = hdr->itt & ISCSI_ITT_MASK;
+                itt = get_itt(hdr->itt);
         } else
-                itt = hdr->itt;
+                itt = ~0U;
 
         if (itt < session->cmds_max) {
                 ctask = session->cmds[itt];
@@ -896,9 +895,8 @@ iscsi_conn_send_generic(struct iscsi_conn *conn, struct iscsi_hdr *hdr,
         /*
          * pre-format CmdSN for outgoing PDU.
          */
-        if (hdr->itt != cpu_to_be32(ISCSI_RESERVED_TAG)) {
-                hdr->itt = mtask->itt | (conn->id << ISCSI_CID_SHIFT) |
-                           (session->age << ISCSI_AGE_SHIFT);
+        if (hdr->itt != RESERVED_ITT) {
+                hdr->itt = build_itt(mtask->itt, conn->id, session->age);
                 nop->cmdsn = cpu_to_be32(session->cmdsn);
                 if (conn->c_stage == ISCSI_CONN_STARTED &&
                     !(hdr->opcode & ISCSI_OP_IMMEDIATE))
@@ -1064,7 +1062,7 @@ static int iscsi_exec_abort_task(struct scsi_cmnd *sc,
 
         spin_lock_bh(&session->lock);
         ctask->mtask = (struct iscsi_mgmt_task *)
-                        session->mgmt_cmds[(hdr->itt & ISCSI_ITT_MASK) -
+                        session->mgmt_cmds[get_itt(hdr->itt) -
                                         ISCSI_MGMT_ITT_OFFSET];
 
         if (conn->tmabort_state == TMABORT_INITIAL) {
diff --git a/drivers/scsi/mac_esp.c b/drivers/scsi/mac_esp.c
index 3586fac9be9a..bcb49021b7e2 100644
--- a/drivers/scsi/mac_esp.c
+++ b/drivers/scsi/mac_esp.c
@@ -351,7 +351,7 @@ int mac_esp_detect(struct scsi_host_template * tpnt)
         for (chipnum = 0; chipnum < chipspresent; chipnum ++) {
                 struct NCR_ESP * esp;
 
-                esp = esp_allocate(tpnt, (void *) NULL);
+                esp = esp_allocate(tpnt, NULL, 0);
                 esp->eregs = (struct ESP_regs *) get_base(chipnum);
 
                 esp->dma_irq_p = &esp_dafb_dma_irq_p;
diff --git a/drivers/scsi/mca_53c9x.c b/drivers/scsi/mca_53c9x.c
index 998a8bbc1a4b..d693d0f21395 100644
--- a/drivers/scsi/mca_53c9x.c
+++ b/drivers/scsi/mca_53c9x.c
@@ -122,7 +122,7 @@ static int mca_esp_detect(struct scsi_host_template *tpnt)
                 if ((slot = mca_find_adapter(*id_to_check, 0)) !=
                   MCA_NOTFOUND) 
                 {
-                        esp = esp_allocate(tpnt, (void *) NULL);
+                        esp = esp_allocate(tpnt, NULL, 0);
 
                         pos[0] = mca_read_stored_pos(slot, 2);
                         pos[1] = mca_read_stored_pos(slot, 3);
diff --git a/drivers/scsi/oktagon_esp.c b/drivers/scsi/oktagon_esp.c
index c116a6ae3c54..26a6d55faf3e 100644
--- a/drivers/scsi/oktagon_esp.c
+++ b/drivers/scsi/oktagon_esp.c
@@ -133,7 +133,7 @@ int oktagon_esp_detect(struct scsi_host_template *tpnt)
                 eregs = (struct ESP_regs *)(address + OKTAGON_ESP_ADDR);
 
                 /* This line was 5 lines lower */
-                esp = esp_allocate(tpnt, (void *)board+OKTAGON_ESP_ADDR);
+                esp = esp_allocate(tpnt, (void *)board + OKTAGON_ESP_ADDR, 0);
 
                 /* we have to shift the registers only one bit for oktagon */
                 esp->shift = 1;
diff --git a/drivers/scsi/osst.c b/drivers/scsi/osst.c
index 7d2311067903..bd6bbf61adb8 100644
--- a/drivers/scsi/osst.c
+++ b/drivers/scsi/osst.c
@@ -521,10 +521,10 @@ static void osst_init_aux(struct osst_tape * STp, int frame_type, int frame_seq_
                 break;
           default: ; /* probably FILL */
         }
-        aux->filemark_cnt = ntohl(STp->filemark_cnt);
-        aux->phys_fm = ntohl(0xffffffff);
-        aux->last_mark_ppos = ntohl(STp->last_mark_ppos);
-        aux->last_mark_lbn  = ntohl(STp->last_mark_lbn);
+        aux->filemark_cnt = htonl(STp->filemark_cnt);
+        aux->phys_fm = htonl(0xffffffff);
+        aux->last_mark_ppos = htonl(STp->last_mark_ppos);
+        aux->last_mark_lbn  = htonl(STp->last_mark_lbn);
 }
 
 /*
diff --git a/drivers/scsi/osst.h b/drivers/scsi/osst.h
index 1e426f5d0ed8..2cc7b5a1606a 100644
--- a/drivers/scsi/osst.h
+++ b/drivers/scsi/osst.h
@@ -288,11 +288,11 @@ typedef struct {
 #else
 #error "Please fix <asm/byteorder.h>"
 #endif
-        u16             max_speed;              /* Maximum speed supported in KBps */
+        __be16          max_speed;              /* Maximum speed supported in KBps */
         u8              reserved10, reserved11;
-        u16             ctl;                    /* Continuous Transfer Limit in blocks */
-        u16             speed;                  /* Current Speed, in KBps */
-        u16             buffer_size;            /* Buffer Size, in 512 bytes */
+        __be16          ctl;                    /* Continuous Transfer Limit in blocks */
+        __be16          speed;                  /* Current Speed, in KBps */
+        __be16          buffer_size;            /* Buffer Size, in 512 bytes */
         u8              reserved18, reserved19;
 } osst_capabilities_page_t;
 
@@ -352,8 +352,8 @@ typedef struct {
         u8              reserved2;
         u8              density;
         u8              reserved3,reserved4;
-        u16             segtrk;
-        u16             trks;
+        __be16          segtrk;
+        __be16          trks;
         u8              reserved5,reserved6,reserved7,reserved8,reserved9,reserved10;
 } osst_tape_paramtr_page_t;
 
@@ -369,18 +369,18 @@ typedef struct {
 typedef struct os_partition_s {
         __u8    partition_num;
         __u8    par_desc_ver;
-        __u16   wrt_pass_cntr;
-        __u32   first_frame_ppos;
-        __u32   last_frame_ppos;
-        __u32   eod_frame_ppos;
+        __be16  wrt_pass_cntr;
+        __be32  first_frame_ppos;
+        __be32  last_frame_ppos;
+        __be32  eod_frame_ppos;
 } os_partition_t;
 
 /*
  * DAT entry
  */
 typedef struct os_dat_entry_s {
-        __u32   blk_sz;
-        __u16   blk_cnt;
+        __be32  blk_sz;
+        __be16  blk_cnt;
         __u8    flags;
         __u8    reserved;
 } os_dat_entry_t;
@@ -412,23 +412,23 @@ typedef struct os_dat_s {
  * AUX
  */
 typedef struct os_aux_s {
-        __u32           format_id;              /* hardware compability AUX is based on */
+        __be32          format_id;              /* hardware compability AUX is based on */
         char            application_sig[4];     /* driver used to write this media */
-        __u32           hdwr;                   /* reserved */
-        __u32           update_frame_cntr;      /* for configuration frame */
+        __be32          hdwr;                   /* reserved */
+        __be32          update_frame_cntr;      /* for configuration frame */
         __u8            frame_type;
         __u8            frame_type_reserved;
         __u8            reserved_18_19[2];
         os_partition_t  partition;
         __u8            reserved_36_43[8];
-        __u32           frame_seq_num;
-        __u32           logical_blk_num_high;
-        __u32           logical_blk_num;
+        __be32          frame_seq_num;
+        __be32          logical_blk_num_high;
+        __be32          logical_blk_num;
         os_dat_t        dat;
         __u8            reserved188_191[4];
-        __u32           filemark_cnt;
-        __u32           phys_fm;
-        __u32           last_mark_ppos;
+        __be32          filemark_cnt;
+        __be32          phys_fm;
+        __be32          last_mark_ppos;
         __u8            reserved204_223[20];
 
         /*
@@ -436,8 +436,8 @@ typedef struct os_aux_s {
          *
          * Linux specific fields:
          */
-         __u32          next_mark_ppos;         /* when known, points to next marker */
-         __u32          last_mark_lbn;          /* storing log_blk_num of last mark is extends ADR spec */
+         __be32         next_mark_ppos;         /* when known, points to next marker */
+         __be32         last_mark_lbn;          /* storing log_blk_num of last mark is extends ADR spec */
          __u8           linux_specific[24];
 
         __u8            reserved_256_511[256];
@@ -450,19 +450,19 @@ typedef struct os_fm_tab_s {
         __u8            reserved_1;
         __u8            fm_tab_ent_sz;
         __u8            reserved_3;
-        __u16           fm_tab_ent_cnt;
+        __be16          fm_tab_ent_cnt;
         __u8            reserved6_15[10];
-        __u32           fm_tab_ent[OS_FM_TAB_MAX];
+        __be32          fm_tab_ent[OS_FM_TAB_MAX];
 } os_fm_tab_t;
 
 typedef struct os_ext_trk_ey_s {
         __u8            et_part_num;
         __u8            fmt;
-        __u16           fm_tab_off;
+        __be16          fm_tab_off;
         __u8            reserved4_7[4];
-        __u32           last_hlb_hi;
-        __u32           last_hlb;
-        __u32           last_pp;
+        __be32          last_hlb_hi;
+        __be32          last_hlb;
+        __be32          last_pp;
         __u8            reserved20_31[12];
 } os_ext_trk_ey_t;
 
@@ -479,17 +479,17 @@ typedef struct os_header_s {
         char            ident_str[8];
         __u8            major_rev;
         __u8            minor_rev;
-        __u16           ext_trk_tb_off;
+        __be16          ext_trk_tb_off;
         __u8            reserved12_15[4];
         __u8            pt_par_num;
         __u8            pt_reserved1_3[3];
         os_partition_t  partition[16];
-        __u32           cfg_col_width;
-        __u32           dat_col_width;
-        __u32           qfa_col_width;
+        __be32          cfg_col_width;
+        __be32          dat_col_width;
+        __be32          qfa_col_width;
         __u8            cartridge[16];
         __u8            reserved304_511[208];
-        __u32           old_filemark_list[16680/4];             /* in ADR 1.4 __u8 track_table[16680] */
+        __be32          old_filemark_list[16680/4];             /* in ADR 1.4 __u8 track_table[16680] */
         os_ext_trk_tb_t ext_track_tb;
         __u8            reserved17272_17735[464];
         os_fm_tab_t     dat_fm_tab;
diff --git a/drivers/scsi/qla4xxx/ql4_def.h b/drivers/scsi/qla4xxx/ql4_def.h
index 4249e52a5592..6f4cf2dd2f4a 100644
--- a/drivers/scsi/qla4xxx/ql4_def.h
+++ b/drivers/scsi/qla4xxx/ql4_def.h
@@ -418,7 +418,6 @@ struct scsi_qla_host {
          * concurrently.
          */
         struct mutex  mbox_sem;
-        wait_queue_head_t mailbox_wait_queue;
 
         /* temporary mailbox status registers */
         volatile uint8_t mbox_status_count;
diff --git a/drivers/scsi/qla4xxx/ql4_glbl.h b/drivers/scsi/qla4xxx/ql4_glbl.h
index 2122967bbf0b..e021eb5db2b2 100644
--- a/drivers/scsi/qla4xxx/ql4_glbl.h
+++ b/drivers/scsi/qla4xxx/ql4_glbl.h
@@ -76,4 +76,5 @@ int qla4xxx_process_ddb_changed(struct scsi_qla_host * ha,
 extern int ql4xextended_error_logging;
 extern int ql4xdiscoverywait;
 extern int ql4xdontresethba;
+extern int ql4_mod_unload;
 #endif /* _QLA4x_GBL_H */
diff --git a/drivers/scsi/qla4xxx/ql4_init.c b/drivers/scsi/qla4xxx/ql4_init.c
index cc210f297a78..b907b06d72ab 100644
--- a/drivers/scsi/qla4xxx/ql4_init.c
+++ b/drivers/scsi/qla4xxx/ql4_init.c
@@ -958,25 +958,25 @@ static int qla4xxx_start_firmware_from_flash(struct scsi_qla_host *ha)
         return status;
 }
 
-int ql4xxx_lock_drvr_wait(struct scsi_qla_host *a)
+int ql4xxx_lock_drvr_wait(struct scsi_qla_host *ha)
 {
-#define QL4_LOCK_DRVR_WAIT      300
-#define QL4_LOCK_DRVR_SLEEP     100
+#define QL4_LOCK_DRVR_WAIT      30
+#define QL4_LOCK_DRVR_SLEEP     1
 
         int drvr_wait = QL4_LOCK_DRVR_WAIT;
         while (drvr_wait) {
-                if (ql4xxx_lock_drvr(a) == 0) {
-                        msleep(QL4_LOCK_DRVR_SLEEP);
+                if (ql4xxx_lock_drvr(ha) == 0) {
+                        ssleep(QL4_LOCK_DRVR_SLEEP);
                         if (drvr_wait) {
                                 DEBUG2(printk("scsi%ld: %s: Waiting for "
-                                              "Global Init Semaphore...n",
-                                              a->host_no,
-                                              __func__));
+                                              "Global Init Semaphore(%d)...n",
+                                              ha->host_no,
+                                              __func__, drvr_wait));
                         }
                         drvr_wait -= QL4_LOCK_DRVR_SLEEP;
                 } else {
                         DEBUG2(printk("scsi%ld: %s: Global Init Semaphore "
-                                      "acquired.n", a->host_no, __func__));
+                                      "acquired.n", ha->host_no, __func__));
                         return QLA_SUCCESS;
                 }
         }
diff --git a/drivers/scsi/qla4xxx/ql4_isr.c b/drivers/scsi/qla4xxx/ql4_isr.c
index ef975e0dc87f..35b9e36a0e8d 100644
--- a/drivers/scsi/qla4xxx/ql4_isr.c
+++ b/drivers/scsi/qla4xxx/ql4_isr.c
@@ -433,7 +433,6 @@ static void qla4xxx_isr_decode_mailbox(struct scsi_qla_host * ha,
                                         readl(&ha->reg->mailbox[i]);
 
                         set_bit(AF_MBOX_COMMAND_DONE, &ha->flags);
-                        wake_up(&ha->mailbox_wait_queue);
                 }
         } else if (mbox_status >> 12 == MBOX_ASYNC_EVENT_STATUS) {
                 /* Immediately process the AENs that don't require much work.
@@ -686,7 +685,8 @@ irqreturn_t qla4xxx_intr_handler(int irq, void *dev_id)
                                &ha->reg->ctrl_status);
                         readl(&ha->reg->ctrl_status);
 
-                        set_bit(DPC_RESET_HA_INTR, &ha->dpc_flags);
+                        if (!ql4_mod_unload)
+                                set_bit(DPC_RESET_HA_INTR, &ha->dpc_flags);
 
                         break;
                 } else if (intr_status & INTR_PENDING) {
diff --git a/drivers/scsi/qla4xxx/ql4_mbx.c b/drivers/scsi/qla4xxx/ql4_mbx.c
index b721dc5dd711..7f28657eef3f 100644
--- a/drivers/scsi/qla4xxx/ql4_mbx.c
+++ b/drivers/scsi/qla4xxx/ql4_mbx.c
@@ -29,18 +29,30 @@ int qla4xxx_mailbox_command(struct scsi_qla_host *ha, uint8_t inCount,
         u_long wait_count;
         uint32_t intr_status;
         unsigned long flags = 0;
-        DECLARE_WAITQUEUE(wait, current);
-
-        mutex_lock(&ha->mbox_sem);
-
-        /* Mailbox code active */
-        set_bit(AF_MBOX_COMMAND, &ha->flags);
 
         /* Make sure that pointers are valid */
         if (!mbx_cmd || !mbx_sts) {
                 DEBUG2(printk("scsi%ld: %s: Invalid mbx_cmd or mbx_sts "
                               "pointer\n", ha->host_no, __func__));
-                goto mbox_exit;
+                return status;
+        }
+        /* Mailbox code active */
+        wait_count = MBOX_TOV * 100;
+
+        while (wait_count--) {
+                mutex_lock(&ha->mbox_sem);
+                if (!test_bit(AF_MBOX_COMMAND, &ha->flags)) {
+                        set_bit(AF_MBOX_COMMAND, &ha->flags);
+                        mutex_unlock(&ha->mbox_sem);
+                        break;
+                }
+                mutex_unlock(&ha->mbox_sem);
+                if (!wait_count) {
+                        DEBUG2(printk("scsi%ld: %s: mbox_sem failed\n",
+                                ha->host_no, __func__));
+                        return status;
+                }
+                msleep(10);
         }
 
         /* To prevent overwriting mailbox registers for a command that has
@@ -73,8 +85,6 @@ int qla4xxx_mailbox_command(struct scsi_qla_host *ha, uint8_t inCount,
         spin_unlock_irqrestore(&ha->hardware_lock, flags);
 
         /* Wait for completion */
-        set_current_state(TASK_UNINTERRUPTIBLE);
-        add_wait_queue(&ha->mailbox_wait_queue, &wait);
 
         /*
          * If we don't want status, don't wait for the mailbox command to
@@ -83,8 +93,6 @@ int qla4xxx_mailbox_command(struct scsi_qla_host *ha, uint8_t inCount,
          */
         if (outCount == 0) {
                 status = QLA_SUCCESS;
-                set_current_state(TASK_RUNNING);
-                remove_wait_queue(&ha->mailbox_wait_queue, &wait);
                 goto mbox_exit;
         }
         /* Wait for command to complete */
@@ -108,8 +116,6 @@ int qla4xxx_mailbox_command(struct scsi_qla_host *ha, uint8_t inCount,
                 spin_unlock_irqrestore(&ha->hardware_lock, flags);
                 msleep(10);
         }
-        set_current_state(TASK_RUNNING);
-        remove_wait_queue(&ha->mailbox_wait_queue, &wait);
 
         /* Check for mailbox timeout. */
         if (!test_bit(AF_MBOX_COMMAND_DONE, &ha->flags)) {
@@ -155,9 +161,10 @@ int qla4xxx_mailbox_command(struct scsi_qla_host *ha, uint8_t inCount,
         spin_unlock_irqrestore(&ha->hardware_lock, flags);
 
 mbox_exit:
+        mutex_lock(&ha->mbox_sem);
         clear_bit(AF_MBOX_COMMAND, &ha->flags);
-        clear_bit(AF_MBOX_COMMAND_DONE, &ha->flags);
         mutex_unlock(&ha->mbox_sem);
+        clear_bit(AF_MBOX_COMMAND_DONE, &ha->flags);
 
         return status;
 }
diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
index 9ef693c8809a..81fb7bd44f01 100644
--- a/drivers/scsi/qla4xxx/ql4_os.c
+++ b/drivers/scsi/qla4xxx/ql4_os.c
@@ -40,6 +40,8 @@ MODULE_PARM_DESC(ql4xextended_error_logging,
                  "Option to enable extended error logging, "
                  "Default is 0 - no logging, 1 - debug logging");
 
+int ql4_mod_unload = 0;
+
 /*
  * SCSI host template entry points
  */
@@ -422,6 +424,9 @@ static int qla4xxx_queuecommand(struct scsi_cmnd *cmd,
                 goto qc_host_busy;
         }
 
+        if (test_bit(DPC_RESET_HA_INTR, &ha->dpc_flags))
+                goto qc_host_busy;
+
         spin_unlock_irq(ha->host->host_lock);
 
         srb = qla4xxx_get_new_srb(ha, ddb_entry, cmd, done);
@@ -707,16 +712,12 @@ static int qla4xxx_cmd_wait(struct scsi_qla_host *ha)
         return stat;
 }
 
-/**
- * qla4xxx_soft_reset - performs soft reset.
- * @ha: Pointer to host adapter structure.
- **/
-int qla4xxx_soft_reset(struct scsi_qla_host *ha)
+static void qla4xxx_hw_reset(struct scsi_qla_host *ha)
 {
-        uint32_t max_wait_time;
-        unsigned long flags = 0;
-        int status = QLA_ERROR;
         uint32_t ctrl_status;
+        unsigned long flags = 0;
+
+        DEBUG2(printk(KERN_ERR "scsi%ld: %s\n", ha->host_no, __func__));
 
         spin_lock_irqsave(&ha->hardware_lock, flags);
 
@@ -733,6 +734,20 @@ int qla4xxx_soft_reset(struct scsi_qla_host *ha)
         readl(&ha->reg->ctrl_status);
 
         spin_unlock_irqrestore(&ha->hardware_lock, flags);
+}
+
+/**
+ * qla4xxx_soft_reset - performs soft reset.
+ * @ha: Pointer to host adapter structure.
+ **/
+int qla4xxx_soft_reset(struct scsi_qla_host *ha)
+{
+        uint32_t max_wait_time;
+        unsigned long flags = 0;
+        int status = QLA_ERROR;
+        uint32_t ctrl_status;
+
+        qla4xxx_hw_reset(ha);
 
         /* Wait until the Network Reset Intr bit is cleared */
         max_wait_time = RESET_INTR_TOV;
@@ -966,10 +981,12 @@ static void qla4xxx_do_dpc(struct work_struct *work)
         struct scsi_qla_host *ha =
                 container_of(work, struct scsi_qla_host, dpc_work);
         struct ddb_entry *ddb_entry, *dtemp;
+        int status = QLA_ERROR;
 
         DEBUG2(printk("scsi%ld: %s: DPC handler waking up."
-                "flags = 0x%08lx, dpc_flags = 0x%08lx\n",
-                ha->host_no, __func__, ha->flags, ha->dpc_flags));
+                "flags = 0x%08lx, dpc_flags = 0x%08lx ctrl_stat = 0x%08x\n",
+                ha->host_no, __func__, ha->flags, ha->dpc_flags,
+                readw(&ha->reg->ctrl_status)));
 
         /* Initialization not yet finished. Don't do anything yet. */
         if (!test_bit(AF_INIT_DONE, &ha->flags))
@@ -983,31 +1000,28 @@ static void qla4xxx_do_dpc(struct work_struct *work)
                         test_bit(DPC_RESET_HA, &ha->dpc_flags))
                         qla4xxx_recover_adapter(ha, PRESERVE_DDB_LIST);
 
-                if (test_and_clear_bit(DPC_RESET_HA_INTR, &ha->dpc_flags)) {
+                if (test_bit(DPC_RESET_HA_INTR, &ha->dpc_flags)) {
                         uint8_t wait_time = RESET_INTR_TOV;
-                        unsigned long flags = 0;
-
-                        qla4xxx_flush_active_srbs(ha);
 
-                        spin_lock_irqsave(&ha->hardware_lock, flags);
                         while ((readw(&ha->reg->ctrl_status) &
                                 (CSR_SOFT_RESET | CSR_FORCE_SOFT_RESET)) != 0) {
                                 if (--wait_time == 0)
                                         break;
-
-                                spin_unlock_irqrestore(&ha->hardware_lock,
-                                                       flags);
-
                                 msleep(1000);
-
-                                spin_lock_irqsave(&ha->hardware_lock, flags);
                         }
-                        spin_unlock_irqrestore(&ha->hardware_lock, flags);
-
                         if (wait_time == 0)
                                 DEBUG2(printk("scsi%ld: %s: SR|FSR "
                                               "bit not cleared-- resetting\n",
                                               ha->host_no, __func__));
+                        qla4xxx_flush_active_srbs(ha);
+                        if (ql4xxx_lock_drvr_wait(ha) == QLA_SUCCESS) {
+                                qla4xxx_process_aen(ha, FLUSH_DDB_CHANGED_AENS);
+                                status = qla4xxx_initialize_adapter(ha,
+                                                PRESERVE_DDB_LIST);
+                        }
+                        clear_bit(DPC_RESET_HA_INTR, &ha->dpc_flags);
+                        if (status == QLA_SUCCESS)
+                                qla4xxx_enable_intrs(ha);
                 }
         }
 
@@ -1062,7 +1076,7 @@ static void qla4xxx_free_adapter(struct scsi_qla_host *ha)
 
         /* Issue Soft Reset to put firmware in unknown state */
         if (ql4xxx_lock_drvr_wait(ha) == QLA_SUCCESS)
-                qla4xxx_soft_reset(ha);
+                qla4xxx_hw_reset(ha);
 
         /* Remove timer thread, if present */
         if (ha->timer_active)
@@ -1198,7 +1212,6 @@ static int __devinit qla4xxx_probe_adapter(struct pci_dev *pdev,
         INIT_LIST_HEAD(&ha->free_srb_q);
 
         mutex_init(&ha->mbox_sem);
-        init_waitqueue_head(&ha->mailbox_wait_queue);
 
         spin_lock_init(&ha->hardware_lock);
 
@@ -1665,6 +1678,7 @@ no_srp_cache:
 
 static void __exit qla4xxx_module_exit(void)
 {
+        ql4_mod_unload = 1;
         pci_unregister_driver(&qla4xxx_pci_driver);
         iscsi_unregister_transport(&qla4xxx_iscsi_transport);
         kmem_cache_destroy(srb_cachep);
diff --git a/drivers/scsi/qla4xxx/ql4_version.h b/drivers/scsi/qla4xxx/ql4_version.h
index 454e19c8ad68..e5183a697d1f 100644
--- a/drivers/scsi/qla4xxx/ql4_version.h
+++ b/drivers/scsi/qla4xxx/ql4_version.h
@@ -5,4 +5,4 @@
  * See LICENSE.qla4xxx for copyright and licensing details.
  */
 
-#define QLA4XXX_DRIVER_VERSION  "5.00.07-k"
+#define QLA4XXX_DRIVER_VERSION  "5.00.07-k1"
diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c
index 8160c00d1092..a43b9ec3aefd 100644
--- a/drivers/scsi/scsi_scan.c
+++ b/drivers/scsi/scsi_scan.c
@@ -1453,6 +1453,12 @@ struct scsi_device *__scsi_add_device(struct Scsi_Host *shost, uint channel,
         struct device *parent = &shost->shost_gendev;
         struct scsi_target *starget;
 
+        if (strncmp(scsi_scan_type, "none", 4) == 0)
+                return ERR_PTR(-ENODEV);
+
+        if (!shost->async_scan)
+                scsi_complete_async_scans();
+
         starget = scsi_alloc_target(parent, channel, id);
         if (!starget)
                 return ERR_PTR(-ENOMEM);
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 978bfc1e0c6a..b781a90d6699 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -1647,16 +1647,6 @@ static int sd_probe(struct device *dev)
         if (error)
                 goto out_put;
 
-        class_device_initialize(&sdkp->cdev);
-        sdkp->cdev.dev = &sdp->sdev_gendev;
-        sdkp->cdev.class = &sd_disk_class;
-        strncpy(sdkp->cdev.class_id, sdp->sdev_gendev.bus_id, BUS_ID_SIZE);
-
-        if (class_device_add(&sdkp->cdev))
-                goto out_put;
-
-        get_device(&sdp->sdev_gendev);
-
         sdkp->device = sdp;
         sdkp->driver = &sd_template;
         sdkp->disk = gd;
@@ -1670,6 +1660,16 @@ static int sd_probe(struct device *dev)
                         sdp->timeout = SD_MOD_TIMEOUT;
         }
 
+        class_device_initialize(&sdkp->cdev);
+        sdkp->cdev.dev = &sdp->sdev_gendev;
+        sdkp->cdev.class = &sd_disk_class;
+        strncpy(sdkp->cdev.class_id, sdp->sdev_gendev.bus_id, BUS_ID_SIZE);
+
+        if (class_device_add(&sdkp->cdev))
+                goto out_put;
+
+        get_device(&sdp->sdev_gendev);
+
         gd->major = sd_major((index & 0xf0) >> 4);
         gd->first_minor = ((index & 0xf) << 4) | (index & 0xfff00);
         gd->minors = 16;
diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c
index fba8b204e310..16e279be4a3e 100644
--- a/drivers/scsi/st.c
+++ b/drivers/scsi/st.c
@@ -2819,15 +2819,18 @@ static int st_int_ioctl(struct scsi_tape *STp, unsigned int cmd_in, unsigned lon
 
                 if (cmd_in == MTWEOF &&
                     cmdstatp->have_sense &&
-                    (cmdstatp->flags & SENSE_EOM) &&
-                    (cmdstatp->sense_hdr.sense_key == NO_SENSE ||
-                     cmdstatp->sense_hdr.sense_key == RECOVERED_ERROR) &&
-                    undone == 0) {
-                        ioctl_result = 0;       /* EOF written successfully at EOM */
-                        if (fileno >= 0)
-                                fileno++;
+                    (cmdstatp->flags & SENSE_EOM)) {
+                        if (cmdstatp->sense_hdr.sense_key == NO_SENSE ||
+                            cmdstatp->sense_hdr.sense_key == RECOVERED_ERROR) {
+                                ioctl_result = 0;       /* EOF(s) written successfully at EOM */
+                                STps->eof = ST_NOEOF;
+                        } else {  /* Writing EOF(s) failed */
+                                if (fileno >= 0)
+                                        fileno -= undone;
+                                if (undone < arg)
+                                        STps->eof = ST_NOEOF;
+                        }
                         STps->drv_file = fileno;
-                        STps->eof = ST_NOEOF;
                 } else if ((cmd_in == MTFSF) || (cmd_in == MTFSFM)) {
                         if (fileno >= 0)
                                 STps->drv_file = fileno - undone;
diff --git a/drivers/scsi/sun3x_esp.c b/drivers/scsi/sun3x_esp.c
index 6b60536ac92b..80fb3f88af2e 100644
--- a/drivers/scsi/sun3x_esp.c
+++ b/drivers/scsi/sun3x_esp.c
@@ -53,7 +53,7 @@ int sun3x_esp_detect(struct scsi_host_template *tpnt)
         struct ConfigDev *esp_dev;
 
         esp_dev = 0;
-        esp = esp_allocate(tpnt, (void *) esp_dev);
+        esp = esp_allocate(tpnt, esp_dev, 0);
 
         /* Do command transfer with DMA */
         esp->do_pio_cmds = 0;