71 lines
2.6 KiB
Diff
71 lines
2.6 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Nilesh Javali <njavali@marvell.com>
|
|
Date: Tue, 12 Jul 2022 22:20:36 -0700
|
|
Subject: [PATCH] scsi: Revert "scsi: qla2xxx: Fix disk failure to rediscover"
|
|
|
|
commit 5bc7b01c513a4a9b4cfe306e8d1720cfcfd3b8a3 upstream.
|
|
|
|
This fixes the regression of NVMe discovery failure during driver load
|
|
time.
|
|
|
|
This reverts commit 6a45c8e137d4e2c72eecf1ac7cf64f2fdfcead99.
|
|
|
|
Link: https://lore.kernel.org/r/20220713052045.10683-2-njavali@marvell.com
|
|
Cc: stable@vger.kernel.org
|
|
Reviewed-by: Himanshu Madhani <himanshu.madhani@oracle.com>
|
|
Signed-off-by: Nilesh Javali <njavali@marvell.com>
|
|
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
|
|
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
|
---
|
|
drivers/scsi/qla2xxx/qla_init.c | 5 ++---
|
|
drivers/scsi/qla2xxx/qla_nvme.c | 5 -----
|
|
2 files changed, 2 insertions(+), 8 deletions(-)
|
|
|
|
diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
|
|
index af8df5a800c6..7caf573af58e 100644
|
|
--- a/drivers/scsi/qla2xxx/qla_init.c
|
|
+++ b/drivers/scsi/qla2xxx/qla_init.c
|
|
@@ -5749,8 +5749,6 @@ qla2x00_reg_remote_port(scsi_qla_host_t *vha, fc_port_t *fcport)
|
|
if (atomic_read(&fcport->state) == FCS_ONLINE)
|
|
return;
|
|
|
|
- qla2x00_set_fcport_state(fcport, FCS_ONLINE);
|
|
-
|
|
rport_ids.node_name = wwn_to_u64(fcport->node_name);
|
|
rport_ids.port_name = wwn_to_u64(fcport->port_name);
|
|
rport_ids.port_id = fcport->d_id.b.domain << 16 |
|
|
@@ -5858,7 +5856,6 @@ qla2x00_update_fcport(scsi_qla_host_t *vha, fc_port_t *fcport)
|
|
qla2x00_reg_remote_port(vha, fcport);
|
|
break;
|
|
case MODE_TARGET:
|
|
- qla2x00_set_fcport_state(fcport, FCS_ONLINE);
|
|
if (!vha->vha_tgt.qla_tgt->tgt_stop &&
|
|
!vha->vha_tgt.qla_tgt->tgt_stopped)
|
|
qlt_fc_port_added(vha, fcport);
|
|
@@ -5873,6 +5870,8 @@ qla2x00_update_fcport(scsi_qla_host_t *vha, fc_port_t *fcport)
|
|
break;
|
|
}
|
|
|
|
+ qla2x00_set_fcport_state(fcport, FCS_ONLINE);
|
|
+
|
|
if (IS_IIDMA_CAPABLE(vha->hw) && vha->hw->flags.gpsc_supported) {
|
|
if (fcport->id_changed) {
|
|
fcport->id_changed = 0;
|
|
diff --git a/drivers/scsi/qla2xxx/qla_nvme.c b/drivers/scsi/qla2xxx/qla_nvme.c
|
|
index 42b29f4fd937..e63272487788 100644
|
|
--- a/drivers/scsi/qla2xxx/qla_nvme.c
|
|
+++ b/drivers/scsi/qla2xxx/qla_nvme.c
|
|
@@ -35,11 +35,6 @@ int qla_nvme_register_remote(struct scsi_qla_host *vha, struct fc_port *fcport)
|
|
(fcport->nvme_flag & NVME_FLAG_REGISTERED))
|
|
return 0;
|
|
|
|
- if (atomic_read(&fcport->state) == FCS_ONLINE)
|
|
- return 0;
|
|
-
|
|
- qla2x00_set_fcport_state(fcport, FCS_ONLINE);
|
|
-
|
|
fcport->nvme_flag &= ~NVME_FLAG_RESETTING;
|
|
|
|
memset(&req, 0, sizeof(struct nvme_fc_port_info));
|