projects / pve-kernel.git / blame
| Commit | Line | Data |
|---|---|---|
| bb7155fd TL |
1 | From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 |
| 2 | From: Nilesh Javali <njavali@marvell.com> | |
| 3 | Date: Tue, 12 Jul 2022 22:20:36 -0700 | |
| 4 | Subject: [PATCH] scsi: Revert "scsi: qla2xxx: Fix disk failure to rediscover" | |
| 5 | ||
| 6 | commit 5bc7b01c513a4a9b4cfe306e8d1720cfcfd3b8a3 upstream. | |
| 7 | ||
| 8 | This fixes the regression of NVMe discovery failure during driver load | |
| 9 | time. | |
| 10 | ||
| 11 | This reverts commit 6a45c8e137d4e2c72eecf1ac7cf64f2fdfcead99. | |
| 12 | ||
| 13 | Link: https://lore.kernel.org/r/20220713052045.10683-2-njavali@marvell.com | |
| 14 | Cc: stable@vger.kernel.org | |
| 15 | Reviewed-by: Himanshu Madhani <himanshu.madhani@oracle.com> | |
| 16 | Signed-off-by: Nilesh Javali <njavali@marvell.com> | |
| 17 | Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> | |
| 18 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
| 19 | Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com> | |
| 20 | --- | |
| 21 | drivers/scsi/qla2xxx/qla_init.c | 5 ++--- | |
| 22 | drivers/scsi/qla2xxx/qla_nvme.c | 5 ----- | |
| 23 | 2 files changed, 2 insertions(+), 8 deletions(-) | |
| 24 | ||
| 25 | diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c | |
| 26 | index af8df5a800c6..7caf573af58e 100644 | |
| 27 | --- a/drivers/scsi/qla2xxx/qla_init.c | |
| 28 | +++ b/drivers/scsi/qla2xxx/qla_init.c | |
| 29 | @@ -5749,8 +5749,6 @@ qla2x00_reg_remote_port(scsi_qla_host_t *vha, fc_port_t *fcport) | |
| 30 | if (atomic_read(&fcport->state) == FCS_ONLINE) | |
| 31 | return; | |
| 32 | ||
| 33 | - qla2x00_set_fcport_state(fcport, FCS_ONLINE); | |
| 34 | - | |
| 35 | rport_ids.node_name = wwn_to_u64(fcport->node_name); | |
| 36 | rport_ids.port_name = wwn_to_u64(fcport->port_name); | |
| 37 | rport_ids.port_id = fcport->d_id.b.domain << 16 | | |
| 38 | @@ -5858,7 +5856,6 @@ qla2x00_update_fcport(scsi_qla_host_t *vha, fc_port_t *fcport) | |
| 39 | qla2x00_reg_remote_port(vha, fcport); | |
| 40 | break; | |
| 41 | case MODE_TARGET: | |
| 42 | - qla2x00_set_fcport_state(fcport, FCS_ONLINE); | |
| 43 | if (!vha->vha_tgt.qla_tgt->tgt_stop && | |
| 44 | !vha->vha_tgt.qla_tgt->tgt_stopped) | |
| 45 | qlt_fc_port_added(vha, fcport); | |
| 46 | @@ -5873,6 +5870,8 @@ qla2x00_update_fcport(scsi_qla_host_t *vha, fc_port_t *fcport) | |
| 47 | break; | |
| 48 | } | |
| 49 | ||
| 50 | + qla2x00_set_fcport_state(fcport, FCS_ONLINE); | |
| 51 | + | |
| 52 | if (IS_IIDMA_CAPABLE(vha->hw) && vha->hw->flags.gpsc_supported) { | |
| 53 | if (fcport->id_changed) { | |
| 54 | fcport->id_changed = 0; | |
| 55 | diff --git a/drivers/scsi/qla2xxx/qla_nvme.c b/drivers/scsi/qla2xxx/qla_nvme.c | |
| 56 | index 42b29f4fd937..e63272487788 100644 | |
| 57 | --- a/drivers/scsi/qla2xxx/qla_nvme.c | |
| 58 | +++ b/drivers/scsi/qla2xxx/qla_nvme.c | |
| 59 | @@ -35,11 +35,6 @@ int qla_nvme_register_remote(struct scsi_qla_host *vha, struct fc_port *fcport) | |
| 60 | (fcport->nvme_flag & NVME_FLAG_REGISTERED)) | |
| 61 | return 0; | |
| 62 | ||
| 63 | - if (atomic_read(&fcport->state) == FCS_ONLINE) | |
| 64 | - return 0; | |
| 65 | - | |
| 66 | - qla2x00_set_fcport_state(fcport, FCS_ONLINE); | |
| 67 | - | |
| 68 | fcport->nvme_flag &= ~NVME_FLAG_RESETTING; | |
| 69 | ||
| 70 | memset(&req, 0, sizeof(struct nvme_fc_port_info)); |