[PATCH 01/13] qla4xxx: cleanup qla4xxx_initialize_ddb_list()

[PATCH 01/13] qla4xxx: cleanup qla4xxx_initialize_ddb_list()

[vikas.chaudhary]

From: Vikas Chaudhary <vikas.chaudhary@qlogic.com>

Remove process all aen code from qla4xxx_initialize_ddb_list()
as DPC activities should be done in DPC only.

Signed-off-by: Vikas Chaudhary <vikas.chaudhary@qlogic.com>
---
 drivers/scsi/qla4xxx/ql4_init.c |    7 -------
 1 files changed, 0 insertions(+), 7 deletions(-)

diff --git a/drivers/scsi/qla4xxx/ql4_init.c b/drivers/scsi/qla4xxx/ql4_init.c
index 1629c48..22fc57e 100644
--- a/drivers/scsi/qla4xxx/ql4_init.c
+++ b/drivers/scsi/qla4xxx/ql4_init.c
@@ -1013,13 +1013,6 @@ static int qla4xxx_initialize_ddb_list(struct scsi_qla_host *ha)
 	if ((status = qla4xxx_build_ddb_list(ha)) == QLA_ERROR)
 		return status;
 
-	/*
-	 * Targets can come online after the inital discovery, so processing
-	 * the aens here will catch them.
-	 */
-	if (test_and_clear_bit(DPC_AEN, &ha->dpc_flags))
-		qla4xxx_process_aen(ha, PROCESS_ALL_AENS);
-
 	return status;
 }
 
-- 
1.7.3.2

[PATCH 02/13] qla4xxx: Do not send mbox command if FW is in failed state

[vikas.chaudhary]

From: Prasanna Mumbai <prasanna.mumbai@qlogic.com>

FW is not able to process mbox command if FW state is failed. This will cause
mbox command to timeout and adapter reset. We have separate function to detect
FW failed state and do adapter reset. So to avoid mbox command timeout, do not
process mbox command in case of FW state failed.

Signed-off-by: Vikas Chaudhary <vikas.chaudhary@qlogic.com>
Signed-off-by: Prasanna Mumbai <prasanna.mumbai@qlogic.com>
---
 drivers/scsi/qla4xxx/ql4_mbx.c |   24 ++++++++++++++++++------
 1 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/drivers/scsi/qla4xxx/ql4_mbx.c b/drivers/scsi/qla4xxx/ql4_mbx.c
index f65626a..47b2591 100644
--- a/drivers/scsi/qla4xxx/ql4_mbx.c
+++ b/drivers/scsi/qla4xxx/ql4_mbx.c
@@ -32,6 +32,7 @@ int qla4xxx_mailbox_command(struct scsi_qla_host *ha, uint8_t inCount,
 	u_long wait_count;
 	uint32_t intr_status;
 	unsigned long flags = 0;
+	uint32_t dev_state;
 
 	/* Make sure that pointers are valid */
 	if (!mbx_cmd || !mbx_sts) {
@@ -40,12 +41,23 @@ int qla4xxx_mailbox_command(struct scsi_qla_host *ha, uint8_t inCount,
 		return status;
 	}
 
-	if (is_qla8022(ha) &&
-	    test_bit(AF_FW_RECOVERY, &ha->flags)) {
-		DEBUG2(ql4_printk(KERN_WARNING, ha, "scsi%ld: %s: prematurely "
-		    "completing mbx cmd as firmware recovery detected\n",
-		    ha->host_no, __func__));
-		return status;
+	if (is_qla8022(ha)) {
+		if (test_bit(AF_FW_RECOVERY, &ha->flags)) {
+			DEBUG2(ql4_printk(KERN_WARNING, ha, "scsi%ld: %s: "
+			    "prematurely completing mbx cmd as firmware "
+			    "recovery detected\n", ha->host_no, __func__));
+			return status;
+		}
+		/* Do not send any mbx cmd if h/w is in failed state*/
+		qla4_8xxx_idc_lock(ha);
+		dev_state = qla4_8xxx_rd_32(ha, QLA82XX_CRB_DEV_STATE);
+		qla4_8xxx_idc_unlock(ha);
+		if (dev_state == QLA82XX_DEV_FAILED) {
+			ql4_printk(KERN_WARNING, ha, "scsi%ld: %s: H/W is in "
+			    "failed state, do not send any mailbox commands\n",
+			    ha->host_no, __func__);
+			return status;
+		}
 	}
 
 	if ((is_aer_supported(ha)) &&
-- 
1.7.3.2

[PATCH 03/13] qla4xxx: Do not retry ISP82XX initialization if H/W state is failed

[vikas.chaudhary]

From: Prasanna Mumbai <prasanna.mumbai@qlogic.com>

Signed-off-by: Vikas Chaudhary <vikas.chaudhary@qlogic.com>
Signed-off-by: Prasanna Mumbai <prasanna.mumbai@qlogic.com>
---
 drivers/scsi/qla4xxx/ql4_os.c |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 deletions(-)

diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
index 3fc1d25..d1501fb 100644
--- a/drivers/scsi/qla4xxx/ql4_os.c
+++ b/drivers/scsi/qla4xxx/ql4_os.c
@@ -1630,6 +1630,7 @@ static int __devinit qla4xxx_probe_adapter(struct pci_dev *pdev,
 	uint8_t init_retry_count = 0;
 	char buf[34];
 	struct qla4_8xxx_legacy_intr_set *nx_legacy_intr;
+	uint32_t dev_state;
 
 	if (pci_enable_device(pdev))
 		return -1;
@@ -1713,6 +1714,18 @@ static int __devinit qla4xxx_probe_adapter(struct pci_dev *pdev,
 	status = qla4xxx_initialize_adapter(ha, REBUILD_DDB_LIST);
 	while ((!test_bit(AF_ONLINE, &ha->flags)) &&
 	    init_retry_count++ < MAX_INIT_RETRIES) {
+
+		if (is_qla8022(ha)) {
+			qla4_8xxx_idc_lock(ha);
+			dev_state = qla4_8xxx_rd_32(ha, QLA82XX_CRB_DEV_STATE);
+			qla4_8xxx_idc_unlock(ha);
+			if (dev_state == QLA82XX_DEV_FAILED) {
+				ql4_printk(KERN_WARNING, ha, "%s: don't retry "
+				    "initialize adapter. H/W is in failed state\n",
+				    __func__);
+				break;
+			}
+		}
 		DEBUG2(printk("scsi: %s: retrying adapter initialization "
 			      "(%d)\n", __func__, init_retry_count));
 
-- 
1.7.3.2

[PATCH 04/13] qla4xxx: cleanup DDB relogin logic during initialization

[vikas.chaudhary]

From: Karen Higgins <karen.higgins@qlogic.com>

Driver has capability to add device dynamically and present
them to OS, driver no longer need to wait for DDBs to come
online during driver initialization.
Driver still issues a relogin for DDBs that are not online,
but no longer wait for DDB to come online.

Signed-off-by: Vikas Chaudhary <vikas.chaudhary@qlogic.com>
Signed-off-by: Karen Higgins <karen.higgins@qlogic.com>
---
 drivers/scsi/qla4xxx/ql4_def.h  |    5 -
 drivers/scsi/qla4xxx/ql4_glbl.h |    1 -
 drivers/scsi/qla4xxx/ql4_init.c |  183 +++++++--------------------------------
 drivers/scsi/qla4xxx/ql4_isr.c  |   29 +------
 drivers/scsi/qla4xxx/ql4_mbx.c  |    3 -
 drivers/scsi/qla4xxx/ql4_os.c   |    4 -
 6 files changed, 33 insertions(+), 192 deletions(-)

diff --git a/drivers/scsi/qla4xxx/ql4_def.h b/drivers/scsi/qla4xxx/ql4_def.h
index 2fc0045..b46d0dc 100644
--- a/drivers/scsi/qla4xxx/ql4_def.h
+++ b/drivers/scsi/qla4xxx/ql4_def.h
@@ -233,9 +233,6 @@ struct ddb_entry {
 
 	unsigned long flags;	/* DDB Flags */
 
-	unsigned long dev_scan_wait_to_start_relogin;
-	unsigned long dev_scan_wait_to_complete_relogin;
-
 	uint16_t fw_ddb_index;	/* DDB firmware index */
 	uint16_t options;
 	uint32_t fw_ddb_device_state; /* F/W Device State  -- see ql4_fw.h */
@@ -479,7 +476,6 @@ struct scsi_qla_host {
 	uint32_t timer_active;
 
 	/* Recovery Timers */
-	uint32_t discovery_wait;
 	atomic_t check_relogin_timeouts;
 	uint32_t retry_reset_ha_cnt;
 	uint32_t isp_reset_timer;	/* reset test timer */
@@ -765,6 +761,5 @@ static inline void ql4xxx_unlock_drvr(struct scsi_qla_host *a)
 /* Defines for process_aen() */
 #define PROCESS_ALL_AENS	 0
 #define FLUSH_DDB_CHANGED_AENS	 1
-#define RELOGIN_DDB_CHANGED_AENS 2
 
 #endif	/*_QLA4XXX_H */
diff --git a/drivers/scsi/qla4xxx/ql4_glbl.h b/drivers/scsi/qla4xxx/ql4_glbl.h
index 8fad99b..cc53e3f 100644
--- a/drivers/scsi/qla4xxx/ql4_glbl.h
+++ b/drivers/scsi/qla4xxx/ql4_glbl.h
@@ -136,7 +136,6 @@ void qla4_8xxx_clear_drv_active(struct scsi_qla_host *ha);
 void qla4_8xxx_set_drv_active(struct scsi_qla_host *ha);
 
 extern int ql4xextended_error_logging;
-extern int ql4xdiscoverywait;
 extern int ql4xdontresethba;
 extern int ql4xenablemsix;
 
diff --git a/drivers/scsi/qla4xxx/ql4_init.c b/drivers/scsi/qla4xxx/ql4_init.c
index 22fc57e..bf1c30b 100644
--- a/drivers/scsi/qla4xxx/ql4_init.c
+++ b/drivers/scsi/qla4xxx/ql4_init.c
@@ -723,13 +723,38 @@ int qla4_is_relogin_allowed(struct scsi_qla_host *ha, uint32_t conn_err)
 	return relogin;
 }
 
+static void qla4xxx_flush_AENS(struct scsi_qla_host *ha)
+{
+	unsigned long wtime;
+
+	/* Flush the 0x8014 AEN from the firmware as a result of
+	 * Auto connect. We are basically doing get_firmware_ddb()
+	 * to determine whether we need to log back in or not.
+	 * Trying to do a set ddb before we have processed 0x8014
+	 * will result in another set_ddb() for the same ddb. In other
+	 * words there will be stale entries in the aen_q.
+	 */
+	wtime = jiffies + (2 * HZ);
+	do {
+		if (qla4xxx_get_firmware_state(ha) == QLA_SUCCESS)
+			if (ha->firmware_state & (BIT_2 | BIT_0))
+				return;
+
+		if (test_and_clear_bit(DPC_AEN, &ha->dpc_flags))
+			qla4xxx_process_aen(ha, FLUSH_DDB_CHANGED_AENS);
+
+		msleep(1000);
+	} while (!time_after_eq(jiffies, wtime));
+}
+
 /**
- * qla4xxx_configure_ddbs - builds driver ddb list
+ * qla4xxx_build_ddb_list - builds driver ddb list
  * @ha: Pointer to host adapter structure.
  *
  * This routine searches for all valid firmware ddb entries and builds
  * an internal ddb list. Ddbs that are considered valid are those with
  * a device state of SESSION_ACTIVE.
+ * A relogin (set_ddb) is issued for DDBs that are not online.
  **/
 static int qla4xxx_build_ddb_list(struct scsi_qla_host *ha)
 {
@@ -744,6 +769,8 @@ static int qla4xxx_build_ddb_list(struct scsi_qla_host *ha)
 	uint32_t ipv6_device;
 	uint32_t new_tgt;
 
+	qla4xxx_flush_AENS(ha);
+
 	fw_ddb_entry = dma_alloc_coherent(&ha->pdev->dev, sizeof(*fw_ddb_entry),
 			&fw_ddb_entry_dma, GFP_KERNEL);
 	if (fw_ddb_entry == NULL) {
@@ -847,144 +874,6 @@ exit_build_ddb_list_no_free:
 	return status;
 }
 
-struct qla4_relog_scan {
-	int halt_wait;
-	uint32_t conn_err;
-	uint32_t fw_ddb_index;
-	uint32_t next_fw_ddb_index;
-	uint32_t fw_ddb_device_state;
-};
-
-static int qla4_test_rdy(struct scsi_qla_host *ha, struct qla4_relog_scan *rs)
-{
-	struct ddb_entry *ddb_entry;
-
-	if (qla4_is_relogin_allowed(ha, rs->conn_err)) {
-		/* We either have a device that is in
-		 * the process of relogging in or a
-		 * device that is waiting to be
-		 * relogged in */
-		rs->halt_wait = 0;
-
-		ddb_entry = qla4xxx_lookup_ddb_by_fw_index(ha,
-							   rs->fw_ddb_index);
-		if (ddb_entry == NULL)
-			return QLA_ERROR;
-
-		if (ddb_entry->dev_scan_wait_to_start_relogin != 0
-		    && time_after_eq(jiffies,
-				     ddb_entry->
-				     dev_scan_wait_to_start_relogin))
-		{
-			ddb_entry->dev_scan_wait_to_start_relogin = 0;
-			qla4xxx_set_ddb_entry(ha, rs->fw_ddb_index, 0);
-		}
-	}
-	return QLA_SUCCESS;
-}
-
-static int qla4_scan_for_relogin(struct scsi_qla_host *ha,
-				 struct qla4_relog_scan *rs)
-{
-	int error;
-
-	/* scan for relogins
-	 * ----------------- */
-	for (rs->fw_ddb_index = 0; rs->fw_ddb_index < MAX_DDB_ENTRIES;
-	     rs->fw_ddb_index = rs->next_fw_ddb_index) {
-		if (qla4xxx_get_fwddb_entry(ha, rs->fw_ddb_index, NULL, 0,
-					    NULL, &rs->next_fw_ddb_index,
-					    &rs->fw_ddb_device_state,
-					    &rs->conn_err, NULL, NULL)
-		    == QLA_ERROR)
-			return QLA_ERROR;
-
-		if (rs->fw_ddb_device_state == DDB_DS_LOGIN_IN_PROCESS)
-			rs->halt_wait = 0;
-
-		if (rs->fw_ddb_device_state == DDB_DS_SESSION_FAILED ||
-		    rs->fw_ddb_device_state == DDB_DS_NO_CONNECTION_ACTIVE) {
-			error = qla4_test_rdy(ha, rs);
-			if (error)
-				return error;
-		}
-
-		/* We know we've reached the last device when
-		 * next_fw_ddb_index is 0 */
-		if (rs->next_fw_ddb_index == 0)
-			break;
-	}
-	return QLA_SUCCESS;
-}
-
-/**
- * qla4xxx_devices_ready - wait for target devices to be logged in
- * @ha: pointer to adapter structure
- *
- * This routine waits up to ql4xdiscoverywait seconds
- * F/W database during driver load time.
- **/
-static int qla4xxx_devices_ready(struct scsi_qla_host *ha)
-{
-	int error;
-	unsigned long discovery_wtime;
-	struct qla4_relog_scan rs;
-
-	discovery_wtime = jiffies + (ql4xdiscoverywait * HZ);
-
-	DEBUG(printk("Waiting (%d) for devices ...\n", ql4xdiscoverywait));
-	do {
-		/* poll for AEN. */
-		qla4xxx_get_firmware_state(ha);
-		if (test_and_clear_bit(DPC_AEN, &ha->dpc_flags)) {
-			/* Set time-between-relogin timer */
-			qla4xxx_process_aen(ha, RELOGIN_DDB_CHANGED_AENS);
-		}
-
-		/* if no relogins active or needed, halt discvery wait */
-		rs.halt_wait = 1;
-
-		error = qla4_scan_for_relogin(ha, &rs);
-
-		if (rs.halt_wait) {
-			DEBUG2(printk("scsi%ld: %s: Delay halted.  Devices "
-				      "Ready.\n", ha->host_no, __func__));
-			return QLA_SUCCESS;
-		}
-
-		msleep(2000);
-	} while (!time_after_eq(jiffies, discovery_wtime));
-
-	DEBUG3(qla4xxx_get_conn_event_log(ha));
-
-	return QLA_SUCCESS;
-}
-
-static void qla4xxx_flush_AENS(struct scsi_qla_host *ha)
-{
-	unsigned long wtime;
-
-	/* Flush the 0x8014 AEN from the firmware as a result of
-	 * Auto connect. We are basically doing get_firmware_ddb()
-	 * to determine whether we need to log back in or not.
-	 *  Trying to do a set ddb before we have processed 0x8014
-	 *  will result in another set_ddb() for the same ddb. In other
-	 *  words there will be stale entries in the aen_q.
-	 */
-	wtime = jiffies + (2 * HZ);
-	do {
-		if (qla4xxx_get_firmware_state(ha) == QLA_SUCCESS)
-			if (ha->firmware_state & (BIT_2 | BIT_0))
-				return;
-
-		if (test_and_clear_bit(DPC_AEN, &ha->dpc_flags))
-			qla4xxx_process_aen(ha, FLUSH_DDB_CHANGED_AENS);
-
-		msleep(1000);
-	} while (!time_after_eq(jiffies, wtime));
-
-}
-
 static int qla4xxx_initialize_ddb_list(struct scsi_qla_host *ha)
 {
 	uint16_t fw_ddb_index;
@@ -996,22 +885,12 @@ static int qla4xxx_initialize_ddb_list(struct scsi_qla_host *ha)
 
 	for (fw_ddb_index = 0; fw_ddb_index < MAX_DDB_ENTRIES; fw_ddb_index++)
 		ha->fw_ddb_index_map[fw_ddb_index] =
-			(struct ddb_entry *)INVALID_ENTRY;
+		    (struct ddb_entry *)INVALID_ENTRY;
 
 	ha->tot_ddbs = 0;
 
-	qla4xxx_flush_AENS(ha);
-
-	/* Wait for an AEN */
-	qla4xxx_devices_ready(ha);
-
-	/*
-	 * First perform device discovery for active
-	 * fw ddb indexes and build
-	 * ddb list.
-	 */
-	if ((status = qla4xxx_build_ddb_list(ha)) == QLA_ERROR)
-		return status;
+	/* Perform device discovery and build ddb list. */
+	status = qla4xxx_build_ddb_list(ha);
 
 	return status;
 }
diff --git a/drivers/scsi/qla4xxx/ql4_isr.c b/drivers/scsi/qla4xxx/ql4_isr.c
index 6ffbe97..2ef1a98 100644
--- a/drivers/scsi/qla4xxx/ql4_isr.c
+++ b/drivers/scsi/qla4xxx/ql4_isr.c
@@ -1008,34 +1008,9 @@ void qla4xxx_process_aen(struct scsi_qla_host * ha, uint8_t process_aen)
 					      mbox_sts[0], mbox_sts[2],
 					      mbox_sts[3]));
 				break;
-			} else if (process_aen == RELOGIN_DDB_CHANGED_AENS) {
-				/* for use during init time, we only want to
-				 * relogin non-active ddbs */
-				struct ddb_entry *ddb_entry;
-
-				ddb_entry =
-					/* FIXME: name length? */
-					qla4xxx_lookup_ddb_by_fw_index(ha,
-								       mbox_sts[2]);
-				if (!ddb_entry)
-					break;
-
-				ddb_entry->dev_scan_wait_to_complete_relogin =
-					0;
-				ddb_entry->dev_scan_wait_to_start_relogin =
-					jiffies +
-					((ddb_entry->default_time2wait +
-					  4) * HZ);
-
-				DEBUG2(printk("scsi%ld: ddb [%d] initate"
-					      " RELOGIN after %d seconds\n",
-					      ha->host_no,
-					      ddb_entry->fw_ddb_index,
-					      ddb_entry->default_time2wait +
-					      4));
-				break;
 			}
-
+		case PROCESS_ALL_AENS:
+		default:
 			if (mbox_sts[1] == 0) {	/* Global DB change. */
 				qla4xxx_reinitialize_ddb_list(ha);
 			} else if (mbox_sts[1] == 1) {	/* Specific device. */
diff --git a/drivers/scsi/qla4xxx/ql4_mbx.c b/drivers/scsi/qla4xxx/ql4_mbx.c
index 47b2591..379df2b 100644
--- a/drivers/scsi/qla4xxx/ql4_mbx.c
+++ b/drivers/scsi/qla4xxx/ql4_mbx.c
@@ -407,9 +407,6 @@ qla4xxx_update_local_ifcb(struct scsi_qla_host *ha,
 	/*memcpy(ha->alias, init_fw_cb->Alias,
 	       min(sizeof(ha->alias), sizeof(init_fw_cb->Alias)));*/
 
-	/* Save Command Line Paramater info */
-	ha->discovery_wait = ql4xdiscoverywait;
-
 	if (ha->acb_version == ACB_SUPPORTED) {
 		ha->ipv6_options = init_fw_cb->ipv6_opts;
 		ha->ipv6_addl_options = init_fw_cb->ipv6_addtl_opts;
diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
index d1501fb..6068f80 100644
--- a/drivers/scsi/qla4xxx/ql4_os.c
+++ b/drivers/scsi/qla4xxx/ql4_os.c
@@ -29,10 +29,6 @@ static struct kmem_cache *srb_cachep;
 /*
  * Module parameter information and variables
  */
-int ql4xdiscoverywait = 60;
-module_param(ql4xdiscoverywait, int, S_IRUGO | S_IWUSR);
-MODULE_PARM_DESC(ql4xdiscoverywait, "Discovery wait time");
-
 int ql4xdontresethba = 0;
 module_param(ql4xdontresethba, int, S_IRUGO | S_IWUSR);
 MODULE_PARM_DESC(ql4xdontresethba,
-- 
1.7.3.2

[PATCH 05/13] qla4xxx: remove unused ddb flag DF_NO_RELOGIN

[vikas.chaudhary]

From: Vikas Chaudhary <vikas.chaudhary@qlogic.com>

Signed-off-by: Vikas Chaudhary <vikas.chaudhary@qlogic.com>
---
 drivers/scsi/qla4xxx/ql4_def.h  |    2 --
 drivers/scsi/qla4xxx/ql4_init.c |    2 --
 2 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/drivers/scsi/qla4xxx/ql4_def.h b/drivers/scsi/qla4xxx/ql4_def.h
index b46d0dc..7aa60ee 100644
--- a/drivers/scsi/qla4xxx/ql4_def.h
+++ b/drivers/scsi/qla4xxx/ql4_def.h
@@ -286,8 +286,6 @@ struct ddb_entry {
  * DDB flags.
  */
 #define DF_RELOGIN		0	/* Relogin to device */
-#define DF_NO_RELOGIN		1	/* Do not relogin if IOCTL
-					 * logged it out */
 #define DF_ISNS_DISCOVERED	2	/* Device was discovered via iSNS */
 #define DF_FO_MASKED		3
 
diff --git a/drivers/scsi/qla4xxx/ql4_init.c b/drivers/scsi/qla4xxx/ql4_init.c
index bf1c30b..8b5453a 100644
--- a/drivers/scsi/qla4xxx/ql4_init.c
+++ b/drivers/scsi/qla4xxx/ql4_init.c
@@ -1445,7 +1445,6 @@ int qla4xxx_process_ddb_changed(struct scsi_qla_host *ha, uint32_t fw_ddb_index,
 		atomic_set(&ddb_entry->relogin_retry_count, 0);
 		atomic_set(&ddb_entry->relogin_timer, 0);
 		clear_bit(DF_RELOGIN, &ddb_entry->flags);
-		clear_bit(DF_NO_RELOGIN, &ddb_entry->flags);
 		iscsi_unblock_session(ddb_entry->sess);
 		iscsi_session_event(ddb_entry->sess,
 				    ISCSI_KEVENT_CREATE_SESSION);
@@ -1470,7 +1469,6 @@ int qla4xxx_process_ddb_changed(struct scsi_qla_host *ha, uint32_t fw_ddb_index,
 		 */
 		if (ddb_entry->fw_ddb_device_state == DDB_DS_SESSION_FAILED &&
 		    !test_bit(DF_RELOGIN, &ddb_entry->flags) &&
-		    !test_bit(DF_NO_RELOGIN, &ddb_entry->flags) &&
 		    qla4_is_relogin_allowed(ha, conn_err)) {
 			/*
 			 * This triggers a relogin.  After the relogin_timer
-- 
1.7.3.2

[PATCH 06/13] qla4xxx: Prevent other port reinitialization during remove_adapter

[vikas.chaudhary]

From: Karen Higgins <karen.higgins@qlogic.com>

remove ha flag AF_HBA_GOING_AWAY and added flag AF_HA_REMOVAL
to mark the other ISP-4xxx port to indicate that the driver is
being removed, so that the other port will not re-initialize
while in the process of removing the ha due to driver unload
or hba hotplug.

Signed-off-by: Karen Higgins <karen.higgins@qlogic.com>
Signed-off-by: Vikas Chaudhary <vikas.chaudhary@qlogic.com>
---
 drivers/scsi/qla4xxx/ql4_def.h |    5 +++-
 drivers/scsi/qla4xxx/ql4_isr.c |    2 +-
 drivers/scsi/qla4xxx/ql4_mbx.c |    2 +-
 drivers/scsi/qla4xxx/ql4_os.c  |   53 ++++++++++++++++++++++++++++++----------
 4 files changed, 46 insertions(+), 16 deletions(-)

diff --git a/drivers/scsi/qla4xxx/ql4_def.h b/drivers/scsi/qla4xxx/ql4_def.h
index 7aa60ee..c1f8d1b 100644
--- a/drivers/scsi/qla4xxx/ql4_def.h
+++ b/drivers/scsi/qla4xxx/ql4_def.h
@@ -53,6 +53,9 @@
 #define PCI_DEVICE_ID_QLOGIC_ISP8022	0x8022
 #endif
 
+#define ISP4XXX_PCI_FN_1	0x1
+#define ISP4XXX_PCI_FN_2	0x3
+
 #define QLA_SUCCESS			0
 #define QLA_ERROR			1
 
@@ -371,7 +374,7 @@ struct scsi_qla_host {
 #define AF_LINK_UP			8 /* 0x00000100 */
 #define AF_IRQ_ATTACHED			10 /* 0x00000400 */
 #define AF_DISABLE_ACB_COMPLETE		11 /* 0x00000800 */
-#define AF_HBA_GOING_AWAY		12 /* 0x00001000 */
+#define AF_HA_REMOVAL			12 /* 0x00001000 */
 #define AF_INTx_ENABLED			15 /* 0x00008000 */
 #define AF_MSI_ENABLED			16 /* 0x00010000 */
 #define AF_MSIX_ENABLED			17 /* 0x00020000 */
diff --git a/drivers/scsi/qla4xxx/ql4_isr.c b/drivers/scsi/qla4xxx/ql4_isr.c
index 2ef1a98..2f40ac7 100644
--- a/drivers/scsi/qla4xxx/ql4_isr.c
+++ b/drivers/scsi/qla4xxx/ql4_isr.c
@@ -801,7 +801,7 @@ irqreturn_t qla4xxx_intr_handler(int irq, void *dev_id)
 			       &ha->reg->ctrl_status);
 			readl(&ha->reg->ctrl_status);
 
-			if (!test_bit(AF_HBA_GOING_AWAY, &ha->flags))
+			if (!test_bit(AF_HA_REMOVAL, &ha->flags))
 				set_bit(DPC_RESET_HA_INTR, &ha->dpc_flags);
 
 			break;
diff --git a/drivers/scsi/qla4xxx/ql4_mbx.c b/drivers/scsi/qla4xxx/ql4_mbx.c
index 379df2b..199fa64 100644
--- a/drivers/scsi/qla4xxx/ql4_mbx.c
+++ b/drivers/scsi/qla4xxx/ql4_mbx.c
@@ -151,7 +151,7 @@ int qla4xxx_mailbox_command(struct scsi_qla_host *ha, uint8_t inCount,
 	if (test_bit(AF_IRQ_ATTACHED, &ha->flags) &&
 	    test_bit(AF_INTERRUPTS_ON, &ha->flags) &&
 	    test_bit(AF_ONLINE, &ha->flags) &&
-	    !test_bit(AF_HBA_GOING_AWAY, &ha->flags)) {
+	    !test_bit(AF_HA_REMOVAL, &ha->flags)) {
 		/* Do not poll for completion. Use completion queue */
 		set_bit(AF_MBOX_COMMAND_NOPOLL, &ha->flags);
 		wait_for_completion_timeout(&ha->mbx_intr_comp, MBOX_TOV * HZ);
diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
index 6068f80..277c45f 100644
--- a/drivers/scsi/qla4xxx/ql4_os.c
+++ b/drivers/scsi/qla4xxx/ql4_os.c
@@ -749,12 +749,6 @@ static void qla4xxx_timer(struct scsi_qla_host *ha)
 	if (!pci_channel_offline(ha->pdev))
 		pci_read_config_word(ha->pdev, PCI_VENDOR_ID, &w);
 
-	if (test_bit(AF_HBA_GOING_AWAY, &ha->flags)) {
-		DEBUG2(ql4_printk(KERN_INFO, ha, "%s exited. HBA GOING AWAY\n",
-		    __func__));
-		return;
-	}
-
 	if (is_qla8022(ha)) {
 		qla4_8xxx_watchdog(ha);
 	}
@@ -1063,7 +1057,6 @@ void qla4xxx_dead_adapter_cleanup(struct scsi_qla_host *ha)
 
 	/* Disable the board */
 	ql4_printk(KERN_INFO, ha, "Disabling the board\n");
-	set_bit(AF_HBA_GOING_AWAY, &ha->flags);
 
 	qla4xxx_abort_active_cmds(ha, DID_NO_CONNECT << 16);
 	qla4xxx_mark_all_devices_missing(ha);
@@ -1255,11 +1248,6 @@ static void qla4xxx_do_dpc(struct work_struct *work)
 		goto do_dpc_exit;
 	}
 
-	/* HBA is in the process of being permanently disabled.
-	 * Don't process anything */
-	if (test_bit(AF_HBA_GOING_AWAY, &ha->flags))
-		return;
-
 	if (is_qla8022(ha)) {
 		if (test_bit(DPC_HA_UNRECOVERABLE, &ha->dpc_flags)) {
 			qla4_8xxx_idc_lock(ha);
@@ -1824,6 +1812,44 @@ probe_disable_device:
 }
 
 /**
+ * qla4xxx_prevent_other_port_reinit - prevent other port from re-initialize
+ * @ha: pointer to adapter structure
+ *
+ * Mark the other ISP-4xxx port to indicate that the driver is being removed,
+ * so that the other port will not re-initialize while in the process of
+ * removing the ha due to driver unload or hba hotplug.
+ **/
+static void qla4xxx_prevent_other_port_reinit(struct scsi_qla_host *ha)
+{
+	struct scsi_qla_host *other_ha = NULL;
+	struct pci_dev *other_pdev = NULL;
+	int fn = ISP4XXX_PCI_FN_2;
+
+	/*iscsi function numbers for ISP4xxx is 1 and 3*/
+	if (PCI_FUNC(ha->pdev->devfn) & BIT_1)
+		fn = ISP4XXX_PCI_FN_1;
+
+	other_pdev =
+		pci_get_domain_bus_and_slot(pci_domain_nr(ha->pdev->bus),
+		ha->pdev->bus->number, PCI_DEVFN(PCI_SLOT(ha->pdev->devfn),
+		fn));
+
+	/* Get other_ha if other_pdev is valid and state is enable*/
+	if (other_pdev) {
+		if (atomic_read(&other_pdev->enable_cnt)) {
+			other_ha = pci_get_drvdata(other_pdev);
+			if (other_ha) {
+				set_bit(AF_HA_REMOVAL, &other_ha->flags);
+				DEBUG2(ql4_printk(KERN_INFO, ha, "%s: "
+				    "Prevent %s reinit\n", __func__,
+				    dev_name(&other_ha->pdev->dev)));
+			}
+		}
+		pci_dev_put(other_pdev);
+	}
+}
+
+/**
  * qla4xxx_remove_adapter - calback function to remove adapter.
  * @pci_dev: PCI device pointer
  **/
@@ -1833,7 +1859,8 @@ static void __devexit qla4xxx_remove_adapter(struct pci_dev *pdev)
 
 	ha = pci_get_drvdata(pdev);
 
-	set_bit(AF_HBA_GOING_AWAY, &ha->flags);
+	if (!is_qla8022(ha))
+		qla4xxx_prevent_other_port_reinit(ha);
 
 	/* remove devs from iscsi_sessions to scsi_devices */
 	qla4xxx_free_ddb_list(ha);
-- 
1.7.3.2

[PATCH 07/13] qla4xxx: cleanup function qla4xxx_process_ddb_changed

[vikas.chaudhary]

From: Vikas Chaudhary <vikas.chaudhary@qlogic.com>

We don't need to check ddb old state we can take action
based on ddb new state.

Signed-off-by: Vikas Chaudhary <vikas.chaudhary@qlogic.com>
---
 drivers/scsi/qla4xxx/ql4_init.c |   15 +++------------
 1 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/drivers/scsi/qla4xxx/ql4_init.c b/drivers/scsi/qla4xxx/ql4_init.c
index 8b5453a..bbb2e90 100644
--- a/drivers/scsi/qla4xxx/ql4_init.c
+++ b/drivers/scsi/qla4xxx/ql4_init.c
@@ -1409,7 +1409,6 @@ int qla4xxx_process_ddb_changed(struct scsi_qla_host *ha, uint32_t fw_ddb_index,
 		uint32_t state, uint32_t conn_err)
 {
 	struct ddb_entry * ddb_entry;
-	uint32_t old_fw_ddb_device_state;
 
 	/* check for out of range index */
 	if (fw_ddb_index >= MAX_DDB_ENTRIES)
@@ -1425,22 +1424,14 @@ int qla4xxx_process_ddb_changed(struct scsi_qla_host *ha, uint32_t fw_ddb_index,
 	}
 
 	/* Device already exists in our database. */
-	old_fw_ddb_device_state = ddb_entry->fw_ddb_device_state;
 	DEBUG2(printk("scsi%ld: %s DDB - old state= 0x%x, new state=0x%x for "
 		      "index [%d]\n", ha->host_no, __func__,
 		      ddb_entry->fw_ddb_device_state, state, fw_ddb_index));
-	if (old_fw_ddb_device_state == state &&
-	    state == DDB_DS_SESSION_ACTIVE) {
-		if (atomic_read(&ddb_entry->state) != DDB_STATE_ONLINE) {
-			atomic_set(&ddb_entry->state, DDB_STATE_ONLINE);
-			iscsi_unblock_session(ddb_entry->sess);
-		}
-		return QLA_SUCCESS;
-	}
 
 	ddb_entry->fw_ddb_device_state = state;
 	/* Device is back online. */
-	if (ddb_entry->fw_ddb_device_state == DDB_DS_SESSION_ACTIVE) {
+	if ((ddb_entry->fw_ddb_device_state == DDB_DS_SESSION_ACTIVE) &&
+	   (atomic_read(&ddb_entry->state) != DDB_STATE_ONLINE)) {
 		atomic_set(&ddb_entry->state, DDB_STATE_ONLINE);
 		atomic_set(&ddb_entry->relogin_retry_count, 0);
 		atomic_set(&ddb_entry->relogin_timer, 0);
@@ -1452,7 +1443,7 @@ int qla4xxx_process_ddb_changed(struct scsi_qla_host *ha, uint32_t fw_ddb_index,
 		 * Change the lun state to READY in case the lun TIMEOUT before
 		 * the device came back.
 		 */
-	} else {
+	} else if (ddb_entry->fw_ddb_device_state != DDB_DS_SESSION_ACTIVE) {
 		/* Device went away, mark device missing */
 		if (atomic_read(&ddb_entry->state) == DDB_STATE_ONLINE) {
 			DEBUG2(ql4_printk(KERN_INFO, ha, "%s mark missing "
-- 
1.7.3.2

[PATCH 08/13] qla4xxx: Add support for ql4xmaxqdepth command line parameter

[vikas.chaudhary]

From: Vikas Chaudhary <vikas.chaudhary@qlogic.com>

This provides the flexibility to modify the qdepth based on different
target devices to make the best use of system resources.

Signed-off-by: Vikas Chaudhary <vikas.chaudhary@qlogic.com>
---
 drivers/scsi/qla4xxx/ql4_os.c |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
index 277c45f..051c049 100644
--- a/drivers/scsi/qla4xxx/ql4_os.c
+++ b/drivers/scsi/qla4xxx/ql4_os.c
@@ -51,6 +51,11 @@ MODULE_PARM_DESC(ql4xenablemsix,
 		" 2 = enable MSI interrupt mechanism.");
 
 #define QL4_DEF_QDEPTH 32
+static int ql4xmaxqdepth = QL4_DEF_QDEPTH;
+module_param(ql4xmaxqdepth, int, S_IRUGO | S_IWUSR);
+MODULE_PARM_DESC(ql4xmaxqdepth,
+		"Maximum queue depth to report for target devices.\n"
+		" Default: 32.");
 
 /*
  * SCSI host template entry points
@@ -1904,10 +1909,15 @@ static int qla4xxx_slave_alloc(struct scsi_device *sdev)
 {
 	struct iscsi_cls_session *sess = starget_to_session(sdev->sdev_target);
 	struct ddb_entry *ddb = sess->dd_data;
+	int queue_depth = QL4_DEF_QDEPTH;
 
 	sdev->hostdata = ddb;
 	sdev->tagged_supported = 1;
-	scsi_activate_tcq(sdev, QL4_DEF_QDEPTH);
+
+	if (ql4xmaxqdepth != 0 && ql4xmaxqdepth <= 0xffffU)
+		queue_depth = ql4xmaxqdepth;
+
+	scsi_activate_tcq(sdev, queue_depth);
 	return 0;
 }
 
-- 
1.7.3.2

[PATCH 09/13] qla4xxx: add support for ql4xsess_recovery_tmo cmd line param

[vikas.chaudhary]

From: Vikas Chaudhary <vikas.chaudhary@qlogic.com>

Target Session Recovery Timeout

Signed-off-by: Vikas Chaudhary <vikas.chaudhary@qlogic.com>
---
 drivers/scsi/qla4xxx/ql4_os.c |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
index 051c049..4a599d3 100644
--- a/drivers/scsi/qla4xxx/ql4_os.c
+++ b/drivers/scsi/qla4xxx/ql4_os.c
@@ -57,6 +57,12 @@ MODULE_PARM_DESC(ql4xmaxqdepth,
 		"Maximum queue depth to report for target devices.\n"
 		" Default: 32.");
 
+static int ql4xsess_recovery_tmo = QL4_SESS_RECOVERY_TMO;
+module_param(ql4xsess_recovery_tmo, int, S_IRUGO);
+MODULE_PARM_DESC(ql4xsess_recovery_tmo,
+		"Target Session Recovery Timeout.\n"
+		" Default: 30 sec.");
+
 /*
  * SCSI host template entry points
  */
@@ -166,7 +172,7 @@ static void qla4xxx_recovery_timedout(struct iscsi_cls_session *session)
 		DEBUG2(printk("scsi%ld: %s: ddb [%d] session recovery timeout "
 			      "of (%d) secs exhausted, marking device DEAD.\n",
 			      ha->host_no, __func__, ddb_entry->fw_ddb_index,
-			      QL4_SESS_RECOVERY_TMO));
+			      ddb_entry->sess->recovery_tmo));
 	}
 }
 
@@ -296,7 +302,7 @@ int qla4xxx_add_sess(struct ddb_entry *ddb_entry)
 {
 	int err;
 
-	ddb_entry->sess->recovery_tmo = QL4_SESS_RECOVERY_TMO;
+	ddb_entry->sess->recovery_tmo = ql4xsess_recovery_tmo;
 
 	err = iscsi_add_session(ddb_entry->sess, ddb_entry->fw_ddb_index);
 	if (err) {
-- 
1.7.3.2

[PATCH 10/13] qla4xxx: added new function qla4xxx_relogin_all_devices

[vikas.chaudhary]

From: Vikas Chaudhary <vikas.chaudhary@qlogic.com>

Move relogin to all devices code from do_dpc to new
fuction qla4xxx_relogin_all_devices()

Signed-off-by: Vikas Chaudhary <vikas.chaudhary@qlogic.com>
---
 drivers/scsi/qla4xxx/ql4_os.c |   54 +++++++++++++++++-----------------------
 1 files changed, 23 insertions(+), 31 deletions(-)

diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
index 4a599d3..e70b6bf 100644
--- a/drivers/scsi/qla4xxx/ql4_os.c
+++ b/drivers/scsi/qla4xxx/ql4_os.c
@@ -1218,6 +1218,27 @@ recover_ha_init_adapter:
 	return status;
 }
 
+static void qla4xxx_relogin_all_devices(struct scsi_qla_host *ha)
+{
+	struct ddb_entry *ddb_entry, *dtemp;
+
+	list_for_each_entry_safe(ddb_entry, dtemp, &ha->ddb_list, list) {
+		if ((atomic_read(&ddb_entry->state) == DDB_STATE_MISSING) ||
+		    (atomic_read(&ddb_entry->state) == DDB_STATE_DEAD)) {
+			if (ddb_entry->fw_ddb_device_state ==
+			    DDB_DS_SESSION_ACTIVE) {
+				atomic_set(&ddb_entry->state, DDB_STATE_ONLINE);
+				ql4_printk(KERN_INFO, ha, "scsi%ld: %s: ddb[%d]"
+				    " marked ONLINE\n",	ha->host_no, __func__,
+				    ddb_entry->fw_ddb_index);
+
+				iscsi_unblock_session(ddb_entry->sess);
+			} else
+				qla4xxx_relogin_device(ha, ddb_entry);
+		}
+	}
+}
+
 void qla4xxx_wake_dpc(struct scsi_qla_host *ha)
 {
 	if (ha->dpc_thread &&
@@ -1326,13 +1347,7 @@ dpc_post_reset_ha:
 	if (test_and_clear_bit(DPC_LINK_CHANGED, &ha->dpc_flags)) {
 		if (!test_bit(AF_LINK_UP, &ha->flags)) {
 			/* ---- link down? --- */
-			list_for_each_entry_safe(ddb_entry, dtemp,
-						 &ha->ddb_list, list) {
-				if (atomic_read(&ddb_entry->state) ==
-						DDB_STATE_ONLINE)
-					qla4xxx_mark_device_missing(ha,
-							ddb_entry);
-			}
+			qla4xxx_mark_all_devices_missing(ha);
 		} else {
 			/* ---- link up? --- *
 			 * F/W will auto login to all devices ONLY ONCE after
@@ -1341,30 +1356,7 @@ dpc_post_reset_ha:
 			 * manually relogin to devices when recovering from
 			 * connection failures, logouts, expired KATO, etc. */
 
-			list_for_each_entry_safe(ddb_entry, dtemp,
-							&ha->ddb_list, list) {
-				if ((atomic_read(&ddb_entry->state) ==
-						 DDB_STATE_MISSING) ||
-				    (atomic_read(&ddb_entry->state) ==
-						 DDB_STATE_DEAD)) {
-					if (ddb_entry->fw_ddb_device_state ==
-					    DDB_DS_SESSION_ACTIVE) {
-						atomic_set(&ddb_entry->state,
-							   DDB_STATE_ONLINE);
-						ql4_printk(KERN_INFO, ha,
-						    "scsi%ld: %s: ddb[%d]"
-						    " marked ONLINE\n",
-						    ha->host_no, __func__,
-						    ddb_entry->fw_ddb_index);
-
-						iscsi_unblock_session(
-						    ddb_entry->sess);
-					} else
-						qla4xxx_relogin_device(
-						    ha, ddb_entry);
-				}
-
-			}
+			qla4xxx_relogin_all_devices(ha);
 		}
 	}
 
-- 
1.7.3.2

[PATCH 12/13] qla4xxx: masking required bits of add_fw_options during initialization

[vikas.chaudhary]

From: Prasanna Mumbai <prasanna.mumbai@qlogic.com>

Signed-off-by: Vikas Chaudhary <vikas.chaudhary@qlogic.com>
Signed-off-by: Prasanna Mumbai <prasanna.mumbai@qlogic.com>
---
 drivers/scsi/qla4xxx/ql4_fw.h  |    1 +
 drivers/scsi/qla4xxx/ql4_mbx.c |    5 +++++
 2 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/drivers/scsi/qla4xxx/ql4_fw.h b/drivers/scsi/qla4xxx/ql4_fw.h
index c198579..31e2bf9 100644
--- a/drivers/scsi/qla4xxx/ql4_fw.h
+++ b/drivers/scsi/qla4xxx/ql4_fw.h
@@ -455,6 +455,7 @@ struct addr_ctrl_blk {
 	uint8_t res0;	/* 07 */
 	uint16_t eth_mtu_size;	/* 08-09 */
 	uint16_t add_fw_options;	/* 0A-0B */
+#define SERIALIZE_TASK_MGMT		0x0400
 
 	uint8_t hb_interval;	/* 0C */
 	uint8_t inst_num; /* 0D */
diff --git a/drivers/scsi/qla4xxx/ql4_mbx.c b/drivers/scsi/qla4xxx/ql4_mbx.c
index 199fa64..f9d81c8 100644
--- a/drivers/scsi/qla4xxx/ql4_mbx.c
+++ b/drivers/scsi/qla4xxx/ql4_mbx.c
@@ -476,6 +476,11 @@ int qla4xxx_initialize_fw_cb(struct scsi_qla_host * ha)
 
 	init_fw_cb->fw_options &= __constant_cpu_to_le16(~FWOPT_TARGET_MODE);
 
+	/* Set bit for "serialize task mgmt" all other bits need to be zero */
+	init_fw_cb->add_fw_options = 0;
+	init_fw_cb->add_fw_options |=
+	    __constant_cpu_to_le16(SERIALIZE_TASK_MGMT);
+
 	if (qla4xxx_set_ifcb(ha, &mbox_cmd[0], &mbox_sts[0], init_fw_cb_dma)
 		!= QLA_SUCCESS) {
 		DEBUG2(printk(KERN_WARNING
-- 
1.7.3.2

[PATCH 13/13] qla4xxx: Update driver version to 5.02.00-k6

[vikas.chaudhary]

From: Vikas Chaudhary <vikas.chaudhary@qlogic.com>

Signed-off-by: Vikas Chaudhary <vikas.chaudhary@qlogic.com>
---
 drivers/scsi/qla4xxx/ql4_version.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/scsi/qla4xxx/ql4_version.h b/drivers/scsi/qla4xxx/ql4_version.h
index 8475b30..6031557 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.02.00-k5"
+#define QLA4XXX_DRIVER_VERSION	"5.02.00-k6"
-- 
1.7.3.2

Re: [PATCH 01/13] qla4xxx: cleanup qla4xxx_initialize_ddb_list()

[James Bottomley]

On Mon, 2011-03-21 at 03:34 -0700, vikas.chaudhary@qlogic.com wrote:
> From: Vikas Chaudhary <vikas.chaudhary@qlogic.com>

There's only 12 patches in this series ... looks like 11/13 is missing.

James

RE: [PATCH 01/13] qla4xxx: cleanup qla4xxx_initialize_ddb_list()

[Vikas Chaudhary]

>-----Original Message-----
>From: James Bottomley [mailto:James.Bottomley@suse.de]
>Sent: Wednesday, March 23, 2011 8:14 PM
>To: Vikas Chaudhary
>Cc: linux-scsi@vger.kernel.org; Ravi Anand; Lalit Chandivade
>Subject: Re: [PATCH 01/13] qla4xxx: cleanup qla4xxx_initialize_ddb_list()
>
>On Mon, 2011-03-21 at 03:34 -0700, vikas.chaudhary@qlogic.com wrote:
>> From: Vikas Chaudhary <vikas.chaudhary@qlogic.com>
>
>There's only 12 patches in this series ... looks like 11/13 is missing.
>

I am not sure why patch 11/13 did not came on linux-scsi list.
I am resending it in next email.

Thanks a lot,
Vikas.

>James
>
>


This message and any attached documents contain information from QLogic Corporation or its wholly-owned subsidiaries that may be confidential. If you are not the intended recipient, you may not read, copy, distribute, or use this information. If you have received this transmission in error, please notify the sender immediately by reply e-mail and then delete this message.

[PATCH 06/13] qla4xxx: Prevent other port reinitialization during remove_adapter

[Vikas Chaudhary]

From: Karen Higgins <karen.higgins@qlogic.com>

remove ha flag AF_HBA_GOING_AWAY and added flag AF_HA_REMOVAL
to mark the other ISP-4xxx port to indicate that the driver is
being removed, so that the other port will not re-initialize
while in the process of removing the ha due to driver unload
or hba hotplug.

Signed-off-by: Karen Higgins <karen.higgins@qlogic.com>
Signed-off-by: Vikas Chaudhary <vikas.chaudhary@qlogic.com>
---
 drivers/scsi/qla4xxx/ql4_def.h |    5 +++-
 drivers/scsi/qla4xxx/ql4_isr.c |    2 +-
 drivers/scsi/qla4xxx/ql4_mbx.c |    2 +-
 drivers/scsi/qla4xxx/ql4_os.c  |   53 ++++++++++++++++++++++++++++++----------
 4 files changed, 46 insertions(+), 16 deletions(-)

diff --git a/drivers/scsi/qla4xxx/ql4_def.h b/drivers/scsi/qla4xxx/ql4_def.h
index 7aa60ee..c1f8d1b 100644
--- a/drivers/scsi/qla4xxx/ql4_def.h
+++ b/drivers/scsi/qla4xxx/ql4_def.h
@@ -53,6 +53,9 @@
 #define PCI_DEVICE_ID_QLOGIC_ISP8022   0x8022
 #endif

+#define ISP4XXX_PCI_FN_1       0x1
+#define ISP4XXX_PCI_FN_2       0x3
+
 #define QLA_SUCCESS                    0
 #define QLA_ERROR                      1

@@ -371,7 +374,7 @@ struct scsi_qla_host {
 #define AF_LINK_UP                     8 /* 0x00000100 */
 #define AF_IRQ_ATTACHED                        10 /* 0x00000400 */
 #define AF_DISABLE_ACB_COMPLETE                11 /* 0x00000800 */
-#define AF_HBA_GOING_AWAY              12 /* 0x00001000 */
+#define AF_HA_REMOVAL                  12 /* 0x00001000 */
 #define AF_INTx_ENABLED                        15 /* 0x00008000 */
 #define AF_MSI_ENABLED                 16 /* 0x00010000 */
 #define AF_MSIX_ENABLED                        17 /* 0x00020000 */
diff --git a/drivers/scsi/qla4xxx/ql4_isr.c b/drivers/scsi/qla4xxx/ql4_isr.c
index 2ef1a98..2f40ac7 100644
--- a/drivers/scsi/qla4xxx/ql4_isr.c
+++ b/drivers/scsi/qla4xxx/ql4_isr.c
@@ -801,7 +801,7 @@ irqreturn_t qla4xxx_intr_handler(int irq, void *dev_id)
                               &ha->reg->ctrl_status);
                        readl(&ha->reg->ctrl_status);

-                       if (!test_bit(AF_HBA_GOING_AWAY, &ha->flags))
+                       if (!test_bit(AF_HA_REMOVAL, &ha->flags))
                                set_bit(DPC_RESET_HA_INTR, &ha->dpc_flags);

                        break;
diff --git a/drivers/scsi/qla4xxx/ql4_mbx.c b/drivers/scsi/qla4xxx/ql4_mbx.c
index 379df2b..199fa64 100644
--- a/drivers/scsi/qla4xxx/ql4_mbx.c
+++ b/drivers/scsi/qla4xxx/ql4_mbx.c
@@ -151,7 +151,7 @@ int qla4xxx_mailbox_command(struct scsi_qla_host *ha, uint8_t inCount,
        if (test_bit(AF_IRQ_ATTACHED, &ha->flags) &&
            test_bit(AF_INTERRUPTS_ON, &ha->flags) &&
            test_bit(AF_ONLINE, &ha->flags) &&
-           !test_bit(AF_HBA_GOING_AWAY, &ha->flags)) {
+           !test_bit(AF_HA_REMOVAL, &ha->flags)) {
                /* Do not poll for completion. Use completion queue */
                set_bit(AF_MBOX_COMMAND_NOPOLL, &ha->flags);
                wait_for_completion_timeout(&ha->mbx_intr_comp, MBOX_TOV * HZ);
diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
index 6068f80..d7c220a 100644
--- a/drivers/scsi/qla4xxx/ql4_os.c
+++ b/drivers/scsi/qla4xxx/ql4_os.c
@@ -749,12 +749,6 @@ static void qla4xxx_timer(struct scsi_qla_host *ha)
        if (!pci_channel_offline(ha->pdev))
                pci_read_config_word(ha->pdev, PCI_VENDOR_ID, &w);

-       if (test_bit(AF_HBA_GOING_AWAY, &ha->flags)) {
-               DEBUG2(ql4_printk(KERN_INFO, ha, "%s exited. HBA GOING AWAY\n",
-                   __func__));
-               return;
-       }
-
        if (is_qla8022(ha)) {
                qla4_8xxx_watchdog(ha);
        }
@@ -1063,7 +1057,6 @@ void qla4xxx_dead_adapter_cleanup(struct scsi_qla_host *ha)

        /* Disable the board */
        ql4_printk(KERN_INFO, ha, "Disabling the board\n");
-       set_bit(AF_HBA_GOING_AWAY, &ha->flags);

        qla4xxx_abort_active_cmds(ha, DID_NO_CONNECT << 16);
        qla4xxx_mark_all_devices_missing(ha);
@@ -1255,11 +1248,6 @@ static void qla4xxx_do_dpc(struct work_struct *work)
                goto do_dpc_exit;
        }

-       /* HBA is in the process of being permanently disabled.
-        * Don't process anything */
-       if (test_bit(AF_HBA_GOING_AWAY, &ha->flags))
-               return;
-
        if (is_qla8022(ha)) {
                if (test_bit(DPC_HA_UNRECOVERABLE, &ha->dpc_flags)) {
                        qla4_8xxx_idc_lock(ha);
@@ -1824,6 +1812,44 @@ probe_disable_device:
 }

 /**
+ * qla4xxx_prevent_other_port_reinit - prevent other port from re-initialize
+ * @ha: pointer to adapter structure
+ *
+ * Mark the other ISP-4xxx port to indicate that the driver is being removed,
+ * so that the other port will not re-initialize while in the process of
+ * removing the ha due to driver unload or hba hotplug.
+ **/
+static void qla4xxx_prevent_other_port_reinit(struct scsi_qla_host *ha)
+{
+       struct scsi_qla_host *other_ha = NULL;
+       struct pci_dev *other_pdev = NULL;
+       int fn = ISP4XXX_PCI_FN_2;
+
+       /*iscsi function numbers for ISP4xxx is 1 and 3*/
+       if (PCI_FUNC(ha->pdev->devfn) & BIT_1)
+               fn = ISP4XXX_PCI_FN_1;
+
+       other_pdev =
+               pci_get_domain_bus_and_slot(pci_domain_nr(ha->pdev->bus),
+               ha->pdev->bus->number, PCI_DEVFN(PCI_SLOT(ha->pdev->devfn),
+               fn));
+
+       /* Get other_ha if other_pdev is valid and state is enable*/
+       if (other_pdev) {
+               if (atomic_read(&other_pdev->enable_cnt)) {
+                       other_ha = pci_get_drvdata(other_pdev);
+                       if (other_ha) {
+                               set_bit(AF_HA_REMOVAL, &other_ha->flags);
+                               DEBUG2(ql4_printk(KERN_INFO, ha, "%s: "
+                                   "Prevent %s reinit\n", __func__,
+                                   dev_name(&other_ha->pdev->dev)));
+                       }
+               }
+               pci_dev_put(other_pdev);
+       }
+}
+
+/**
  * qla4xxx_remove_adapter - calback function to remove adapter.
  * @pci_dev: PCI device pointer
  **/
@@ -1833,7 +1859,8 @@ static void __devexit qla4xxx_remove_adapter(struct pci_dev *pdev)

        ha = pci_get_drvdata(pdev);

-       set_bit(AF_HBA_GOING_AWAY, &ha->flags);
+       if (!is_qla8022(ha))
+               qla4xxx_prevent_other_port_reinit(ha);

        /* remove devs from iscsi_sessions to scsi_devices */
        qla4xxx_free_ddb_list(ha);
--
1.7.3.2


This message and any attached documents contain information from QLogic Corporation or its wholly-owned subsidiaries that may be confidential. If you are not the intended recipient, you may not read, copy, distribute, or use this information. If you have received this transmission in error, please notify the sender immediately by reply e-mail and then delete this message.

[PATCH 06/13] qla4xxx: Prevent other port reinitialization during remove_adapter

[Vikas Chaudhary]

From: Karen Higgins <karen.higgins@qlogic.com>

remove ha flag AF_HBA_GOING_AWAY and added flag AF_HA_REMOVAL
to mark the other ISP-4xxx port to indicate that the driver is
being removed, so that the other port will not re-initialize
while in the process of removing the ha due to driver unload
or hba hotplug.

Signed-off-by: Karen Higgins <karen.higgins@qlogic.com>
Signed-off-by: Vikas Chaudhary <vikas.chaudhary@qlogic.com>
---
 drivers/scsi/qla4xxx/ql4_def.h |    5 +++-
 drivers/scsi/qla4xxx/ql4_isr.c |    2 +-
 drivers/scsi/qla4xxx/ql4_mbx.c |    2 +-
 drivers/scsi/qla4xxx/ql4_os.c  |   51 +++++++++++++++++++++++++++++----------
 4 files changed, 44 insertions(+), 16 deletions(-)

diff --git a/drivers/scsi/qla4xxx/ql4_def.h b/drivers/scsi/qla4xxx/ql4_def.h
index 7aa60ee..c1f8d1b 100644
--- a/drivers/scsi/qla4xxx/ql4_def.h
+++ b/drivers/scsi/qla4xxx/ql4_def.h
@@ -53,6 +53,9 @@
 #define PCI_DEVICE_ID_QLOGIC_ISP8022   0x8022
 #endif

+#define ISP4XXX_PCI_FN_1       0x1
+#define ISP4XXX_PCI_FN_2       0x3
+
 #define QLA_SUCCESS                    0
 #define QLA_ERROR                      1

@@ -371,7 +374,7 @@ struct scsi_qla_host {
 #define AF_LINK_UP                     8 /* 0x00000100 */
 #define AF_IRQ_ATTACHED                        10 /* 0x00000400 */
 #define AF_DISABLE_ACB_COMPLETE                11 /* 0x00000800 */
-#define AF_HBA_GOING_AWAY              12 /* 0x00001000 */
+#define AF_HA_REMOVAL                  12 /* 0x00001000 */
 #define AF_INTx_ENABLED                        15 /* 0x00008000 */
 #define AF_MSI_ENABLED                 16 /* 0x00010000 */
 #define AF_MSIX_ENABLED                        17 /* 0x00020000 */
diff --git a/drivers/scsi/qla4xxx/ql4_isr.c b/drivers/scsi/qla4xxx/ql4_isr.c
index 2ef1a98..2f40ac7 100644
--- a/drivers/scsi/qla4xxx/ql4_isr.c
+++ b/drivers/scsi/qla4xxx/ql4_isr.c
@@ -801,7 +801,7 @@ irqreturn_t qla4xxx_intr_handler(int irq, void *dev_id)
                               &ha->reg->ctrl_status);
                        readl(&ha->reg->ctrl_status);

-                       if (!test_bit(AF_HBA_GOING_AWAY, &ha->flags))
+                       if (!test_bit(AF_HA_REMOVAL, &ha->flags))
                                set_bit(DPC_RESET_HA_INTR, &ha->dpc_flags);

                        break;
diff --git a/drivers/scsi/qla4xxx/ql4_mbx.c b/drivers/scsi/qla4xxx/ql4_mbx.c
index 379df2b..199fa64 100644
--- a/drivers/scsi/qla4xxx/ql4_mbx.c
+++ b/drivers/scsi/qla4xxx/ql4_mbx.c
@@ -151,7 +151,7 @@ int qla4xxx_mailbox_command(struct scsi_qla_host *ha, uint8_t inCount,
        if (test_bit(AF_IRQ_ATTACHED, &ha->flags) &&
            test_bit(AF_INTERRUPTS_ON, &ha->flags) &&
            test_bit(AF_ONLINE, &ha->flags) &&
-           !test_bit(AF_HBA_GOING_AWAY, &ha->flags)) {
+           !test_bit(AF_HA_REMOVAL, &ha->flags)) {
                /* Do not poll for completion. Use completion queue */
                set_bit(AF_MBOX_COMMAND_NOPOLL, &ha->flags);
                wait_for_completion_timeout(&ha->mbx_intr_comp, MBOX_TOV * HZ);
diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
index 6068f80..3ab4618 100644
--- a/drivers/scsi/qla4xxx/ql4_os.c
+++ b/drivers/scsi/qla4xxx/ql4_os.c
@@ -749,12 +749,6 @@ static void qla4xxx_timer(struct scsi_qla_host *ha)
        if (!pci_channel_offline(ha->pdev))
                pci_read_config_word(ha->pdev, PCI_VENDOR_ID, &w);

-       if (test_bit(AF_HBA_GOING_AWAY, &ha->flags)) {
-               DEBUG2(ql4_printk(KERN_INFO, ha, "%s exited. HBA GOING AWAY\n",
-                   __func__));
-               return;
-       }
-
        if (is_qla8022(ha)) {
                qla4_8xxx_watchdog(ha);
        }
@@ -1063,7 +1057,6 @@ void qla4xxx_dead_adapter_cleanup(struct scsi_qla_host *ha)

        /* Disable the board */
        ql4_printk(KERN_INFO, ha, "Disabling the board\n");
-       set_bit(AF_HBA_GOING_AWAY, &ha->flags);

        qla4xxx_abort_active_cmds(ha, DID_NO_CONNECT << 16);
        qla4xxx_mark_all_devices_missing(ha);
@@ -1255,11 +1248,6 @@ static void qla4xxx_do_dpc(struct work_struct *work)
                goto do_dpc_exit;
        }

-       /* HBA is in the process of being permanently disabled.
-        * Don't process anything */
-       if (test_bit(AF_HBA_GOING_AWAY, &ha->flags))
-               return;
-
        if (is_qla8022(ha)) {
                if (test_bit(DPC_HA_UNRECOVERABLE, &ha->dpc_flags)) {
                        qla4_8xxx_idc_lock(ha);
@@ -1824,6 +1812,42 @@ probe_disable_device:
 }

 /**
+ * qla4xxx_prevent_other_port_reinit - prevent other port from re-initialize
+ * @ha: pointer to adapter structure
+ *
+ * Mark the other ISP-4xxx port to indicate that the driver is being removed,
+ * so that the other port will not re-initialize while in the process of
+ * removing the ha due to driver unload or hba hotplug.
+ **/
+static void qla4xxx_prevent_other_port_reinit(struct scsi_qla_host *ha)
+{
+       struct scsi_qla_host *other_ha = NULL;
+       struct pci_dev *other_pdev = NULL;
+       int fn = ISP4XXX_PCI_FN_2;
+
+       /*iscsi function numbers for ISP4xxx is 1 and 3*/
+       if (PCI_FUNC(ha->pdev->devfn) & BIT_1)
+               fn = ISP4XXX_PCI_FN_1;
+
+       other_pdev =
+               pci_get_domain_bus_and_slot(pci_domain_nr(ha->pdev->bus),
+               ha->pdev->bus->number, PCI_DEVFN(PCI_SLOT(ha->pdev->devfn),
+               fn));
+
+       /* Get other_ha if other_pdev state is enable*/
+       if (atomic_read(&other_pdev->enable_cnt)) {
+               other_ha = pci_get_drvdata(other_pdev);
+               if (other_ha) {
+                       set_bit(AF_HA_REMOVAL, &other_ha->flags);
+                       DEBUG2(ql4_printk(KERN_INFO, ha, "%s: Prevent %s "
+                           "reinit\n", __func__,
+                           dev_name(&other_ha->pdev->dev)));
+                       pci_dev_put(other_pdev);
+               }
+       }
+}
+
+/**
  * qla4xxx_remove_adapter - calback function to remove adapter.
  * @pci_dev: PCI device pointer
  **/
@@ -1833,7 +1857,8 @@ static void __devexit qla4xxx_remove_adapter(struct pci_dev *pdev)

        ha = pci_get_drvdata(pdev);

-       set_bit(AF_HBA_GOING_AWAY, &ha->flags);
+       if (!is_qla8022(ha))
+               qla4xxx_prevent_other_port_reinit(ha);

        /* remove devs from iscsi_sessions to scsi_devices */
        qla4xxx_free_ddb_list(ha);
--
1.7.3.2


This message and any attached documents contain information from QLogic Corporation or its wholly-owned subsidiaries that may be confidential. If you are not the intended recipient, you may not read, copy, distribute, or use this information. If you have received this transmission in error, please notify the sender immediately by reply e-mail and then delete this message.

Re: [PATCH 06/13] qla4xxx: Prevent other port reinitialization during remove_adapter

[Mike Christie]

On 03/16/2011 07:29 AM, Vikas Chaudhary wrote:
> From: Karen Higgins<karen.higgins@qlogic.com>
>
> remove ha flag AF_HBA_GOING_AWAY and added flag AF_HA_REMOVAL
> to mark the other ISP-4xxx port to indicate that the driver is
> being removed, so that the other port will not re-initialize
> while in the process of removing the ha due to driver unload
> or hba hotplug.
>
> Signed-off-by: Karen Higgins<karen.higgins@qlogic.com>
> Signed-off-by: Vikas Chaudhary<vikas.chaudhary@qlogic.com>
> ---
>   drivers/scsi/qla4xxx/ql4_def.h |    5 +++-
>   drivers/scsi/qla4xxx/ql4_isr.c |    2 +-
>   drivers/scsi/qla4xxx/ql4_mbx.c |    2 +-
>   drivers/scsi/qla4xxx/ql4_os.c  |   51 +++++++++++++++++++++++++++++----------
>   4 files changed, 44 insertions(+), 16 deletions(-)
>
> diff --git a/drivers/scsi/qla4xxx/ql4_def.h b/drivers/scsi/qla4xxx/ql4_def.h
> index 7aa60ee..c1f8d1b 100644
> --- a/drivers/scsi/qla4xxx/ql4_def.h
> +++ b/drivers/scsi/qla4xxx/ql4_def.h
> @@ -53,6 +53,9 @@
>   #define PCI_DEVICE_ID_QLOGIC_ISP8022   0x8022
>   #endif
>
> +#define ISP4XXX_PCI_FN_1       0x1
> +#define ISP4XXX_PCI_FN_2       0x3
> +
>   #define QLA_SUCCESS                    0
>   #define QLA_ERROR                      1
>
> @@ -371,7 +374,7 @@ struct scsi_qla_host {
>   #define AF_LINK_UP                     8 /* 0x00000100 */
>   #define AF_IRQ_ATTACHED                        10 /* 0x00000400 */
>   #define AF_DISABLE_ACB_COMPLETE                11 /* 0x00000800 */
> -#define AF_HBA_GOING_AWAY              12 /* 0x00001000 */
> +#define AF_HA_REMOVAL                  12 /* 0x00001000 */
>   #define AF_INTx_ENABLED                        15 /* 0x00008000 */
>   #define AF_MSI_ENABLED                 16 /* 0x00010000 */
>   #define AF_MSIX_ENABLED                        17 /* 0x00020000 */
> diff --git a/drivers/scsi/qla4xxx/ql4_isr.c b/drivers/scsi/qla4xxx/ql4_isr.c
> index 2ef1a98..2f40ac7 100644
> --- a/drivers/scsi/qla4xxx/ql4_isr.c
> +++ b/drivers/scsi/qla4xxx/ql4_isr.c
> @@ -801,7 +801,7 @@ irqreturn_t qla4xxx_intr_handler(int irq, void *dev_id)
>                                 &ha->reg->ctrl_status);
>                          readl(&ha->reg->ctrl_status);
>
> -                       if (!test_bit(AF_HBA_GOING_AWAY,&ha->flags))
> +                       if (!test_bit(AF_HA_REMOVAL,&ha->flags))
>                                  set_bit(DPC_RESET_HA_INTR,&ha->dpc_flags);
>
>                          break;
> diff --git a/drivers/scsi/qla4xxx/ql4_mbx.c b/drivers/scsi/qla4xxx/ql4_mbx.c
> index 379df2b..199fa64 100644
> --- a/drivers/scsi/qla4xxx/ql4_mbx.c
> +++ b/drivers/scsi/qla4xxx/ql4_mbx.c
> @@ -151,7 +151,7 @@ int qla4xxx_mailbox_command(struct scsi_qla_host *ha, uint8_t inCount,
>          if (test_bit(AF_IRQ_ATTACHED,&ha->flags)&&
>              test_bit(AF_INTERRUPTS_ON,&ha->flags)&&
>              test_bit(AF_ONLINE,&ha->flags)&&
> -           !test_bit(AF_HBA_GOING_AWAY,&ha->flags)) {
> +           !test_bit(AF_HA_REMOVAL,&ha->flags)) {
>                  /* Do not poll for completion. Use completion queue */
>                  set_bit(AF_MBOX_COMMAND_NOPOLL,&ha->flags);
>                  wait_for_completion_timeout(&ha->mbx_intr_comp, MBOX_TOV * HZ);
> diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
> index 6068f80..3ab4618 100644
> --- a/drivers/scsi/qla4xxx/ql4_os.c
> +++ b/drivers/scsi/qla4xxx/ql4_os.c
> @@ -749,12 +749,6 @@ static void qla4xxx_timer(struct scsi_qla_host *ha)
>          if (!pci_channel_offline(ha->pdev))
>                  pci_read_config_word(ha->pdev, PCI_VENDOR_ID,&w);
>
> -       if (test_bit(AF_HBA_GOING_AWAY,&ha->flags)) {
> -               DEBUG2(ql4_printk(KERN_INFO, ha, "%s exited. HBA GOING AWAY\n",
> -                   __func__));
> -               return;
> -       }
> -
>          if (is_qla8022(ha)) {
>                  qla4_8xxx_watchdog(ha);
>          }
> @@ -1063,7 +1057,6 @@ void qla4xxx_dead_adapter_cleanup(struct scsi_qla_host *ha)
>
>          /* Disable the board */
>          ql4_printk(KERN_INFO, ha, "Disabling the board\n");
> -       set_bit(AF_HBA_GOING_AWAY,&ha->flags);
>
>          qla4xxx_abort_active_cmds(ha, DID_NO_CONNECT<<  16);
>          qla4xxx_mark_all_devices_missing(ha);
> @@ -1255,11 +1248,6 @@ static void qla4xxx_do_dpc(struct work_struct *work)
>                  goto do_dpc_exit;
>          }
>
> -       /* HBA is in the process of being permanently disabled.
> -        * Don't process anything */
> -       if (test_bit(AF_HBA_GOING_AWAY,&ha->flags))
> -               return;
> -
>          if (is_qla8022(ha)) {
>                  if (test_bit(DPC_HA_UNRECOVERABLE,&ha->dpc_flags)) {
>                          qla4_8xxx_idc_lock(ha);
> @@ -1824,6 +1812,42 @@ probe_disable_device:
>   }
>
>   /**
> + * qla4xxx_prevent_other_port_reinit - prevent other port from re-initialize
> + * @ha: pointer to adapter structure
> + *
> + * Mark the other ISP-4xxx port to indicate that the driver is being removed,
> + * so that the other port will not re-initialize while in the process of
> + * removing the ha due to driver unload or hba hotplug.
> + **/
> +static void qla4xxx_prevent_other_port_reinit(struct scsi_qla_host *ha)
> +{
> +       struct scsi_qla_host *other_ha = NULL;
> +       struct pci_dev *other_pdev = NULL;
> +       int fn = ISP4XXX_PCI_FN_2;
> +
> +       /*iscsi function numbers for ISP4xxx is 1 and 3*/
> +       if (PCI_FUNC(ha->pdev->devfn)&  BIT_1)
> +               fn = ISP4XXX_PCI_FN_1;
> +
> +       other_pdev =
> +               pci_get_domain_bus_and_slot(pci_domain_nr(ha->pdev->bus),
> +               ha->pdev->bus->number, PCI_DEVFN(PCI_SLOT(ha->pdev->devfn),
> +               fn));
> +

Is there ever going to be a single port on these cards? If so then a 
null check is needed right?


> +       /* Get other_ha if other_pdev state is enable*/
> +       if (atomic_read(&other_pdev->enable_cnt)) {
> +               other_ha = pci_get_drvdata(other_pdev);
> +               if (other_ha) {
> +                       set_bit(AF_HA_REMOVAL,&other_ha->flags);
> +                       DEBUG2(ql4_printk(KERN_INFO, ha, "%s: Prevent %s "
> +                           "reinit\n", __func__,
> +                           dev_name(&other_ha->pdev->dev)));
> +                       pci_dev_put(other_pdev);

I think if pci_get_domain_bus_and_slot returns a device then it always 
has a refcount taken. If that is right then I think you need to move 
this pci_dev_put outside of these if chunks, so that pci_dev_put is 
called if a other_pdev is non-null.

> +               }
> +       }
> +}
> +

RE: [PATCH 06/13] qla4xxx: Prevent other port reinitialization during remove_adapter

[Vikas Chaudhary]

>-----Original Message-----
>From: Mike Christie [mailto:michaelc@cs.wisc.edu]
>Sent: Thursday, March 17, 2011 12:54 AM
>To: Vikas Chaudhary
>Cc: James Bottomley; linux-scsi@vger.kernel.org; Lalit Chandivade; Ravi
>Anand; Karen Higgins
>Subject: Re: [PATCH 06/13] qla4xxx: Prevent other port reinitialization
>during remove_adapter
>
>On 03/16/2011 07:29 AM, Vikas Chaudhary wrote:
>> From: Karen Higgins<karen.higgins@qlogic.com>
>>
>> remove ha flag AF_HBA_GOING_AWAY and added flag AF_HA_REMOVAL
>> to mark the other ISP-4xxx port to indicate that the driver is
>> being removed, so that the other port will not re-initialize
>> while in the process of removing the ha due to driver unload
>> or hba hotplug.
>>
>> Signed-off-by: Karen Higgins<karen.higgins@qlogic.com>
>> Signed-off-by: Vikas Chaudhary<vikas.chaudhary@qlogic.com>
>> ---
>>   drivers/scsi/qla4xxx/ql4_def.h |    5 +++-
>>   drivers/scsi/qla4xxx/ql4_isr.c |    2 +-
>>   drivers/scsi/qla4xxx/ql4_mbx.c |    2 +-
>>   drivers/scsi/qla4xxx/ql4_os.c  |   51 +++++++++++++++++++++++++++++----
>------
>>   4 files changed, 44 insertions(+), 16 deletions(-)
>>
>> diff --git a/drivers/scsi/qla4xxx/ql4_def.h
>b/drivers/scsi/qla4xxx/ql4_def.h
>> index 7aa60ee..c1f8d1b 100644
>> --- a/drivers/scsi/qla4xxx/ql4_def.h
>> +++ b/drivers/scsi/qla4xxx/ql4_def.h
>> @@ -53,6 +53,9 @@
>>   #define PCI_DEVICE_ID_QLOGIC_ISP8022   0x8022
>>   #endif
>>
>> +#define ISP4XXX_PCI_FN_1       0x1
>> +#define ISP4XXX_PCI_FN_2       0x3
>> +
>>   #define QLA_SUCCESS                    0
>>   #define QLA_ERROR                      1
>>
>> @@ -371,7 +374,7 @@ struct scsi_qla_host {
>>   #define AF_LINK_UP                     8 /* 0x00000100 */
>>   #define AF_IRQ_ATTACHED                        10 /* 0x00000400 */
>>   #define AF_DISABLE_ACB_COMPLETE                11 /* 0x00000800 */
>> -#define AF_HBA_GOING_AWAY              12 /* 0x00001000 */
>> +#define AF_HA_REMOVAL                  12 /* 0x00001000 */
>>   #define AF_INTx_ENABLED                        15 /* 0x00008000 */
>>   #define AF_MSI_ENABLED                 16 /* 0x00010000 */
>>   #define AF_MSIX_ENABLED                        17 /* 0x00020000 */
>> diff --git a/drivers/scsi/qla4xxx/ql4_isr.c
>b/drivers/scsi/qla4xxx/ql4_isr.c
>> index 2ef1a98..2f40ac7 100644
>> --- a/drivers/scsi/qla4xxx/ql4_isr.c
>> +++ b/drivers/scsi/qla4xxx/ql4_isr.c
>> @@ -801,7 +801,7 @@ irqreturn_t qla4xxx_intr_handler(int irq, void
>*dev_id)
>>                                 &ha->reg->ctrl_status);
>>                          readl(&ha->reg->ctrl_status);
>>
>> -                       if (!test_bit(AF_HBA_GOING_AWAY,&ha->flags))
>> +                       if (!test_bit(AF_HA_REMOVAL,&ha->flags))
>>                                  set_bit(DPC_RESET_HA_INTR,&ha-
>>dpc_flags);
>>
>>                          break;
>> diff --git a/drivers/scsi/qla4xxx/ql4_mbx.c
>b/drivers/scsi/qla4xxx/ql4_mbx.c
>> index 379df2b..199fa64 100644
>> --- a/drivers/scsi/qla4xxx/ql4_mbx.c
>> +++ b/drivers/scsi/qla4xxx/ql4_mbx.c
>> @@ -151,7 +151,7 @@ int qla4xxx_mailbox_command(struct scsi_qla_host *ha,
>uint8_t inCount,
>>          if (test_bit(AF_IRQ_ATTACHED,&ha->flags)&&
>>              test_bit(AF_INTERRUPTS_ON,&ha->flags)&&
>>              test_bit(AF_ONLINE,&ha->flags)&&
>> -           !test_bit(AF_HBA_GOING_AWAY,&ha->flags)) {
>> +           !test_bit(AF_HA_REMOVAL,&ha->flags)) {
>>                  /* Do not poll for completion. Use completion queue */
>>                  set_bit(AF_MBOX_COMMAND_NOPOLL,&ha->flags);
>>                  wait_for_completion_timeout(&ha->mbx_intr_comp, MBOX_TOV
>* HZ);
>> diff --git a/drivers/scsi/qla4xxx/ql4_os.c
>b/drivers/scsi/qla4xxx/ql4_os.c
>> index 6068f80..3ab4618 100644
>> --- a/drivers/scsi/qla4xxx/ql4_os.c
>> +++ b/drivers/scsi/qla4xxx/ql4_os.c
>> @@ -749,12 +749,6 @@ static void qla4xxx_timer(struct scsi_qla_host *ha)
>>          if (!pci_channel_offline(ha->pdev))
>>                  pci_read_config_word(ha->pdev, PCI_VENDOR_ID,&w);
>>
>> -       if (test_bit(AF_HBA_GOING_AWAY,&ha->flags)) {
>> -               DEBUG2(ql4_printk(KERN_INFO, ha, "%s exited. HBA GOING
>AWAY\n",
>> -                   __func__));
>> -               return;
>> -       }
>> -
>>          if (is_qla8022(ha)) {
>>                  qla4_8xxx_watchdog(ha);
>>          }
>> @@ -1063,7 +1057,6 @@ void qla4xxx_dead_adapter_cleanup(struct
>scsi_qla_host *ha)
>>
>>          /* Disable the board */
>>          ql4_printk(KERN_INFO, ha, "Disabling the board\n");
>> -       set_bit(AF_HBA_GOING_AWAY,&ha->flags);
>>
>>          qla4xxx_abort_active_cmds(ha, DID_NO_CONNECT<<  16);
>>          qla4xxx_mark_all_devices_missing(ha);
>> @@ -1255,11 +1248,6 @@ static void qla4xxx_do_dpc(struct work_struct
>*work)
>>                  goto do_dpc_exit;
>>          }
>>
>> -       /* HBA is in the process of being permanently disabled.
>> -        * Don't process anything */
>> -       if (test_bit(AF_HBA_GOING_AWAY,&ha->flags))
>> -               return;
>> -
>>          if (is_qla8022(ha)) {
>>                  if (test_bit(DPC_HA_UNRECOVERABLE,&ha->dpc_flags)) {
>>                          qla4_8xxx_idc_lock(ha);
>> @@ -1824,6 +1812,42 @@ probe_disable_device:
>>   }
>>
>>   /**
>> + * qla4xxx_prevent_other_port_reinit - prevent other port from re-
>initialize
>> + * @ha: pointer to adapter structure
>> + *
>> + * Mark the other ISP-4xxx port to indicate that the driver is being
>removed,
>> + * so that the other port will not re-initialize while in the process of
>> + * removing the ha due to driver unload or hba hotplug.
>> + **/
>> +static void qla4xxx_prevent_other_port_reinit(struct scsi_qla_host *ha)
>> +{
>> +       struct scsi_qla_host *other_ha = NULL;
>> +       struct pci_dev *other_pdev = NULL;
>> +       int fn = ISP4XXX_PCI_FN_2;
>> +
>> +       /*iscsi function numbers for ISP4xxx is 1 and 3*/
>> +       if (PCI_FUNC(ha->pdev->devfn)&  BIT_1)
>> +               fn = ISP4XXX_PCI_FN_1;
>> +
>> +       other_pdev =
>> +               pci_get_domain_bus_and_slot(pci_domain_nr(ha->pdev->bus),
>> +               ha->pdev->bus->number, PCI_DEVFN(PCI_SLOT(ha->pdev-
>>devfn),
>> +               fn));
>> +
>
>Is there ever going to be a single port on these cards? If so then a
>null check is needed right?
>
>
>> +       /* Get other_ha if other_pdev state is enable*/
>> +       if (atomic_read(&other_pdev->enable_cnt)) {
>> +               other_ha = pci_get_drvdata(other_pdev);
>> +               if (other_ha) {
>> +                       set_bit(AF_HA_REMOVAL,&other_ha->flags);
>> +                       DEBUG2(ql4_printk(KERN_INFO, ha, "%s: Prevent %s
>"
>> +                           "reinit\n", __func__,
>> +                           dev_name(&other_ha->pdev->dev)));
>> +                       pci_dev_put(other_pdev);
>
>I think if pci_get_domain_bus_and_slot returns a device then it always
>has a refcount taken. If that is right then I think you need to move
>this pci_dev_put outside of these if chunks, so that pci_dev_put is
>called if a other_pdev is non-null.

Yes. I modified the patch as per comments and sending new patch in next email.


This message and any attached documents contain information from QLogic Corporation or its wholly-owned subsidiaries that may be confidential. If you are not the intended recipient, you may not read, copy, distribute, or use this information. If you have received this transmission in error, please notify the sender immediately by reply e-mail and then delete this message.

[PATCH 06/13] qla4xxx: Prevent other port reinitialization during remove_adapter

[Vikas Chaudhary]

From: Karen Higgins <karen.higgins@qlogic.com>

remove ha flag AF_HBA_GOING_AWAY and added flag AF_HA_REMOVAL
to mark the other ISP-4xxx port to indicate that the driver is
being removed, so that the other port will not re-initialize
while in the process of removing the ha due to driver unload
or hba hotplug.

Signed-off-by: Karen Higgins <karen.higgins@qlogic.com>
Signed-off-by: Vikas Chaudhary <vikas.chaudhary@qlogic.com>
---
 drivers/scsi/qla4xxx/ql4_def.h |    3 +-
 drivers/scsi/qla4xxx/ql4_isr.c |    2 +-
 drivers/scsi/qla4xxx/ql4_mbx.c |    2 +-
 drivers/scsi/qla4xxx/ql4_os.c  |   63 +++++++++++++++++++++++++++++++--------
 4 files changed, 54 insertions(+), 16 deletions(-)

diff --git a/drivers/scsi/qla4xxx/ql4_def.h b/drivers/scsi/qla4xxx/ql4_def.h
index 7aa60ee..b5fb245 100644
--- a/drivers/scsi/qla4xxx/ql4_def.h
+++ b/drivers/scsi/qla4xxx/ql4_def.h
@@ -358,6 +358,7 @@ struct isp_operations {
  * Linux Host Adapter structure
  */
 struct scsi_qla_host {
+       struct klist_node node;
        /* Linux adapter configuration data */
        unsigned long flags;

@@ -371,7 +372,7 @@ struct scsi_qla_host {
 #define AF_LINK_UP                     8 /* 0x00000100 */
 #define AF_IRQ_ATTACHED                        10 /* 0x00000400 */
 #define AF_DISABLE_ACB_COMPLETE                11 /* 0x00000800 */
-#define AF_HBA_GOING_AWAY              12 /* 0x00001000 */
+#define AF_HA_REMOVAL                  12 /* 0x00001000 */
 #define AF_INTx_ENABLED                        15 /* 0x00008000 */
 #define AF_MSI_ENABLED                 16 /* 0x00010000 */
 #define AF_MSIX_ENABLED                        17 /* 0x00020000 */
diff --git a/drivers/scsi/qla4xxx/ql4_isr.c b/drivers/scsi/qla4xxx/ql4_isr.c
index 2ef1a98..2f40ac7 100644
--- a/drivers/scsi/qla4xxx/ql4_isr.c
+++ b/drivers/scsi/qla4xxx/ql4_isr.c
@@ -801,7 +801,7 @@ irqreturn_t qla4xxx_intr_handler(int irq, void *dev_id)
                               &ha->reg->ctrl_status);
                        readl(&ha->reg->ctrl_status);

-                       if (!test_bit(AF_HBA_GOING_AWAY, &ha->flags))
+                       if (!test_bit(AF_HA_REMOVAL, &ha->flags))
                                set_bit(DPC_RESET_HA_INTR, &ha->dpc_flags);

                        break;
diff --git a/drivers/scsi/qla4xxx/ql4_mbx.c b/drivers/scsi/qla4xxx/ql4_mbx.c
index 379df2b..199fa64 100644
--- a/drivers/scsi/qla4xxx/ql4_mbx.c
+++ b/drivers/scsi/qla4xxx/ql4_mbx.c
@@ -151,7 +151,7 @@ int qla4xxx_mailbox_command(struct scsi_qla_host *ha, uint8_t inCount,
        if (test_bit(AF_IRQ_ATTACHED, &ha->flags) &&
            test_bit(AF_INTERRUPTS_ON, &ha->flags) &&
            test_bit(AF_ONLINE, &ha->flags) &&
-           !test_bit(AF_HBA_GOING_AWAY, &ha->flags)) {
+           !test_bit(AF_HA_REMOVAL, &ha->flags)) {
                /* Do not poll for completion. Use completion queue */
                set_bit(AF_MBOX_COMMAND_NOPOLL, &ha->flags);
                wait_for_completion_timeout(&ha->mbx_intr_comp, MBOX_TOV * HZ);
diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
index 6068f80..78329a2 100644
--- a/drivers/scsi/qla4xxx/ql4_os.c
+++ b/drivers/scsi/qla4xxx/ql4_os.c
@@ -27,6 +27,11 @@ static char qla4xxx_version_str[40];
 static struct kmem_cache *srb_cachep;

 /*
+ * List of host adapters
+ */
+static struct klist qla4xxx_hostlist;
+
+/*
  * Module parameter information and variables
  */
 int ql4xdontresethba = 0;
@@ -749,12 +754,6 @@ static void qla4xxx_timer(struct scsi_qla_host *ha)
        if (!pci_channel_offline(ha->pdev))
                pci_read_config_word(ha->pdev, PCI_VENDOR_ID, &w);

-       if (test_bit(AF_HBA_GOING_AWAY, &ha->flags)) {
-               DEBUG2(ql4_printk(KERN_INFO, ha, "%s exited. HBA GOING AWAY\n",
-                   __func__));
-               return;
-       }
-
        if (is_qla8022(ha)) {
                qla4_8xxx_watchdog(ha);
        }
@@ -1063,7 +1062,6 @@ void qla4xxx_dead_adapter_cleanup(struct scsi_qla_host *ha)

        /* Disable the board */
        ql4_printk(KERN_INFO, ha, "Disabling the board\n");
-       set_bit(AF_HBA_GOING_AWAY, &ha->flags);

        qla4xxx_abort_active_cmds(ha, DID_NO_CONNECT << 16);
        qla4xxx_mark_all_devices_missing(ha);
@@ -1255,11 +1253,6 @@ static void qla4xxx_do_dpc(struct work_struct *work)
                goto do_dpc_exit;
        }

-       /* HBA is in the process of being permanently disabled.
-        * Don't process anything */
-       if (test_bit(AF_HBA_GOING_AWAY, &ha->flags))
-               return;
-
        if (is_qla8022(ha)) {
                if (test_bit(DPC_HA_UNRECOVERABLE, &ha->dpc_flags)) {
                        qla4_8xxx_idc_lock(ha);
@@ -1808,6 +1801,10 @@ static int __devinit qla4xxx_probe_adapter(struct pci_dev *pdev,
               ha->host_no, ha->firmware_version[0], ha->firmware_version[1],
               ha->patch_number, ha->build_number);
        scsi_scan_host(host);
+
+       /* Insert new entry into the list of adapters. */
+       klist_add_tail(&ha->node, &qla4xxx_hostlist);
+
        return 0;

 probe_failed:
@@ -1824,6 +1821,42 @@ probe_disable_device:
 }

 /**
+ * qla4xxx_prevent_other_port_reinit - prevent other port from re-initialize
+ * @ha: pointer to adapter structure
+ *
+ * Mark the other ISP-4xxx port to indicate that the driver is being removed,
+ * so that the other port will not re-initialize while in the process of
+ * removing the ha due to driver unload or hba hotplug.
+ **/
+static void qla4xxx_prevent_other_port_reinit(struct scsi_qla_host *ha)
+{
+       struct scsi_qla_host *ha_listp;
+       struct klist_iter i;
+       struct klist_node *n;
+
+       klist_iter_init(&qla4xxx_hostlist, &i);
+       while ((n = klist_next(&i)) != NULL) {
+               ha_listp = container_of(n, struct scsi_qla_host, node);
+               if (ha == ha_listp)
+                       continue;
+
+               if ((pci_domain_nr(ha->pdev->bus) ==
+                   pci_domain_nr(ha_listp->pdev->bus)) &&
+                   (ha->pdev->bus->number ==
+                   ha_listp->pdev->bus->number) &&
+                   (PCI_SLOT(ha->pdev->devfn) ==
+                   PCI_SLOT(ha_listp->pdev->devfn))) {
+
+                       set_bit(AF_HA_REMOVAL, &ha_listp->flags);
+                       DEBUG2(ql4_printk(KERN_INFO, ha, "%s: Prevent %s "
+                           "reinit\n", __func__,
+                           dev_name(&ha_listp->pdev->dev)));
+               }
+       }
+       klist_iter_exit(&i);
+}
+
+/**
  * qla4xxx_remove_adapter - calback function to remove adapter.
  * @pci_dev: PCI device pointer
  **/
@@ -1833,7 +1866,10 @@ static void __devexit qla4xxx_remove_adapter(struct pci_dev *pdev)

        ha = pci_get_drvdata(pdev);

-       set_bit(AF_HBA_GOING_AWAY, &ha->flags);
+       if (!is_qla8022(ha))
+               qla4xxx_prevent_other_port_reinit(ha);
+
+       klist_remove(&ha->node);

        /* remove devs from iscsi_sessions to scsi_devices */
        qla4xxx_free_ddb_list(ha);
@@ -2546,6 +2582,7 @@ static int __init qla4xxx_module_init(void)
 {
        int ret;

+       klist_init(&qla4xxx_hostlist, NULL, NULL);
        /* Allocate cache for SRBs. */
        srb_cachep = kmem_cache_create("qla4xxx_srbs", sizeof(struct srb), 0,
                                       SLAB_HWCACHE_ALIGN, NULL);
--
1.7.3.2


This message and any attached documents contain information from QLogic Corporation or its wholly-owned subsidiaries that may be confidential. If you are not the intended recipient, you may not read, copy, distribute, or use this information. If you have received this transmission in error, please notify the sender immediately by reply e-mail and then delete this message.

[PATCH 06/13] qla4xxx: Prevent other port reinitialization during remove_adapter

[Vikas Chaudhary]

From: Karen Higgins <karen.higgins@qlogic.com>

remove ha flag AF_HBA_GOING_AWAY and added flag AF_HA_REMOVAL
to mark the other ISP-4xxx port to indicate that the driver is
being removed, so that the other port will not re-initialize
while in the process of removing the ha due to driver unload
or hba hotplug.

Signed-off-by: Karen Higgins <karen.higgins@qlogic.com>
Signed-off-by: Vikas Chaudhary <vikas.chaudhary@qlogic.com>
---
 drivers/scsi/qla4xxx/ql4_def.h |    3 +-
 drivers/scsi/qla4xxx/ql4_isr.c |    2 +-
 drivers/scsi/qla4xxx/ql4_mbx.c |    2 +-
 drivers/scsi/qla4xxx/ql4_os.c  |   62 +++++++++++++++++++++++++++++++--------
 4 files changed, 53 insertions(+), 16 deletions(-)

diff --git a/drivers/scsi/qla4xxx/ql4_def.h b/drivers/scsi/qla4xxx/ql4_def.h
index 7aa60ee..b5fb245 100644
--- a/drivers/scsi/qla4xxx/ql4_def.h
+++ b/drivers/scsi/qla4xxx/ql4_def.h
@@ -358,6 +358,7 @@ struct isp_operations {
  * Linux Host Adapter structure
  */
 struct scsi_qla_host {
+       struct klist_node node;
        /* Linux adapter configuration data */
        unsigned long flags;

@@ -371,7 +372,7 @@ struct scsi_qla_host {
 #define AF_LINK_UP                     8 /* 0x00000100 */
 #define AF_IRQ_ATTACHED                        10 /* 0x00000400 */
 #define AF_DISABLE_ACB_COMPLETE                11 /* 0x00000800 */
-#define AF_HBA_GOING_AWAY              12 /* 0x00001000 */
+#define AF_HA_REMOVAL                  12 /* 0x00001000 */
 #define AF_INTx_ENABLED                        15 /* 0x00008000 */
 #define AF_MSI_ENABLED                 16 /* 0x00010000 */
 #define AF_MSIX_ENABLED                        17 /* 0x00020000 */
diff --git a/drivers/scsi/qla4xxx/ql4_isr.c b/drivers/scsi/qla4xxx/ql4_isr.c
index 2ef1a98..2f40ac7 100644
--- a/drivers/scsi/qla4xxx/ql4_isr.c
+++ b/drivers/scsi/qla4xxx/ql4_isr.c
@@ -801,7 +801,7 @@ irqreturn_t qla4xxx_intr_handler(int irq, void *dev_id)
                               &ha->reg->ctrl_status);
                        readl(&ha->reg->ctrl_status);

-                       if (!test_bit(AF_HBA_GOING_AWAY, &ha->flags))
+                       if (!test_bit(AF_HA_REMOVAL, &ha->flags))
                                set_bit(DPC_RESET_HA_INTR, &ha->dpc_flags);

                        break;
diff --git a/drivers/scsi/qla4xxx/ql4_mbx.c b/drivers/scsi/qla4xxx/ql4_mbx.c
index 379df2b..199fa64 100644
--- a/drivers/scsi/qla4xxx/ql4_mbx.c
+++ b/drivers/scsi/qla4xxx/ql4_mbx.c
@@ -151,7 +151,7 @@ int qla4xxx_mailbox_command(struct scsi_qla_host *ha, uint8_t inCount,
        if (test_bit(AF_IRQ_ATTACHED, &ha->flags) &&
            test_bit(AF_INTERRUPTS_ON, &ha->flags) &&
            test_bit(AF_ONLINE, &ha->flags) &&
-           !test_bit(AF_HBA_GOING_AWAY, &ha->flags)) {
+           !test_bit(AF_HA_REMOVAL, &ha->flags)) {
                /* Do not poll for completion. Use completion queue */
                set_bit(AF_MBOX_COMMAND_NOPOLL, &ha->flags);
                wait_for_completion_timeout(&ha->mbx_intr_comp, MBOX_TOV * HZ);
diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
index 6068f80..59c5552 100644
--- a/drivers/scsi/qla4xxx/ql4_os.c
+++ b/drivers/scsi/qla4xxx/ql4_os.c
@@ -27,6 +27,11 @@ static char qla4xxx_version_str[40];
 static struct kmem_cache *srb_cachep;

 /*
+ * List of host adapters
+ */
+static struct klist qla4xxx_hostlist;
+
+/*
  * Module parameter information and variables
  */
 int ql4xdontresethba = 0;
@@ -749,12 +754,6 @@ static void qla4xxx_timer(struct scsi_qla_host *ha)
        if (!pci_channel_offline(ha->pdev))
                pci_read_config_word(ha->pdev, PCI_VENDOR_ID, &w);

-       if (test_bit(AF_HBA_GOING_AWAY, &ha->flags)) {
-               DEBUG2(ql4_printk(KERN_INFO, ha, "%s exited. HBA GOING AWAY\n",
-                   __func__));
-               return;
-       }
-
        if (is_qla8022(ha)) {
                qla4_8xxx_watchdog(ha);
        }
@@ -1063,7 +1062,6 @@ void qla4xxx_dead_adapter_cleanup(struct scsi_qla_host *ha)

        /* Disable the board */
        ql4_printk(KERN_INFO, ha, "Disabling the board\n");
-       set_bit(AF_HBA_GOING_AWAY, &ha->flags);

        qla4xxx_abort_active_cmds(ha, DID_NO_CONNECT << 16);
        qla4xxx_mark_all_devices_missing(ha);
@@ -1255,11 +1253,6 @@ static void qla4xxx_do_dpc(struct work_struct *work)
                goto do_dpc_exit;
        }

-       /* HBA is in the process of being permanently disabled.
-        * Don't process anything */
-       if (test_bit(AF_HBA_GOING_AWAY, &ha->flags))
-               return;
-
        if (is_qla8022(ha)) {
                if (test_bit(DPC_HA_UNRECOVERABLE, &ha->dpc_flags)) {
                        qla4_8xxx_idc_lock(ha);
@@ -1808,6 +1801,10 @@ static int __devinit qla4xxx_probe_adapter(struct pci_dev *pdev,
               ha->host_no, ha->firmware_version[0], ha->firmware_version[1],
               ha->patch_number, ha->build_number);
        scsi_scan_host(host);
+
+       /* Insert new entry into the list of adapters. */
+       klist_add_tail(&ha->node, &qla4xxx_hostlist);
+
        return 0;

 probe_failed:
@@ -1824,6 +1821,41 @@ probe_disable_device:
 }

 /**
+ * qla4xxx_prevent_other_port_reinit - Mark the other ISP-4xxx port to indicate
+ * that the driver is being removed, so that the other port will not
+ * re-initialize while in the process of removing the ha due to driver unload
+ * or hba hotplug.
+ * @ha: pointer to adapter structure
+ **/
+static void qla4xxx_prevent_other_port_reinit(struct scsi_qla_host *ha)
+{
+       struct scsi_qla_host *ha_listp;
+       struct klist_iter i;
+       struct klist_node *n;
+
+       klist_iter_init(&qla4xxx_hostlist, &i);
+       while ((n = klist_next(&i)) != NULL) {
+               ha_listp = container_of(n, struct scsi_qla_host, node);
+               if (ha == ha_listp)
+                       continue;
+
+               if ((pci_domain_nr(ha->pdev->bus) ==
+                   pci_domain_nr(ha_listp->pdev->bus)) &&
+                   (ha->pdev->bus->number ==
+                   ha_listp->pdev->bus->number) &&
+                   (PCI_SLOT(ha->pdev->devfn) ==
+                   PCI_SLOT(ha_listp->pdev->devfn))) {
+
+                       set_bit(AF_HA_REMOVAL, &ha_listp->flags);
+                       DEBUG2(ql4_printk(KERN_INFO, ha, "%s: Prevent %s "
+                           "reinit\n", __func__,
+                           dev_name(&ha_listp->pdev->dev)));
+               }
+       }
+       klist_iter_exit(&i);
+}
+
+/**
  * qla4xxx_remove_adapter - calback function to remove adapter.
  * @pci_dev: PCI device pointer
  **/
@@ -1833,7 +1865,10 @@ static void __devexit qla4xxx_remove_adapter(struct pci_dev *pdev)

        ha = pci_get_drvdata(pdev);

-       set_bit(AF_HBA_GOING_AWAY, &ha->flags);
+       if (!is_qla8022(ha))
+               qla4xxx_prevent_other_port_reinit(ha);
+
+       klist_remove(&ha->node);

        /* remove devs from iscsi_sessions to scsi_devices */
        qla4xxx_free_ddb_list(ha);
@@ -2546,6 +2581,7 @@ static int __init qla4xxx_module_init(void)
 {
        int ret;

+       klist_init(&qla4xxx_hostlist, NULL, NULL);
        /* Allocate cache for SRBs. */
        srb_cachep = kmem_cache_create("qla4xxx_srbs", sizeof(struct srb), 0,
                                       SLAB_HWCACHE_ALIGN, NULL);
--
1.7.3.2


This message and any attached documents contain information from QLogic Corporation or its wholly-owned subsidiaries that may be confidential. If you are not the intended recipient, you may not read, copy, distribute, or use this information. If you have received this transmission in error, please notify the sender immediately by reply e-mail and then delete this message.

Re: [PATCH 06/13] qla4xxx: Prevent other port reinitialization during remove_adapter

[Mike Christie]

On 03/14/2011 12:24 AM, Vikas Chaudhary wrote:
> index 6068f80..59c5552 100644
> --- a/drivers/scsi/qla4xxx/ql4_os.c
> +++ b/drivers/scsi/qla4xxx/ql4_os.c
> @@ -27,6 +27,11 @@ static char qla4xxx_version_str[40];
>   static struct kmem_cache *srb_cachep;
>
>   /*
> + * List of host adapters
> + */
> +static struct klist qla4xxx_hostlist;
> +



>
>   /**
> + * qla4xxx_prevent_other_port_reinit - Mark the other ISP-4xxx port to indicate
> + * that the driver is being removed, so that the other port will not
> + * re-initialize while in the process of removing the ha due to driver unload
> + * or hba hotplug.

For docbook comments you use a one line description on the first line, 
then add more informative stuff after the params.


> + * @ha: pointer to adapter structure
> + **/
> +static void qla4xxx_prevent_other_port_reinit(struct scsi_qla_host *ha)
> +{
> +       struct scsi_qla_host *ha_listp;
> +       struct klist_iter i;
> +       struct klist_node *n;
> +
> +       klist_iter_init(&qla4xxx_hostlist,&i);
> +       while ((n = klist_next(&i)) != NULL) {
> +               ha_listp = container_of(n, struct scsi_qla_host, node);
> +               if (ha == ha_listp)
> +                       continue;
> +
> +               if ((pci_domain_nr(ha->pdev->bus) ==
> +                   pci_domain_nr(ha_listp->pdev->bus))&&
> +                   (ha->pdev->bus->number ==
> +                   ha_listp->pdev->bus->number)&&
> +                   (PCI_SLOT(ha->pdev->devfn) ==
> +                   PCI_SLOT(ha_listp->pdev->devfn))) {
> +

Is there a qla4xxx specific reason why you need to prevent other ports 
from re-initing when removing a port? Does the hardware cause the other 
ports to be disrupted and that causes them to run the re-init code?

RE: [PATCH 06/13] qla4xxx: Prevent other port reinitialization during remove_adapter

[Vikas Chaudhary]

>-----Original Message-----
>From: linux-scsi-owner@vger.kernel.org [mailto:linux-scsi-
>owner@vger.kernel.org] On Behalf Of Mike Christie
>Sent: Tuesday, March 15, 2011 3:37 AM
>To: Vikas Chaudhary
>Cc: James Bottomley; linux-scsi@vger.kernel.org; Ravi Anand; Lalit
>Chandivade; Karen Higgins
>Subject: Re: [PATCH 06/13] qla4xxx: Prevent other port reinitialization
>during remove_adapter
>
>On 03/14/2011 12:24 AM, Vikas Chaudhary wrote:
>> index 6068f80..59c5552 100644
>> --- a/drivers/scsi/qla4xxx/ql4_os.c
>> +++ b/drivers/scsi/qla4xxx/ql4_os.c
>> @@ -27,6 +27,11 @@ static char qla4xxx_version_str[40];
>>   static struct kmem_cache *srb_cachep;
>>
>>   /*
>> + * List of host adapters
>> + */
>> +static struct klist qla4xxx_hostlist;
>> +
>
>
>
>>
>>   /**
>> + * qla4xxx_prevent_other_port_reinit - Mark the other ISP-4xxx port to
>indicate
>> + * that the driver is being removed, so that the other port will not
>> + * re-initialize while in the process of removing the ha due to driver
>unload
>> + * or hba hotplug.
>
>For docbook comments you use a one line description on the first line,
>then add more informative stuff after the params.
>

Ok, I will be sending updated patch in next email.

>
>> + * @ha: pointer to adapter structure
>> + **/
>> +static void qla4xxx_prevent_other_port_reinit(struct scsi_qla_host *ha)
>> +{
>> +       struct scsi_qla_host *ha_listp;
>> +       struct klist_iter i;
>> +       struct klist_node *n;
>> +
>> +       klist_iter_init(&qla4xxx_hostlist,&i);
>> +       while ((n = klist_next(&i)) != NULL) {
>> +               ha_listp = container_of(n, struct scsi_qla_host, node);
>> +               if (ha == ha_listp)
>> +                       continue;
>> +
>> +               if ((pci_domain_nr(ha->pdev->bus) ==
>> +                   pci_domain_nr(ha_listp->pdev->bus))&&
>> +                   (ha->pdev->bus->number ==
>> +                   ha_listp->pdev->bus->number)&&
>> +                   (PCI_SLOT(ha->pdev->devfn) ==
>> +                   PCI_SLOT(ha_listp->pdev->devfn))) {
>> +
>
>Is there a qla4xxx specific reason why you need to prevent other ports
>from re-initing when removing a port? Does the hardware cause the other
>ports to be disrupted and that causes them to run the re-init code?

Yes, its ISP40XX specific. While unloading driver we make call to function
"qla4xxx_hw_reset" from "qla4xxx_free_adapter". When driver do hw_reset
for one port, hardware will generate interrupt for other ports to inform
reset is about to happen. After this interrupt driver will schedule reset
for other port by setting dpc flag "DPC_RESET_HA_INTR" in function
"qla4xxx_intr_handler" this will cause re-initialization of other port
after reset, but while unloading driver we don't want to schedule reset
for the other port as other port does not need re-initialization".

This message and any attached documents contain information from QLogic Corporation or its wholly-owned subsidiaries that may be confidential. If you are not the intended recipient, you may not read, copy, distribute, or use this information. If you have received this transmission in error, please notify the sender immediately by reply e-mail and then delete this message.

Re: [PATCH 06/13] qla4xxx: Prevent other port reinitialization during remove_adapter

[Mike Christie]

On 03/15/2011 04:21 AM, Vikas Chaudhary wrote:
>> -----Original Message-----
>> From: linux-scsi-owner@vger.kernel.org [mailto:linux-scsi-
>> owner@vger.kernel.org] On Behalf Of Mike Christie
>> Sent: Tuesday, March 15, 2011 3:37 AM
>> To: Vikas Chaudhary
>> Cc: James Bottomley; linux-scsi@vger.kernel.org; Ravi Anand; Lalit
>> Chandivade; Karen Higgins
>> Subject: Re: [PATCH 06/13] qla4xxx: Prevent other port reinitialization
>> during remove_adapter
>>
>> On 03/14/2011 12:24 AM, Vikas Chaudhary wrote:
>>> index 6068f80..59c5552 100644
>>> --- a/drivers/scsi/qla4xxx/ql4_os.c
>>> +++ b/drivers/scsi/qla4xxx/ql4_os.c
>>> @@ -27,6 +27,11 @@ static char qla4xxx_version_str[40];
>>>    static struct kmem_cache *srb_cachep;
>>>
>>>    /*
>>> + * List of host adapters
>>> + */
>>> +static struct klist qla4xxx_hostlist;
>>> +
>>
>>
>>
>>>
>>>    /**
>>> + * qla4xxx_prevent_other_port_reinit - Mark the other ISP-4xxx port to
>> indicate
>>> + * that the driver is being removed, so that the other port will not
>>> + * re-initialize while in the process of removing the ha due to driver
>> unload
>>> + * or hba hotplug.
>>
>> For docbook comments you use a one line description on the first line,
>> then add more informative stuff after the params.
>>
>
> Ok, I will be sending updated patch in next email.
>
>>
>>> + * @ha: pointer to adapter structure
>>> + **/
>>> +static void qla4xxx_prevent_other_port_reinit(struct scsi_qla_host *ha)
>>> +{
>>> +       struct scsi_qla_host *ha_listp;
>>> +       struct klist_iter i;
>>> +       struct klist_node *n;
>>> +
>>> +       klist_iter_init(&qla4xxx_hostlist,&i);
>>> +       while ((n = klist_next(&i)) != NULL) {
>>> +               ha_listp = container_of(n, struct scsi_qla_host, node);
>>> +               if (ha == ha_listp)
>>> +                       continue;
>>> +
>>> +               if ((pci_domain_nr(ha->pdev->bus) ==
>>> +                   pci_domain_nr(ha_listp->pdev->bus))&&
>>> +                   (ha->pdev->bus->number ==
>>> +                   ha_listp->pdev->bus->number)&&
>>> +                   (PCI_SLOT(ha->pdev->devfn) ==
>>> +                   PCI_SLOT(ha_listp->pdev->devfn))) {
>>> +
>>
>> Is there a qla4xxx specific reason why you need to prevent other ports
>>from re-initing when removing a port? Does the hardware cause the other
>> ports to be disrupted and that causes them to run the re-init code?
>
> Yes, its ISP40XX specific. While unloading driver we make call to function
> "qla4xxx_hw_reset" from "qla4xxx_free_adapter". When driver do hw_reset
> for one port, hardware will generate interrupt for other ports to inform
> reset is about to happen. After this interrupt driver will schedule reset
> for other port by setting dpc flag "DPC_RESET_HA_INTR" in function
> "qla4xxx_intr_handler" this will cause re-initialization of other port
> after reset, but while unloading driver we don't want to schedule reset
> for the other port as other port does not need re-initialization".
>

Ok.

I think that the driver should not be needing to manage a list of hosts 
though. We have the driver model related lists already. There is also 
the pci bus stuff.  So I think you should be using one of those.

RE: [PATCH 06/13] qla4xxx: Prevent other port reinitialization during remove_adapter

[Vikas Chaudhary]

>-----Original Message-----
>From: Mike Christie [mailto:michaelc@cs.wisc.edu]
>Sent: Wednesday, March 16, 2011 6:51 AM
>To: Vikas Chaudhary
>Cc: James Bottomley; linux-scsi@vger.kernel.org; Ravi Anand; Lalit
>Chandivade; Karen Higgins
>Subject: Re: [PATCH 06/13] qla4xxx: Prevent other port reinitialization
>during remove_adapter
>
>On 03/15/2011 04:21 AM, Vikas Chaudhary wrote:
>>> -----Original Message-----
>>> From: linux-scsi-owner@vger.kernel.org [mailto:linux-scsi-
>>> owner@vger.kernel.org] On Behalf Of Mike Christie
>>> Sent: Tuesday, March 15, 2011 3:37 AM
>>> To: Vikas Chaudhary
>>> Cc: James Bottomley; linux-scsi@vger.kernel.org; Ravi Anand; Lalit
>>> Chandivade; Karen Higgins
>>> Subject: Re: [PATCH 06/13] qla4xxx: Prevent other port reinitialization
>>> during remove_adapter
>>>
>>> On 03/14/2011 12:24 AM, Vikas Chaudhary wrote:
>>>> index 6068f80..59c5552 100644
>>>> --- a/drivers/scsi/qla4xxx/ql4_os.c
>>>> +++ b/drivers/scsi/qla4xxx/ql4_os.c
>>>> @@ -27,6 +27,11 @@ static char qla4xxx_version_str[40];
>>>>    static struct kmem_cache *srb_cachep;
>>>>
>>>>    /*
>>>> + * List of host adapters
>>>> + */
>>>> +static struct klist qla4xxx_hostlist;
>>>> +
>>>
>>>
>>>
>>>>
>>>>    /**
>>>> + * qla4xxx_prevent_other_port_reinit - Mark the other ISP-4xxx port to
>>> indicate
>>>> + * that the driver is being removed, so that the other port will not
>>>> + * re-initialize while in the process of removing the ha due to driver
>>> unload
>>>> + * or hba hotplug.
>>>
>>> For docbook comments you use a one line description on the first line,
>>> then add more informative stuff after the params.
>>>
>>
>> Ok, I will be sending updated patch in next email.
>>
>>>
>>>> + * @ha: pointer to adapter structure
>>>> + **/
>>>> +static void qla4xxx_prevent_other_port_reinit(struct scsi_qla_host
>*ha)
>>>> +{
>>>> +       struct scsi_qla_host *ha_listp;
>>>> +       struct klist_iter i;
>>>> +       struct klist_node *n;
>>>> +
>>>> +       klist_iter_init(&qla4xxx_hostlist,&i);
>>>> +       while ((n = klist_next(&i)) != NULL) {
>>>> +               ha_listp = container_of(n, struct scsi_qla_host, node);
>>>> +               if (ha == ha_listp)
>>>> +                       continue;
>>>> +
>>>> +               if ((pci_domain_nr(ha->pdev->bus) ==
>>>> +                   pci_domain_nr(ha_listp->pdev->bus))&&
>>>> +                   (ha->pdev->bus->number ==
>>>> +                   ha_listp->pdev->bus->number)&&
>>>> +                   (PCI_SLOT(ha->pdev->devfn) ==
>>>> +                   PCI_SLOT(ha_listp->pdev->devfn))) {
>>>> +
>>>
>>> Is there a qla4xxx specific reason why you need to prevent other ports
>>>from re-initing when removing a port? Does the hardware cause the other
>>> ports to be disrupted and that causes them to run the re-init code?
>>
>> Yes, its ISP40XX specific. While unloading driver we make call to
>function
>> "qla4xxx_hw_reset" from "qla4xxx_free_adapter". When driver do hw_reset
>> for one port, hardware will generate interrupt for other ports to inform
>> reset is about to happen. After this interrupt driver will schedule reset
>> for other port by setting dpc flag "DPC_RESET_HA_INTR" in function
>> "qla4xxx_intr_handler" this will cause re-initialization of other port
>> after reset, but while unloading driver we don't want to schedule reset
>> for the other port as other port does not need re-initialization".
>>
>
>Ok.
>
>I think that the driver should not be needing to manage a list of hosts
>though. We have the driver model related lists already. There is also
>the pci bus stuff.  So I think you should be using one of those.

Agreed. Sending modified patch in next email.


This message and any attached documents contain information from QLogic Corporation or its wholly-owned subsidiaries that may be confidential. If you are not the intended recipient, you may not read, copy, distribute, or use this information. If you have received this transmission in error, please notify the sender immediately by reply e-mail and then delete this message.