[PATCH 0/4] qla4xxx: Updates for scsi "misc" branch.

[PATCH 0/4] qla4xxx: Updates for scsi "misc" branch.

[vikas.chaudhary]

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

James,

Please apply the following patches to the scsi tree at your earliest
convenience for inclusion in mainline.

Vikas Chaudhary (4):
      qla4xxx: multi-session fix for flash ddbs
      qla4xxx: Fix a Sparse warning message
      qla4xxx: Fix Spell check.
      qla4xxx: Update driver version to 5.02.00-k18

 drivers/scsi/qla4xxx/ql4_def.h     |    1 +
 drivers/scsi/qla4xxx/ql4_glbl.h    |    3 +-
 drivers/scsi/qla4xxx/ql4_init.c    |    2 +-
 drivers/scsi/qla4xxx/ql4_os.c      |  156 +++++++++++++++++++++++++++++++++---
 drivers/scsi/qla4xxx/ql4_version.h |    2 +-

Thanks,
Vikas.

[PATCH 1/4] qla4xxx: multi-session fix for flash ddbs

[vikas.chaudhary]

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

Allow multi-session to target (for flash ddbs) accesible via
multiple network portal

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

diff --git a/drivers/scsi/qla4xxx/ql4_def.h b/drivers/scsi/qla4xxx/ql4_def.h
index 96a5616..7fdba7f 100644
--- a/drivers/scsi/qla4xxx/ql4_def.h
+++ b/drivers/scsi/qla4xxx/ql4_def.h
@@ -279,6 +279,7 @@ struct qla_ddb_index {
 	struct list_head list;
 	uint16_t fw_ddb_idx;
 	struct dev_db_entry fw_ddb;
+	uint8_t flash_isid[6];
 };
 
 #define DDB_IPADDR_LEN 64
diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
index cd15678..9da4266 100644
--- a/drivers/scsi/qla4xxx/ql4_os.c
+++ b/drivers/scsi/qla4xxx/ql4_os.c
@@ -4299,7 +4299,8 @@ static void qla4xxx_get_param_ddb(struct ddb_entry *ddb_entry,
 }
 
 static void qla4xxx_convert_param_ddb(struct dev_db_entry *fw_ddb_entry,
-				      struct ql4_tuple_ddb *tddb)
+				      struct ql4_tuple_ddb *tddb,
+				      uint8_t *flash_isid)
 {
 	uint16_t options = 0;
 
@@ -4314,7 +4315,12 @@ static void qla4xxx_convert_param_ddb(struct dev_db_entry *fw_ddb_entry,
 		sprintf(tddb->ip_addr, "%pI4", fw_ddb_entry->ip_addr);
 
 	tddb->port = le16_to_cpu(fw_ddb_entry->port);
-	memcpy(&tddb->isid[0], &fw_ddb_entry->isid[0], sizeof(tddb->isid));
+
+	if (flash_isid == NULL)
+		memcpy(&tddb->isid[0], &fw_ddb_entry->isid[0],
+		       sizeof(tddb->isid));
+	else
+		memcpy(&tddb->isid[0], &flash_isid[0], sizeof(tddb->isid));
 }
 
 static int qla4xxx_compare_tuple_ddb(struct scsi_qla_host *ha,
@@ -4385,7 +4391,7 @@ static int qla4xxx_is_session_exists(struct scsi_qla_host *ha,
 		goto exit_check;
 	}
 
-	qla4xxx_convert_param_ddb(fw_ddb_entry, fw_tddb);
+	qla4xxx_convert_param_ddb(fw_ddb_entry, fw_tddb, NULL);
 
 	for (idx = 0; idx < MAX_DDB_ENTRIES; idx++) {
 		ddb_entry = qla4xxx_lookup_ddb_by_fw_index(ha, idx);
@@ -4407,6 +4413,102 @@ exit_check:
 	return ret;
 }
 
+/**
+ * qla4xxx_check_existing_isid - check if target with same isid exist
+ *				 in target list
+ * @list_nt: list of target
+ * @isid: isid to check
+ *
+ * This routine return QLA_SUCCESS if target with same isid exist
+ **/
+static int qla4xxx_check_existing_isid(struct list_head *list_nt, uint8_t *isid)
+{
+	struct qla_ddb_index *nt_ddb_idx, *nt_ddb_idx_tmp;
+	struct dev_db_entry *fw_ddb_entry;
+
+	list_for_each_entry_safe(nt_ddb_idx, nt_ddb_idx_tmp, list_nt, list) {
+		fw_ddb_entry = &nt_ddb_idx->fw_ddb;
+
+		if (memcmp(&fw_ddb_entry->isid[0], &isid[0],
+			   sizeof(nt_ddb_idx->fw_ddb.isid)) == 0) {
+			return QLA_SUCCESS;
+		}
+	}
+	return QLA_ERROR;
+}
+
+/**
+ * qla4xxx_update_isid - compare ddbs and updated isid
+ * @ha: Pointer to host adapter structure.
+ * @list_nt: list of nt target
+ * @fw_ddb_entry: firmware ddb entry
+ *
+ * This routine update isid if ddbs have same iqn, same isid and
+ * different IP addr.
+ * Return QLA_SUCCESS if isid is updated.
+ **/
+static int qla4xxx_update_isid(struct scsi_qla_host *ha,
+			       struct list_head *list_nt,
+			       struct dev_db_entry *fw_ddb_entry)
+{
+	uint8_t base_value, i;
+
+	base_value = fw_ddb_entry->isid[1] & 0x1f;
+	for (i = 0; i < 8; i++) {
+		fw_ddb_entry->isid[1] = (base_value | (i << 5));
+		if (qla4xxx_check_existing_isid(list_nt, fw_ddb_entry->isid))
+			break;
+	}
+
+	if (!qla4xxx_check_existing_isid(list_nt, fw_ddb_entry->isid))
+		return QLA_ERROR;
+
+	return QLA_SUCCESS;
+}
+
+/**
+ * qla4xxx_should_update_isid - check if isid need to update
+ * @ha: Pointer to host adapter structure.
+ * @old_tddb: ddb tuple
+ * @new_tddb: ddb tuple
+ *
+ * Return QLA_SUCCESS if different IP, different PORT, same iqn,
+ * same isid
+ **/
+static int qla4xxx_should_update_isid(struct scsi_qla_host *ha,
+				      struct ql4_tuple_ddb *old_tddb,
+				      struct ql4_tuple_ddb *new_tddb)
+{
+	if (strcmp(old_tddb->ip_addr, new_tddb->ip_addr) == 0) {
+		/* Same ip */
+		if (old_tddb->port == new_tddb->port)
+			return QLA_ERROR;
+	}
+
+	if (strcmp(old_tddb->iscsi_name, new_tddb->iscsi_name))
+		/* different iqn */
+		return QLA_ERROR;
+
+	if (memcmp(&old_tddb->isid[0], &new_tddb->isid[0],
+		   sizeof(old_tddb->isid)))
+		/* different isid */
+		return QLA_ERROR;
+
+	return QLA_SUCCESS;
+}
+
+/**
+ * qla4xxx_is_flash_ddb_exists - check if fw_ddb_entry already exists in list_nt
+ * @ha: Pointer to host adapter structure.
+ * @list_nt: list of nt target.
+ * @fw_ddb_entry: firmware ddb entry.
+ *
+ * This routine check if fw_ddb_entry already exists in list_nt to avoid
+ * duplicate ddb in list_nt.
+ * Return QLA_SUCCESS if duplicate ddb exit in list_nl.
+ * Note: This function also update isid of DDB if required.
+ **/
+
 static int qla4xxx_is_flash_ddb_exists(struct scsi_qla_host *ha,
 				       struct list_head *list_nt,
 				       struct dev_db_entry *fw_ddb_entry)
@@ -4414,7 +4516,7 @@ static int qla4xxx_is_flash_ddb_exists(struct scsi_qla_host *ha,
 	struct qla_ddb_index  *nt_ddb_idx, *nt_ddb_idx_tmp;
 	struct ql4_tuple_ddb *fw_tddb = NULL;
 	struct ql4_tuple_ddb *tmp_tddb = NULL;
-	int ret = QLA_ERROR;
+	int rval, ret = QLA_ERROR;
 
 	fw_tddb = vzalloc(sizeof(*fw_tddb));
 	if (!fw_tddb) {
@@ -4432,12 +4534,28 @@ static int qla4xxx_is_flash_ddb_exists(struct scsi_qla_host *ha,
 		goto exit_check;
 	}
 
-	qla4xxx_convert_param_ddb(fw_ddb_entry, fw_tddb);
+	qla4xxx_convert_param_ddb(fw_ddb_entry, fw_tddb, NULL);
 
 	list_for_each_entry_safe(nt_ddb_idx, nt_ddb_idx_tmp, list_nt, list) {
-		qla4xxx_convert_param_ddb(&nt_ddb_idx->fw_ddb, tmp_tddb);
-		if (!qla4xxx_compare_tuple_ddb(ha, fw_tddb, tmp_tddb, true)) {
-			ret = QLA_SUCCESS; /* found */
+		qla4xxx_convert_param_ddb(&nt_ddb_idx->fw_ddb, tmp_tddb,
+					  nt_ddb_idx->flash_isid);
+		ret = qla4xxx_compare_tuple_ddb(ha, fw_tddb, tmp_tddb, true);
+		/* found duplicate ddb */
+		if (ret == QLA_SUCCESS)
+			goto exit_check;
+	}
+
+	list_for_each_entry_safe(nt_ddb_idx, nt_ddb_idx_tmp, list_nt, list) {
+		qla4xxx_convert_param_ddb(&nt_ddb_idx->fw_ddb, tmp_tddb, NULL);
+
+		ret = qla4xxx_should_update_isid(ha, tmp_tddb, fw_tddb);
+		if (ret == QLA_SUCCESS) {
+			rval = qla4xxx_update_isid(ha, list_nt, fw_ddb_entry);
+			if (rval == QLA_SUCCESS)
+				ret = QLA_ERROR;
+			else
+				ret = QLA_SUCCESS;
+
 			goto exit_check;
 		}
 	}
@@ -4788,14 +4906,26 @@ static void qla4xxx_build_nt_list(struct scsi_qla_host *ha,
 
 			nt_ddb_idx->fw_ddb_idx = idx;
 
-			memcpy(&nt_ddb_idx->fw_ddb, fw_ddb_entry,
-			       sizeof(struct dev_db_entry));
-
-			if (qla4xxx_is_flash_ddb_exists(ha, list_nt,
-					fw_ddb_entry) == QLA_SUCCESS) {
+			/* Copy original isid as it may get updated in function
+			 * qla4xxx_update_isid(). We need original isid in
+			 * function qla4xxx_compare_tuple_ddb to find duplicate
+			 * target */
+			memcpy(&nt_ddb_idx->flash_isid[0],
+			       &fw_ddb_entry->isid[0],
+			       sizeof(nt_ddb_idx->flash_isid));
+
+			ret = qla4xxx_is_flash_ddb_exists(ha, list_nt,
+							  fw_ddb_entry);
+			if (ret == QLA_SUCCESS) {
+				/* free nt_ddb_idx and do not add to list_nt */
 				vfree(nt_ddb_idx);
 				goto continue_next_nt;
 			}
+
+			/* Copy updated isid */
+			memcpy(&nt_ddb_idx->fw_ddb, fw_ddb_entry,
+			       sizeof(struct dev_db_entry));
+
 			list_add_tail(&nt_ddb_idx->list, list_nt);
 		} else if (is_reset == RESET_ADAPTER) {
 			if (qla4xxx_is_session_exists(ha, fw_ddb_entry) ==
-- 
1.7.9.1.265.gb3a76

[PATCH 2/4] qla4xxx: Fix a Sparse warning message

[vikas.chaudhary]

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

Fix following message:-
drivers/scsi/qla4xxx/ql4_os.c:3266:5: error: symbol 'qla4xxx_post_aen_work' redeclared with different type (originally declared at drivers/scsi/qla4xxx/ql4_glbl.h:186) - incompatible argument 2 (different signedness)

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

diff --git a/drivers/scsi/qla4xxx/ql4_glbl.h b/drivers/scsi/qla4xxx/ql4_glbl.h
index 20b49d0..5b2525c 100644
--- a/drivers/scsi/qla4xxx/ql4_glbl.h
+++ b/drivers/scsi/qla4xxx/ql4_glbl.h
@@ -183,7 +183,8 @@ int qla4xxx_flash_ddb_change(struct scsi_qla_host *ha, uint32_t fw_ddb_index,
 int qla4xxx_ddb_change(struct scsi_qla_host *ha, uint32_t fw_ddb_index,
 		       struct ddb_entry *ddb_entry, uint32_t state);
 void qla4xxx_build_ddb_list(struct scsi_qla_host *ha, int is_reset);
-int qla4xxx_post_aen_work(struct scsi_qla_host *ha, uint32_t aen_code,
+int qla4xxx_post_aen_work(struct scsi_qla_host *ha,
+			  enum iscsi_host_event_code aen_code,
 			  uint32_t data_size, uint8_t *data);
 int qla4xxx_ping_iocb(struct scsi_qla_host *ha, uint32_t options,
 		      uint32_t payload_size, uint32_t pid, uint8_t *ipaddr);
-- 
1.7.9.1.265.gb3a76

[PATCH 4/4] qla4xxx: Update driver version to 5.02.00-k18

[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 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/scsi/qla4xxx/ql4_version.h b/drivers/scsi/qla4xxx/ql4_version.h
index cc1cc35..725034f 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-k17"
+#define QLA4XXX_DRIVER_VERSION	"5.02.00-k18"
-- 
1.7.9.1.265.gb3a76

Re: [PATCH 0/4] qla4xxx: Updates for scsi "misc" branch.

[James Bottomley]

On Thu, 2012-06-14 at 06:35 -0400, vikas.chaudhary@qlogic.com wrote:
> From: Vikas Chaudhary <vikas.chaudhary@qlogic.com>
> 
> James,
> 
> Please apply the following patches to the scsi tree at your earliest
> convenience for inclusion in mainline.
> 
> Vikas Chaudhary (4):
>       qla4xxx: multi-session fix for flash ddbs
>       qla4xxx: Fix a Sparse warning message
>       qla4xxx: Fix Spell check.
>       qla4xxx: Update driver version to 5.02.00-k18

Patch 3/4 seems to be missing.

James

Re: [PATCH 0/4] qla4xxx: Updates for scsi "misc" branch.

[Vikas Chaudhary]

-----Original Message-----
From: James Bottomley <James.Bottomley@HansenPartnership.com>
To: Vikas <vikas.chaudhary@qlogic.com>
Cc: Mike Christie <michaelc@cs.wisc.edu>, scsi
<linux-scsi@vger.kernel.org>, Lalit Chandivade
<lalit.chandivade@qlogic.com>, Ravi Anand <ravi.anand@qlogic.com>
Subject: Re: [PATCH 0/4] qla4xxx: Updates for scsi "misc" branch.

>On Thu, 2012-06-14 at 06:35 -0400, vikas.chaudhary@qlogic.com wrote:
>> From: Vikas Chaudhary <vikas.chaudhary@qlogic.com>
>>
>> James,
>>
>> Please apply the following patches to the scsi tree at your earliest
>> convenience for inclusion in mainline.
>>
>> Vikas Chaudhary (4):
>>       qla4xxx: multi-session fix for flash ddbs
>>       qla4xxx: Fix a Sparse warning message
>>       qla4xxx: Fix Spell check.
>>       qla4xxx: Update driver version to 5.02.00-k18
>
>Patch 3/4 seems to be missing.

Looks like Patch 3/4 fails to go on list in my 1st try.
I just send this again to list here:-
http://marc.info/?l=linux-scsi&m=133968439904414&w=2

Thanks,
Vikas


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 0/4] qla4xxx: Updates for scsi "misc" branch.

[Mike Christie]

On 06/14/2012 05:35 AM, vikas.chaudhary@qlogic.com wrote:
> From: Vikas Chaudhary <vikas.chaudhary@qlogic.com>
> 
> James,
> 
> Please apply the following patches to the scsi tree at your earliest
> convenience for inclusion in mainline.
> 
> Vikas Chaudhary (4):
>       qla4xxx: multi-session fix for flash ddbs
>       qla4xxx: Fix a Sparse warning message
>       qla4xxx: Fix Spell check.
>       qla4xxx: Update driver version to 5.02.00-k18
> 
>  drivers/scsi/qla4xxx/ql4_def.h     |    1 +
>  drivers/scsi/qla4xxx/ql4_glbl.h    |    3 +-
>  drivers/scsi/qla4xxx/ql4_init.c    |    2 +-
>  drivers/scsi/qla4xxx/ql4_os.c      |  156 +++++++++++++++++++++++++++++++++---
>  drivers/scsi/qla4xxx/ql4_version.h |    2 +-
> 
> Thanks,
> Vikas.


Looks ok.

Reviewed-by: Mike Christie <michaelc@cs.wisc.edu>

[PATCH 0/4] qla4xxx: Updates for scsi "misc" branch.

[vikas.chaudhary]

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

James,

Please apply the following patches to the scsi tree at your earliest
convenience.

Thanks,
Vikas.

Vikas Chaudhary (4):
      qla4xxx: Fix lockdep warning in qla4xxx_post_work()
      qla4xxx: Clear interrupt while unloading driver.
      qla4xxx: Wait for cmd to complete before chip reset for ISP40XX
      qla4xxx: Update driver version to 5.02.00-k20

 drivers/scsi/qla4xxx/ql4_os.c      |   14 ++++++++++++--
 drivers/scsi/qla4xxx/ql4_version.h |    2 +-
 2 files changed, 13 insertions(+), 3 deletions(-)

Re: [PATCH 0/4] qla4xxx: Updates for scsi "misc" branch.

[Mike Christie]

On 08/22/2012 06:45 AM, vikas.chaudhary@qlogic.com wrote:
> From: Vikas Chaudhary <vikas.chaudhary@qlogic.com>
> 
> James,
> 
> Please apply the following patches to the scsi tree at your earliest
> convenience.
> 
> Thanks,
> Vikas.
> 
> Vikas Chaudhary (4):
>       qla4xxx: Fix lockdep warning in qla4xxx_post_work()
>       qla4xxx: Clear interrupt while unloading driver.
>       qla4xxx: Wait for cmd to complete before chip reset for ISP40XX
>       qla4xxx: Update driver version to 5.02.00-k20
> 

Looks ok to me.

Reviewed-by: Mike Christie <michaelc@cs.wisc.edu>

[PATCH 0/4] qla4xxx: Updates for scsi "misc" branch

[vikas.chaudhary]

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

James,

Please apply the following patches to the scsi tree at your earliest
convenience.

Nilesh Javali (1):
      qla4xxx: Skip retry of initialize_adapter only for ISP8XXX

Vikas Chaudhary (3):
      qla4xxx: Added missing check for ISP83XX in CHAP related functions
      qla4xxx: Assign correct CHAP table address to FLT
      qla4xxx: Update driver version to 5.03.00-k6

Thanks,
Vikas.

Re: [PATCH 0/4] qla4xxx: Updates for scsi "misc" branch

[Mike Christie]

On 03/22/2013 06:08 AM, vikas.chaudhary@qlogic.com wrote:
> From: Vikas Chaudhary <vikas.chaudhary@qlogic.com>
> 
> James,
> 
> Please apply the following patches to the scsi tree at your earliest
> convenience.
> 
> Nilesh Javali (1):
>       qla4xxx: Skip retry of initialize_adapter only for ISP8XXX
> 
> Vikas Chaudhary (3):
>       qla4xxx: Added missing check for ISP83XX in CHAP related functions
>       qla4xxx: Assign correct CHAP table address to FLT
>       qla4xxx: Update driver version to 5.03.00-k6
> 

Looks ok to me.

Reviewed-by: Mike Christie <michaelc@cs.wisc.edu>

[PATCH 0/4] qla4xxx: Updates for scsi "misc" branch

[vikas.chaudhary]

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

James,

Following patches are to display additional iSCSI connection and session
parameters in sysfs.

Please apply these patches to the scsi tree "misc" branch at your
earliest convenience.

Adheer Chandravanshi (3):
      scsi_transport_iscsi: Exporting new attrs for iscsi session and connection in sysfs
      libiscsi: Exporting new attrs for iscsi session and connection in sysfs
      qla4xxx: Exporting new attrs for iscsi session and connection in sysfs

Vikas Chaudhary (1):
      qla4xxx: Update driver version to 5.03.00-k10

Thanks,
Vikas.

Re: [PATCH 0/4] qla4xxx: Updates for scsi "misc" branch

[Mike Christie]

On 06/26/2013 07:11 AM, vikas.chaudhary@qlogic.com wrote:
> From: Vikas Chaudhary <vikas.chaudhary@qlogic.com>
> 
> James,
> 
> Following patches are to display additional iSCSI connection and session
> parameters in sysfs.
> 
> Please apply these patches to the scsi tree "misc" branch at your
> earliest convenience.
> 
> Adheer Chandravanshi (3):
>       scsi_transport_iscsi: Exporting new attrs for iscsi session and connection in sysfs
>       libiscsi: Exporting new attrs for iscsi session and connection in sysfs
>       qla4xxx: Exporting new attrs for iscsi session and connection in sysfs
> 
> Vikas Chaudhary (1):
>       qla4xxx: Update driver version to 5.03.00-k10
> 

Looks ok.

Reviewed-by: Mike Christie <michaelc@cs.wisc.edu>