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: Giridhar Malavali <gmalavali@marvell.com>
Signed-off-by: Himanshu Madhani <hmadhani@marvell.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/qla2xxx/qla_attr.c b/drivers/scsi/qla2xxx/qla_attr.c
index 0bb9ac6ece9205b8f652fa55a7f752b780012ff5..00444dc797565c3c2fc12c801386614696bb3138 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_attr.c
+++ b/drivers/scsi/qla2xxx/qla_attr.c
@@ -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);
 

diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index 6fe20c27acc16e54aaf02112735d2b657c61852d..d403b56522ba8acd683042cd84f399cf1b586b6b 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -237,15 +237,13 @@ 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;
-
-       }
+       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 "