lisa/android_kernel_xiaomi_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

scsi: Revert "scsi: qla2xxx: Fix disk failure to rediscover"

Browse Source 
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>
This commit is contained in:
Nilesh Javali 2022-07-12 22:20:36 -07:00 committed by Greg Kroah-Hartman
parent 013acaa597
commit 58e337d27f
2 changed files with 2 additions and 8 deletions
drivers/scsi/qla2xxx
qla_init.cqla_nvme.c

5
drivers/scsi/qla2xxx/qla_init.c
View File

@ -5388,8 +5388,6 @@ qla2x00_reg_remote_port(scsi_qla_host_t *vha, fc_port_t *fcport)
if (atomic_read(&fcport->state) == FCS_ONLINE) if (atomic_read(&fcport->state) == FCS_ONLINE)
return; return;
qla2x00_set_fcport_state(fcport, FCS_ONLINE);
rport_ids.node_name = wwn_to_u64(fcport->node_name); rport_ids.node_name = wwn_to_u64(fcport->node_name);
rport_ids.port_name = wwn_to_u64(fcport->port_name); rport_ids.port_name = wwn_to_u64(fcport->port_name);
rport_ids.port_id = fcport->d_id.b.domain << 16 | rport_ids.port_id = fcport->d_id.b.domain << 16 |
@ -5485,7 +5483,6 @@ qla2x00_update_fcport(scsi_qla_host_t *vha, fc_port_t *fcport)
qla2x00_reg_remote_port(vha, fcport); qla2x00_reg_remote_port(vha, fcport);
break; break;
case MODE_TARGET: case MODE_TARGET:
qla2x00_set_fcport_state(fcport, FCS_ONLINE);
if (!vha->vha_tgt.qla_tgt->tgt_stop && if (!vha->vha_tgt.qla_tgt->tgt_stop &&
!vha->vha_tgt.qla_tgt->tgt_stopped) !vha->vha_tgt.qla_tgt->tgt_stopped)
qlt_fc_port_added(vha, fcport); qlt_fc_port_added(vha, fcport);
@ -5500,6 +5497,8 @@ qla2x00_update_fcport(scsi_qla_host_t *vha, fc_port_t *fcport)
break; break;
} }
qla2x00_set_fcport_state(fcport, FCS_ONLINE);
if (IS_IIDMA_CAPABLE(vha->hw) && vha->hw->flags.gpsc_supported) { if (IS_IIDMA_CAPABLE(vha->hw) && vha->hw->flags.gpsc_supported) {
if (fcport->id_changed) { if (fcport->id_changed) {
fcport->id_changed = 0; fcport->id_changed = 0;

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

@ -36,11 +36,6 @@ int qla_nvme_register_remote(struct scsi_qla_host *vha, struct fc_port *fcport)
(fcport->nvme_flag & NVME_FLAG_REGISTERED)) (fcport->nvme_flag & NVME_FLAG_REGISTERED))
return 0; return 0;
if (atomic_read(&fcport->state) == FCS_ONLINE)
return 0;
qla2x00_set_fcport_state(fcport, FCS_ONLINE);
fcport->nvme_flag &= ~NVME_FLAG_RESETTING; fcport->nvme_flag &= ~NVME_FLAG_RESETTING;
memset(&req, 0, sizeof(struct nvme_fc_port_info)); memset(&req, 0, sizeof(struct nvme_fc_port_info));