leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

scsi: qla2xxx: Fix NPIV handling for FC-NVMe

Browse Source 
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: Himanshu Madhani <hmadhani@marvell.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Himanshu Madhani 2018-12-10 12:36:23 -08:00 committed by Martin K. Petersen
parent 850f6acd34
commit 5e6803b409
2 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/scsi/qla2xxx/qla_nvme.c
View File

@ -474,21 +474,10 @@ static int qla_nvme_post_cmd(struct nvme_fc_local_port *lport,
int rval = -ENODEV; int rval = -ENODEV;
srb_t *sp; srb_t *sp;
struct qla_qpair *qpair = hw_queue_handle; 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; 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; fcport = qla_rport->fcport;
if (!fcport) {
ql_log(ql_log_warn, NULL, 0x210e, "No fcport ptr\n");
return rval;
}
vha = fcport->vha; vha = fcport->vha;
@ -517,6 +506,7 @@ static int qla_nvme_post_cmd(struct nvme_fc_local_port *lport,
sp->name = "nvme_cmd"; sp->name = "nvme_cmd";
sp->done = qla_nvme_sp_done; sp->done = qla_nvme_sp_done;
sp->qpair = qpair; sp->qpair = qpair;
sp->vha = vha;
nvme = &sp->u.iocb_cmd; nvme = &sp->u.iocb_cmd;
nvme->u.nvme.desc = fd; 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); 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, ql_log(ql_log_info, fcport->vha, 0x2110,
"remoteport_delete of %p completed.\n", fcport); "remoteport_delete of %p completed.\n", fcport);
} }

2
drivers/scsi/qla2xxx/qla_os.c
View File

@ -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); spin_unlock_irqrestore(&ha->vport_slock, flags);
mutex_unlock(&ha->vport_lock); mutex_unlock(&ha->vport_lock);
qla_nvme_delete(vha);
fc_vport_terminate(vha->fc_vport); fc_vport_terminate(vha->fc_vport);
scsi_host_put(vha->host); scsi_host_put(vha->host);