Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f6602f3b authored by Quinn Tran's avatar Quinn Tran Committed by Martin K. Petersen
Browse files

scsi: qla2xxx: Fix Management Server NPort handle reservation logic 



After selecting the NPort handle/loop_id, set a bit in the loop_id_map to
prevent others from selecting the same NPort handle.

Signed-off-by: default avatarQuinn Tran <quinn.tran@cavium.com>
Signed-off-by: default avatarHimanshu Madhani <himanshu.madhani@cavium.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent b2000805

drivers/scsi/qla2xxx/qla_gbl.h

+1 −0
Original line number Diff line number Diff line
@@ -118,6 +118,7 @@ extern int qla2x00_post_async_prlo_done_work(struct scsi_qla_host *, 
    fc_port_t *, uint16_t *);

int qla_post_iidma_work(struct scsi_qla_host *vha, fc_port_t *fcport);

void qla_do_iidma_work(struct scsi_qla_host *vha, fc_port_t *fcport);

int qla2x00_reserve_mgmt_server_loop_id(scsi_qla_host_t *);

/*

 * Global Data in qla_os.c source file.

 */

drivers/scsi/qla2xxx/qla_init.c

+28 −0
Original line number Diff line number Diff line
@@ -5616,6 +5616,34 @@ qla2x00_find_new_loop_id(scsi_qla_host_t *vha, fc_port_t *dev) 
}





/* FW does not set aside Loop id for MGMT Server/FFFFFAh */

int

qla2x00_reserve_mgmt_server_loop_id(scsi_qla_host_t *vha)

{

	int loop_id = FC_NO_LOOP_ID;

	int lid = NPH_MGMT_SERVER - vha->vp_idx;

	unsigned long flags;

	struct qla_hw_data *ha = vha->hw;



	if (vha->vp_idx == 0) {

		set_bit(NPH_MGMT_SERVER, ha->loop_id_map);

		return NPH_MGMT_SERVER;

	}



	/* pick id from high and work down to low */

	spin_lock_irqsave(&ha->vport_slock, flags);

	for (; lid > 0; lid--) {

		if (!test_bit(lid, vha->hw->loop_id_map)) {

			set_bit(lid, vha->hw->loop_id_map);

			loop_id = lid;

			break;

		}

	}

	spin_unlock_irqrestore(&ha->vport_slock, flags);



	return loop_id;

}



/*

 * qla2x00_fabric_login

 *	Issue fabric login command.

drivers/scsi/qla2xxx/qla_mid.c

+1 −1
Original line number Diff line number Diff line
@@ -485,7 +485,7 @@ qla24xx_create_vhost(struct fc_vport *fc_vport) 
		    "Couldn't allocate vp_id.\n");

		goto create_vhost_failed;

	}

	vha->mgmt_svr_loop_id = NPH_MGMT_SERVER;

	vha->mgmt_svr_loop_id = qla2x00_reserve_mgmt_server_loop_id(vha);



	vha->dpc_flags = 0L;

drivers/scsi/qla2xxx/qla_os.c

+2 −1
Original line number Diff line number Diff line
@@ -3048,7 +3048,8 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id) 
	host = base_vha->host;

	base_vha->req = req;

	if (IS_QLA2XXX_MIDTYPE(ha))

		base_vha->mgmt_svr_loop_id = NPH_MGMT_SERVER;

		base_vha->mgmt_svr_loop_id =

			qla2x00_reserve_mgmt_server_loop_id(base_vha);

	else

		base_vha->mgmt_svr_loop_id = MANAGEMENT_SERVER +

						base_vha->vp_idx;