scsi: qla2xxx: Fix unload when NVMe devices are configured

This patch fixes driver unload issue when FC-NVMe devices are configured.

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_nvme.c b/drivers/scsi/qla2xxx/qla_nvme.c
index d6ba078d8255caf1382db411755051120f5c773c..232b987e79dd506f66aa14e1aabd9f5bb03fd1ed 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_nvme.c
+++ b/drivers/scsi/qla2xxx/qla_nvme.c
@@ -607,6 +607,7 @@ static void qla_nvme_unregister_remote_port(struct work_struct *work)
        struct fc_port *fcport = container_of(work, struct fc_port,
            nvme_del_work);
        struct qla_nvme_rport *qla_rport, *trport;
+       scsi_qla_host_t *base_vha;
 
        if (!IS_ENABLED(CONFIG_NVME_FC))
                return;
@@ -614,6 +615,15 @@ static void qla_nvme_unregister_remote_port(struct work_struct *work)
        ql_log(ql_log_warn, NULL, 0x2112,
            "%s: unregister remoteport on %p\n",__func__, fcport);
 
+       base_vha = pci_get_drvdata(fcport->vha->hw->pdev);
+       if (test_bit(PFLG_DRIVER_REMOVING, &base_vha->pci_flags)) {
+               ql_dbg(ql_dbg_disc, fcport->vha, 0x2114,
+                   "%s: Notify FC-NVMe transport, set devloss=0\n",
+                   __func__);
+
+               nvme_fc_set_remoteport_devloss(fcport->nvme_remote_port, 0);
+       }
+
        list_for_each_entry_safe(qla_rport, trport,
            &fcport->vha->nvme_rport_list, list) {
                if (qla_rport->fcport == fcport) {
@@ -630,23 +640,11 @@ static void qla_nvme_unregister_remote_port(struct work_struct *work)
 
 void qla_nvme_delete(struct scsi_qla_host *vha)
 {
-       struct qla_nvme_rport *qla_rport, *trport;
-       fc_port_t *fcport;
        int nv_ret;
 
        if (!IS_ENABLED(CONFIG_NVME_FC))
                return;
 
-       list_for_each_entry_safe(qla_rport, trport,
-           &vha->nvme_rport_list, list) {
-               fcport = qla_rport->fcport;
-
-               ql_log(ql_log_info, fcport->vha, 0x2114, "%s: fcport=%p\n",
-                   __func__, fcport);
-
-               nvme_fc_set_remoteport_devloss(fcport->nvme_remote_port, 0);
-       }
-
        if (vha->nvme_local_port) {
                init_completion(&vha->nvme_del_done);
                ql_log(ql_log_info, vha, 0x2116,