lkml.org 
[lkml]   [2019]   [Dec]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 085/321] scsi: qla2xxx: Fix for FC-NVMe discovery for NPIV port
    Date
    From: Giridhar Malavali <gmalavali@marvell.com>

    [ Upstream commit 835aa4f2691e4ed4ed16de81f3cabf17a87a164f ]

    This patch fixes NVMe discovery by setting SKIP_PRLI flag, so that PRLI is
    driven by driver and is retried when the NPIV port is detected to have NVMe
    capability.

    Signed-off-by: Giridhar Malavali <gmalavali@marvell.com>
    Signed-off-by: Himanshu Madhani <hmadhani@marvell.com>
    Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/scsi/qla2xxx/qla_attr.c | 2 ++
    drivers/scsi/qla2xxx/qla_init.c | 10 ++++------
    2 files changed, 6 insertions(+), 6 deletions(-)

    diff --git a/drivers/scsi/qla2xxx/qla_attr.c b/drivers/scsi/qla2xxx/qla_attr.c
    index 15d493f30810f..3e9c49b3184f1 100644
    --- a/drivers/scsi/qla2xxx/qla_attr.c
    +++ b/drivers/scsi/qla2xxx/qla_attr.c
    @@ -2161,6 +2161,8 @@ qla24xx_vport_delete(struct fc_vport *fc_vport)
    test_bit(FCPORT_UPDATE_NEEDED, &vha->dpc_flags))
    msleep(1000);

    + qla_nvme_delete(vha);
    +
    qla24xx_disable_vp(vha);
    qla2x00_wait_for_sess_deletion(vha);

    diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
    index 653d535e3052f..f7dd289779b14 100644
    --- a/drivers/scsi/qla2xxx/qla_init.c
    +++ b/drivers/scsi/qla2xxx/qla_init.c
    @@ -242,15 +242,13 @@ qla2x00_async_login(struct scsi_qla_host *vha, fc_port_t *fcport,
    qla2x00_init_timer(sp, qla2x00_get_async_timeout(vha) + 2);

    sp->done = qla2x00_async_login_sp_done;
    - if (N2N_TOPO(fcport->vha->hw) && fcport_is_bigger(fcport)) {
    + if (N2N_TOPO(fcport->vha->hw) && fcport_is_bigger(fcport))
    lio->u.logio.flags |= SRB_LOGIN_PRLI_ONLY;
    - } else {
    + else
    lio->u.logio.flags |= SRB_LOGIN_COND_PLOGI;

    - if (fcport->fc4f_nvme)
    - lio->u.logio.flags |= SRB_LOGIN_SKIP_PRLI;
    -
    - }
    + if (fcport->fc4f_nvme)
    + lio->u.logio.flags |= SRB_LOGIN_SKIP_PRLI;

    ql_dbg(ql_dbg_disc, vha, 0x2072,
    "Async-login - %8phC hdl=%x, loopid=%x portid=%02x%02x%02x "
    --
    2.20.1


    \
     
     \ /
      Last update: 2019-12-04 00:06    [W:4.113 / U:0.076 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site