Commit 4788e732 authored by Jitendra Bhivare's avatar Jitendra Bhivare Committed by Martin K. Petersen
Browse files

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: default avatarJitendra Bhivare <jitendra.bhivare@broadcom.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent c5905bf8

drivers/scsi/be2iscsi/be_iscsi.c

+8 −4
Original line number Diff line number Diff line
@@ -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) {

			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");

			return 0;

				status = 0;

			}

		}

		break;

	case ISCSI_HOST_PARAM_PORT_STATE:

drivers/scsi/be2iscsi/be_mgmt.c

+6 −1
Original line number Diff line number Diff line
@@ -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) {

drivers/scsi/be2iscsi/be_mgmt.h

+1 −1
Original line number Diff line number Diff line
@@ -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);

CRA Git | Maintained and supported by SUSTech CRA and CCSE