From: Jitendra Bhivare <jitendra.bhivare@broadcom.com>
To: cleech@redhat.com, lduncan@suse.com
Cc: linux-scsi@vger.kernel.org,
Jitendra Bhivare <jitendra.bhivare@broadcom.com>
Subject: [PATCH 06/10] be2iscsi: Modify IOCTL to fetch user configured IQN
Date: Tue, 10 Oct 2017 16:18:16 +0530 [thread overview]
Message-ID: <1507632500-26445-7-git-send-email-jitendra.bhivare@broadcom.com> (raw)
In-Reply-To: <1507632500-26445-1-git-send-email-jitendra.bhivare@broadcom.com>
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>
---
drivers/scsi/be2iscsi/be_iscsi.c | 12 ++++++++----
drivers/scsi/be2iscsi/be_mgmt.c | 7 ++++++-
drivers/scsi/be2iscsi/be_mgmt.h | 2 +-
3 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/drivers/scsi/be2iscsi/be_iscsi.c b/drivers/scsi/be2iscsi/be_iscsi.c
index 512c52a..aef9764 100644
--- 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 0c25c10..713c7de 100644
--- 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 665fd89..8d886f8 100644
--- 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);
--
2.7.4
next prev parent reply other threads:[~2017-10-10 10:48 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-10 10:48 [PATCH 00/10] be2iscsi: driver update 11.4.0.1 Jitendra Bhivare
2017-10-10 10:48 ` [PATCH 01/10] be2iscsi: Fix boot flags in sysfs Jitendra Bhivare
2017-10-10 10:48 ` [PATCH 02/10] be2iscsi: Fix return value in mgmt_open_connection Jitendra Bhivare
2017-10-10 10:48 ` [PATCH 03/10] be2iscsi: Free msi_name and disable HW intr Jitendra Bhivare
2017-10-10 10:48 ` [PATCH 04/10] be2iscsi: Fix _modify_eq_delay buffer overflow Jitendra Bhivare
2017-10-10 10:48 ` [PATCH 05/10] be2iscsi: Fix _get_initname " Jitendra Bhivare
2017-10-10 10:48 ` Jitendra Bhivare [this message]
2017-10-10 10:48 ` [PATCH 07/10] be2iscsi: Add cmd to set host data Jitendra Bhivare
2017-10-10 10:48 ` [PATCH 08/10] be2iscsi: Fix misc static analysis errors Jitendra Bhivare
2017-10-10 10:48 ` [PATCH 09/10] be2iscsi: Remove A-circumflex character in copyright marking Jitendra Bhivare
2017-10-10 10:48 ` [PATCH 10/10] scsi: be2iscsi: Update driver version Jitendra Bhivare
2017-10-11 18:19 ` [PATCH 00/10] be2iscsi: driver update 11.4.0.1 Martin K. Petersen
2017-10-11 18:56 ` Chris Leech
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1507632500-26445-7-git-send-email-jitendra.bhivare@broadcom.com \
--to=jitendra.bhivare@broadcom.com \
--cc=cleech@redhat.com \
--cc=lduncan@suse.com \
--cc=linux-scsi@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox