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

Commit 5e6803b4 authored by Himanshu Madhani's avatar Himanshu Madhani Committed by Martin K. Petersen
Browse files

scsi: qla2xxx: Fix NPIV handling for FC-NVMe 



This patch fixes issues with NPIV port with FC-NVMe. Clean up code for
remoteport delete and also call nvme_delete when deleting VPs.

Signed-off-by: default avatarHimanshu Madhani <hmadhani@marvell.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 850f6acd

drivers/scsi/qla2xxx/qla_nvme.c

+3 −13
Original line number Diff line number Diff line
@@ -474,21 +474,10 @@ static int qla_nvme_post_cmd(struct nvme_fc_local_port *lport, 
	int rval = -ENODEV;

	srb_t *sp;

	struct qla_qpair *qpair = hw_queue_handle;

	struct nvme_private *priv;

	struct nvme_private *priv = fd->private;

	struct qla_nvme_rport *qla_rport = rport->private;



	if (!fd || !qpair) {

		ql_log(ql_log_warn, NULL, 0x2134,

		    "NO NVMe request or Queue Handle\n");

		return rval;

	}



	priv = fd->private;

	fcport = qla_rport->fcport;

	if (!fcport) {

		ql_log(ql_log_warn, NULL, 0x210e, "No fcport ptr\n");

		return rval;

	}



	vha = fcport->vha;
@@ -517,6 +506,7 @@ static int qla_nvme_post_cmd(struct nvme_fc_local_port *lport, 
	sp->name = "nvme_cmd";

	sp->done = qla_nvme_sp_done;

	sp->qpair = qpair;

	sp->vha = vha;

	nvme = &sp->u.iocb_cmd;

	nvme->u.nvme.desc = fd;
@@ -564,7 +554,7 @@ static void qla_nvme_remoteport_delete(struct nvme_fc_remote_port *rport) 
		schedule_work(&fcport->free_work);

	}



	fcport->nvme_flag &= ~(NVME_FLAG_REGISTERED | NVME_FLAG_DELETING);

	fcport->nvme_flag &= ~NVME_FLAG_DELETING;

	ql_log(ql_log_info, fcport->vha, 0x2110,

	    "remoteport_delete of %p completed.\n", fcport);

}

drivers/scsi/qla2xxx/qla_os.c

+2 −0
Original line number Diff line number Diff line
@@ -3562,6 +3562,8 @@ qla2x00_delete_all_vps(struct qla_hw_data *ha, scsi_qla_host_t *base_vha) 
		spin_unlock_irqrestore(&ha->vport_slock, flags);

		mutex_unlock(&ha->vport_lock);



		qla_nvme_delete(vha);



		fc_vport_terminate(vha->fc_vport);

		scsi_host_put(vha->host);