7 files changed, 25 insertions, 47 deletions

diff --git a/drivers/scsi/qla4xxx/Kconfig b/drivers/scsi/qla4xxx/Kconfig
index 08a07f0b8d94..69cbff3f57cf 100644
--- a/drivers/scsi/qla4xxx/Kconfig
+++ b/drivers/scsi/qla4xxx/Kconfig
@@ -1,6 +1,6 @@
 config SCSI_QLA_ISCSI
         tristate "QLogic ISP4XXX host adapter family support"
-        depends on PCI && SCSI
+        depends on PCI && SCSI && NET
         select SCSI_ISCSI_ATTRS
         ---help---
         This driver supports the QLogic 40xx (ISP4XXX) iSCSI host
diff --git a/drivers/scsi/qla4xxx/ql4_dbg.h b/drivers/scsi/qla4xxx/ql4_dbg.h
index 3e99dcfd5a9f..d861c3b411c8 100644
--- a/drivers/scsi/qla4xxx/ql4_dbg.h
+++ b/drivers/scsi/qla4xxx/ql4_dbg.h
@@ -22,14 +22,14 @@
 #endif
 
 #if defined(QL_DEBUG_LEVEL_2)
-#define DEBUG2(x)      do {if(qla4_extended_error_logging == 2) x;} while (0);
+#define DEBUG2(x)      do {if(ql4xextended_error_logging == 2) x;} while (0);
 #define DEBUG2_3(x)   do {x;} while (0);
 #else                           /*  */
 #define DEBUG2(x)       do {} while (0);
 #endif                          /*  */
 
 #if defined(QL_DEBUG_LEVEL_3)
-#define DEBUG3(x)      do {if(qla4_extended_error_logging == 3) x;} while (0);
+#define DEBUG3(x)      do {if(ql4xextended_error_logging == 3) x;} while (0);
 #else                           /*  */
 #define DEBUG3(x)       do {} while (0);
 #if !defined(QL_DEBUG_LEVEL_2)
diff --git a/drivers/scsi/qla4xxx/ql4_glbl.h b/drivers/scsi/qla4xxx/ql4_glbl.h
index 2c803edf2de8..eeefdcb1edb5 100644
--- a/drivers/scsi/qla4xxx/ql4_glbl.h
+++ b/drivers/scsi/qla4xxx/ql4_glbl.h
@@ -8,6 +8,7 @@
 #ifndef __QLA4x_GBL_H
 #define __QLA4x_GBL_H
 
+int ql4xxx_lock_drvr_wait(struct scsi_qla_host *a);
 int qla4xxx_send_tgts(struct scsi_qla_host *ha, char *ip, uint16_t port);
 int qla4xxx_send_command_to_isp(struct scsi_qla_host *ha, struct srb * srb);
 int qla4xxx_initialize_adapter(struct scsi_qla_host * ha,
@@ -72,7 +73,7 @@ int qla4xxx_reinitialize_ddb_list(struct scsi_qla_host * ha);
 int qla4xxx_process_ddb_changed(struct scsi_qla_host * ha,
                                 uint32_t fw_ddb_index, uint32_t state);
 
-extern int qla4_extended_error_logging;
+extern int ql4xextended_error_logging;
 extern int ql4xdiscoverywait;
 extern int ql4xdontresethba;
 #endif                          /* _QLA4x_GBL_H */
diff --git a/drivers/scsi/qla4xxx/ql4_init.c b/drivers/scsi/qla4xxx/ql4_init.c
index bb3a1c11f44c..9e81b810dc88 100644
--- a/drivers/scsi/qla4xxx/ql4_init.c
+++ b/drivers/scsi/qla4xxx/ql4_init.c
@@ -978,7 +978,7 @@ static int qla4xxx_start_firmware_from_flash(struct scsi_qla_host *ha)
         return status;
 }
 
-static int ql4xxx_lock_drvr_wait(struct scsi_qla_host *a)
+int ql4xxx_lock_drvr_wait(struct scsi_qla_host *a)
 {
 #define QL4_LOCK_DRVR_WAIT      300
 #define QL4_LOCK_DRVR_SLEEP     100
diff --git a/drivers/scsi/qla4xxx/ql4_mbx.c b/drivers/scsi/qla4xxx/ql4_mbx.c
index ef82399c0858..b721dc5dd711 100644
--- a/drivers/scsi/qla4xxx/ql4_mbx.c
+++ b/drivers/scsi/qla4xxx/ql4_mbx.c
@@ -701,7 +701,7 @@ void qla4xxx_get_conn_event_log(struct scsi_qla_host * ha)
         DEBUG3(printk("scsi%ld: Connection Event Log Dump (%d entries):\n",
                       ha->host_no, num_valid_entries));
 
-        if (qla4_extended_error_logging == 3) {
+        if (ql4xextended_error_logging == 3) {
                 if (oldest_entry == 0) {
                         /* Circular Buffer has not wrapped around */
                         for (i=0; i < num_valid_entries; i++) {
diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
index 178fcddcfd81..bab434ee774b 100644
--- a/drivers/scsi/qla4xxx/ql4_os.c
+++ b/drivers/scsi/qla4xxx/ql4_os.c
@@ -34,9 +34,9 @@ MODULE_PARM_DESC(ql4xdontresethba,
                  " default it will reset hba :0"
                  " set to 1 to avoid resetting HBA");
 
-int qla4_extended_error_logging = 0; /* 0 = off, 1 = log errors */
-module_param(qla4_extended_error_logging, int, S_IRUGO | S_IRUSR);
-MODULE_PARM_DESC(qla4_extended_error_logging,
+int ql4xextended_error_logging = 0; /* 0 = off, 1 = log errors */
+module_param(ql4xextended_error_logging, int, S_IRUGO | S_IRUSR);
+MODULE_PARM_DESC(ql4xextended_error_logging,
                  "Option to enable extended error logging, "
                  "Default is 0 - no logging, 1 - debug logging");
 
@@ -919,18 +919,11 @@ static int qla4xxx_recover_adapter(struct scsi_qla_host *ha,
         if (status == QLA_SUCCESS) {
                 DEBUG2(printk("scsi%ld: %s - Performing soft reset..\n",
                               ha->host_no, __func__));
-                status = qla4xxx_soft_reset(ha);
-        }
-        /* FIXMEkaren: Do we want to keep interrupts enabled and process
-           AENs after soft reset */
-
-        /* If firmware (SOFT) reset failed, or if all outstanding
-         * commands have not returned, then do a HARD reset.
-         */
-        if (status == QLA_ERROR) {
-                DEBUG2(printk("scsi%ld: %s - Performing hard reset..\n",
-                              ha->host_no, __func__));
-                status = qla4xxx_hard_reset(ha);
+                qla4xxx_flush_active_srbs(ha);
+                if (ql4xxx_lock_drvr_wait(ha) == QLA_SUCCESS)
+                        status = qla4xxx_soft_reset(ha);
+                else
+                        status = QLA_ERROR;
         }
 
         /* Flush any pending ddb changed AENs */
@@ -1016,13 +1009,9 @@ static void qla4xxx_do_dpc(void *data)
         struct scsi_qla_host *ha = (struct scsi_qla_host *) data;
         struct ddb_entry *ddb_entry, *dtemp;
 
-        DEBUG2(printk("scsi%ld: %s: DPC handler waking up.\n",
-                      ha->host_no, __func__));
-
-        DEBUG2(printk("scsi%ld: %s: ha->flags = 0x%08lx\n",
-                      ha->host_no, __func__, ha->flags));
-        DEBUG2(printk("scsi%ld: %s: ha->dpc_flags = 0x%08lx\n",
-                      ha->host_no, __func__, ha->dpc_flags));
+        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));
 
         /* Initialization not yet finished. Don't do anything yet. */
         if (!test_bit(AF_INIT_DONE, &ha->flags))
@@ -1032,16 +1021,8 @@ static void qla4xxx_do_dpc(void *data)
             test_bit(DPC_RESET_HA, &ha->dpc_flags) ||
             test_bit(DPC_RESET_HA_INTR, &ha->dpc_flags) ||
             test_bit(DPC_RESET_HA_DESTROY_DDB_LIST, &ha->dpc_flags)) {
-                if (test_bit(DPC_RESET_HA_DESTROY_DDB_LIST, &ha->dpc_flags))
-                        /*
-                         * dg 09/23 Never initialize ddb list
-                         * once we up and running
-                         * qla4xxx_recover_adapter(ha,
-                         *    REBUILD_DDB_LIST);
-                         */
-                        qla4xxx_recover_adapter(ha, PRESERVE_DDB_LIST);
-
-                if (test_bit(DPC_RESET_HA, &ha->dpc_flags))
+                if (test_bit(DPC_RESET_HA_DESTROY_DDB_LIST, &ha->dpc_flags) ||
+                        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)) {
@@ -1122,7 +1103,8 @@ static void qla4xxx_free_adapter(struct scsi_qla_host *ha)
                 destroy_workqueue(ha->dpc_thread);
 
         /* Issue Soft Reset to put firmware in unknown state */
-        qla4xxx_soft_reset(ha);
+        if (ql4xxx_lock_drvr_wait(ha) == QLA_SUCCESS)
+                qla4xxx_soft_reset(ha);
 
         /* Remove timer thread, if present */
         if (ha->timer_active)
@@ -1714,7 +1696,7 @@ static int __init qla4xxx_module_init(void)
 
         /* Derive version string. */
         strcpy(qla4xxx_version_str, QLA4XXX_DRIVER_VERSION);
-        if (qla4_extended_error_logging)
+        if (ql4xextended_error_logging)
                 strcat(qla4xxx_version_str, "-debug");
 
         qla4xxx_scsi_transport =
@@ -1724,13 +1706,13 @@ static int __init qla4xxx_module_init(void)
                 goto release_srb_cache;
         }
 
-        printk(KERN_INFO "QLogic iSCSI HBA Driver\n");
         ret = pci_register_driver(&qla4xxx_pci_driver);
         if (ret)
                 goto unregister_transport;
 
         printk(KERN_INFO "QLogic iSCSI HBA Driver\n");
         return 0;
+
 unregister_transport:
         iscsi_unregister_transport(&qla4xxx_iscsi_transport);
 release_srb_cache:
diff --git a/drivers/scsi/qla4xxx/ql4_version.h b/drivers/scsi/qla4xxx/ql4_version.h
index b3fe7e68988e..d05048b4e88a 100644
--- a/drivers/scsi/qla4xxx/ql4_version.h
+++ b/drivers/scsi/qla4xxx/ql4_version.h
@@ -5,9 +5,4 @@
  * See LICENSE.qla4xxx for copyright and licensing details.
  */
 
-#define QLA4XXX_DRIVER_VERSION  "5.00.05b9-k"
-
-#define QL4_DRIVER_MAJOR_VER    5
-#define QL4_DRIVER_MINOR_VER    0
-#define QL4_DRIVER_PATCH_VER    5
-#define QL4_DRIVER_BETA_VER     9
+#define QLA4XXX_DRIVER_VERSION  "5.00.06-k"