lkml.org 
[lkml]   [2019]   [Oct]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.3 012/197] scsi: qla2xxx: Fix N2N link up fail
    Date
    From: Quinn Tran <qutran@marvell.com>

    [ Upstream commit f3f1938bb673b1b5ad182c4608f5f8a24921eea3 ]

    During link up/bounce, qla driver would do command flush as part of
    cleanup. In this case, the flush can intefere with FW state. This patch
    allows FW to be in control of link up.

    Link: https://lore.kernel.org/r/20190912180918.6436-7-hmadhani@marvell.com
    Signed-off-by: Quinn Tran <qutran@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_mbx.c | 2 ++
    drivers/scsi/qla2xxx/qla_os.c | 6 ++----
    2 files changed, 4 insertions(+), 4 deletions(-)

    diff --git a/drivers/scsi/qla2xxx/qla_mbx.c b/drivers/scsi/qla2xxx/qla_mbx.c
    index aadff0124f39f..abfb9c800ce28 100644
    --- a/drivers/scsi/qla2xxx/qla_mbx.c
    +++ b/drivers/scsi/qla2xxx/qla_mbx.c
    @@ -3905,6 +3905,7 @@ qla24xx_report_id_acquisition(scsi_qla_host_t *vha,
    fcport->dm_login_expire = jiffies + 2*HZ;
    fcport->scan_state = QLA_FCPORT_FOUND;
    fcport->n2n_flag = 1;
    + fcport->keep_nport_handle = 1;
    if (vha->flags.nvme_enabled)
    fcport->fc4f_nvme = 1;

    @@ -4050,6 +4051,7 @@ qla24xx_report_id_acquisition(scsi_qla_host_t *vha,
    fcport->login_retry = vha->hw->login_retry_count;
    fcport->plogi_nack_done_deadline = jiffies + HZ;
    fcport->scan_state = QLA_FCPORT_FOUND;
    + fcport->keep_nport_handle = 1;
    fcport->n2n_flag = 1;
    fcport->d_id.b.domain =
    rptid_entry->u.f2.remote_nport_id[2];
    diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
    index 12d5f50646fba..2835afbd2edc7 100644
    --- a/drivers/scsi/qla2xxx/qla_os.c
    +++ b/drivers/scsi/qla2xxx/qla_os.c
    @@ -5150,11 +5150,9 @@ void qla24xx_create_new_sess(struct scsi_qla_host *vha, struct qla_work_evt *e)
    if (dfcp)
    qlt_schedule_sess_for_deletion(tfcp);

    -
    - if (N2N_TOPO(vha->hw))
    - fcport->flags &= ~FCF_FABRIC_DEVICE;
    -
    if (N2N_TOPO(vha->hw)) {
    + fcport->flags &= ~FCF_FABRIC_DEVICE;
    + fcport->keep_nport_handle = 1;
    if (vha->flags.nvme_enabled) {
    fcport->fc4f_nvme = 1;
    fcport->n2n_flag = 1;
    --
    2.20.1


    \
     
     \ /
      Last update: 2019-10-27 22:17    [W:4.018 / U:0.456 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site