lkml.org 
[lkml]   [2022]   [Aug]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 004/545] scsi: Revert "scsi: qla2xxx: Fix disk failure to rediscover"
    Date
    From: Nilesh Javali <njavali@marvell.com>

    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>
    ---
    drivers/scsi/qla2xxx/qla_init.c | 5 ++---
    drivers/scsi/qla2xxx/qla_nvme.c | 5 -----
    2 files changed, 2 insertions(+), 8 deletions(-)

    --- a/drivers/scsi/qla2xxx/qla_init.c
    +++ b/drivers/scsi/qla2xxx/qla_init.c
    @@ -5547,8 +5547,6 @@ qla2x00_reg_remote_port(scsi_qla_host_t
    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 |
    @@ -5649,7 +5647,6 @@ qla2x00_update_fcport(scsi_qla_host_t *v
    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);
    @@ -5664,6 +5661,8 @@ qla2x00_update_fcport(scsi_qla_host_t *v
    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;
    --- 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
    (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));

    \
     
     \ /
      Last update: 2022-08-19 17:47    [W:4.071 / U:24.884 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site