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

Commit 835aa4f2 authored by Giridhar Malavali's avatar Giridhar Malavali Committed by Martin K. Petersen
Browse files

scsi: qla2xxx: Fix for FC-NVMe discovery for NPIV port 



This patch fixes NVMe discovery by setting SKIP_PRLI flag, so that PRLI is
driven by driver and is retried when the NPIV port is detected to have NVMe
capability.

Signed-off-by: default avatarGiridhar Malavali <gmalavali@marvell.com>
Signed-off-by: default avatarHimanshu Madhani <hmadhani@marvell.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 5e6803b4

drivers/scsi/qla2xxx/qla_attr.c

+2 −0
Original line number Diff line number Diff line
@@ -2712,6 +2712,8 @@ qla24xx_vport_delete(struct fc_vport *fc_vport) 
	    test_bit(FCPORT_UPDATE_NEEDED, &vha->dpc_flags))

		msleep(1000);



	qla_nvme_delete(vha);



	qla24xx_disable_vp(vha);

	qla2x00_wait_for_sess_deletion(vha);

drivers/scsi/qla2xxx/qla_init.c

+4 −6
Original line number Diff line number Diff line
@@ -237,16 +237,14 @@ qla2x00_async_login(struct scsi_qla_host *vha, fc_port_t *fcport, 
	qla2x00_init_timer(sp, qla2x00_get_async_timeout(vha) + 2);



	sp->done = qla2x00_async_login_sp_done;

	if (N2N_TOPO(fcport->vha->hw) && fcport_is_bigger(fcport)) {

	if (N2N_TOPO(fcport->vha->hw) && fcport_is_bigger(fcport))

		lio->u.logio.flags |= SRB_LOGIN_PRLI_ONLY;

	} else {

	else

		lio->u.logio.flags |= SRB_LOGIN_COND_PLOGI;



	if (fcport->fc4f_nvme)

		lio->u.logio.flags |= SRB_LOGIN_SKIP_PRLI;



	}



	ql_dbg(ql_dbg_disc, vha, 0x2072,

	    "Async-login - %8phC hdl=%x, loopid=%x portid=%02x%02x%02x "

		"retries=%d.\n", fcport->port_name, sp->handle, fcport->loop_id,