scsi: be2iscsi: Modify IOCTL to fetch user configured IQN

Add version 1 of GET_HBA_NAME to fetch port specific IQN first.
If it fails use version 0 to get the IQN.

To use this old IQN names of interfaces needs to be cleared from
the iscsiadm database.

Signed-off-by: Jitendra Bhivare <jitendra.bhivare@broadcom.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/be2iscsi/be_iscsi.c b/drivers/scsi/be2iscsi/be_iscsi.c
index 512c52aecb334be450a9f4326eff5bc22686d45d..aef97649eb7d05cbfe8dd2fc293f974973923401 100644 (file)
--- a/drivers/scsi/be2iscsi/be_iscsi.c
+++ b/drivers/scsi/be2iscsi/be_iscsi.c
@@ -762,11 +762,15 @@ int beiscsi_get_host_param(struct Scsi_Host *shost,
                }
                break;
        case ISCSI_HOST_PARAM_INITIATOR_NAME:
-               status = beiscsi_get_initiator_name(phba, buf);
+               /* try fetching user configured name first */
+               status = beiscsi_get_initiator_name(phba, buf, true);
                if (status < 0) {
-                       beiscsi_log(phba, KERN_ERR, BEISCSI_LOG_CONFIG,
-                                   "BS_%d : Retreiving Initiator Name Failed\n");
-                       return 0;
+                       status = beiscsi_get_initiator_name(phba, buf, false);
+                       if (status < 0) {
+                               beiscsi_log(phba, KERN_ERR, BEISCSI_LOG_CONFIG,
+                                           "BS_%d : Retreiving Initiator Name Failed\n");
+                               status = 0;
+                       }
                }
                break;
        case ISCSI_HOST_PARAM_PORT_STATE:

diff --git a/drivers/scsi/be2iscsi/be_mgmt.c b/drivers/scsi/be2iscsi/be_mgmt.c
index 0c25c105e44f194821bac4ca01e0fbb579c8e2c2..713c7de0ea2f11c9099bc889348cd0b68d5b0ff9 100644 (file)
--- a/drivers/scsi/be2iscsi/be_mgmt.c
+++ b/drivers/scsi/be2iscsi/be_mgmt.c
@@ -339,12 +339,14 @@ int beiscsi_modify_eq_delay(struct beiscsi_hba *phba,
  * beiscsi_get_initiator_name - read initiator name from flash
  * @phba: device priv structure
  * @name: buffer pointer
+ * @cfg: fetch user configured
  *
  */
-int beiscsi_get_initiator_name(struct beiscsi_hba *phba, char *name)
+int beiscsi_get_initiator_name(struct beiscsi_hba *phba, char *name, bool cfg)
 {
        struct be_dma_mem nonemb_cmd;
        struct be_cmd_hba_name resp;
+       struct be_cmd_hba_name *req;
        int rc;
 
        rc = beiscsi_prep_nemb_cmd(phba, &nonemb_cmd, CMD_SUBSYSTEM_ISCSI_INI,
@@ -352,6 +354,9 @@ int beiscsi_get_initiator_name(struct beiscsi_hba *phba, char *name)
        if (rc)
                return rc;
 
+       req = nonemb_cmd.va;
+       if (cfg)
+               req->hdr.version = 1;
        rc = beiscsi_exec_nemb_cmd(phba, &nonemb_cmd, NULL,
                                   &resp, sizeof(resp));
        if (rc) {

diff --git a/drivers/scsi/be2iscsi/be_mgmt.h b/drivers/scsi/be2iscsi/be_mgmt.h
index 665fd893509ff317bfa4347cea13d9ec7b06401f..8d886f834819d07c6512d00af6ebe49dfe0bef26 100644 (file)
--- a/drivers/scsi/be2iscsi/be_mgmt.h
+++ b/drivers/scsi/be2iscsi/be_mgmt.h
@@ -178,7 +178,7 @@ int beiscsi_mgmt_invalidate_icds(struct beiscsi_hba *phba,
                                 struct invldt_cmd_tbl *inv_tbl,
                                 unsigned int nents);
 
-int beiscsi_get_initiator_name(struct beiscsi_hba *phba, char *name);
+int beiscsi_get_initiator_name(struct beiscsi_hba *phba, char *name, bool cfg);
 
 int beiscsi_if_en_dhcp(struct beiscsi_hba *phba, u32 ip_type);