xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

scsi: be2iscsi: Modify IOCTL to fetch user configured IQN

Browse Source 
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>
This commit is contained in:
Jitendra Bhivare
2017-10-10 16:18:16 +05:30
committed by Martin K. Petersen
parent c5905bf822
commit 4788e732c3
3 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/scsi/be2iscsi/be_iscsi.c
View File

@@ -762,11 +762,15 @@ int beiscsi_get_host_param(struct Scsi_Host *shost,
} }
break; break;
case ISCSI_HOST_PARAM_INITIATOR_NAME: 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) {
status = beiscsi_get_initiator_name(phba, buf, false);
if (status < 0) { if (status < 0) {
beiscsi_log(phba, KERN_ERR, BEISCSI_LOG_CONFIG, beiscsi_log(phba, KERN_ERR, BEISCSI_LOG_CONFIG,
"BS_%d : Retreiving Initiator Name Failed\n"); "BS_%d : Retreiving Initiator Name Failed\n");
return 0; status = 0;
}
} }
break; break;
case ISCSI_HOST_PARAM_PORT_STATE: case ISCSI_HOST_PARAM_PORT_STATE:

7
drivers/scsi/be2iscsi/be_mgmt.c
View File

@@ -339,12 +339,14 @@ int beiscsi_modify_eq_delay(struct beiscsi_hba *phba,
* beiscsi_get_initiator_name - read initiator name from flash * beiscsi_get_initiator_name - read initiator name from flash
* @phba: device priv structure * @phba: device priv structure
* @name: buffer pointer * @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_dma_mem nonemb_cmd;
struct be_cmd_hba_name resp; struct be_cmd_hba_name resp;
struct be_cmd_hba_name *req;
int rc; int rc;
rc = beiscsi_prep_nemb_cmd(phba, &nonemb_cmd, CMD_SUBSYSTEM_ISCSI_INI, 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) if (rc)
return rc; return rc;
req = nonemb_cmd.va;
if (cfg)
req->hdr.version = 1;
rc = beiscsi_exec_nemb_cmd(phba, &nonemb_cmd, NULL, rc = beiscsi_exec_nemb_cmd(phba, &nonemb_cmd, NULL,
&resp, sizeof(resp)); &resp, sizeof(resp));
if (rc) { if (rc) {

2
drivers/scsi/be2iscsi/be_mgmt.h
View File

@@ -178,7 +178,7 @@ int beiscsi_mgmt_invalidate_icds(struct beiscsi_hba *phba,
struct invldt_cmd_tbl *inv_tbl, struct invldt_cmd_tbl *inv_tbl,
unsigned int nents); 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); int beiscsi_if_en_dhcp(struct beiscsi_hba *phba, u32 ip_type);