From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AG47ELs7JwwStXCx+NlsaDy+bndEUJgK11vqylWVuRcvF2rQwKUMlkUagfI4Z6m+rBOCTSesMz0L ARC-Seal: i=1; a=rsa-sha256; t=1520955376; cv=none; d=google.com; s=arc-20160816; b=ZYjTAxW0DaAZ4VgAG4u0qxSkU2ODIbMoQIvti51HIQhQ1nqxrz4037CmtQv1uSjXmj f/pbkK1ukqoxYQlQnG7Y+hB42oUxb78MMH4YvWp0Vi7HB64ADfgQRRynL4+GklUEQJYH G7robhQ2kZha6eiNIB33naOj48q/AJGx5riGjeXM3nHUFtnlQ4uTBkoS9aWXOnMtO5Q5 mwpnf2PBv9PntshqbWPDwOHJeJLhyCtbYyuwyFNjSP3BVIOl75hGyhVFA5U75ssWWa3d ydZYPz1ZjunEKxzHPxfQe1y9Qzf9VxTMx6N4V6EIk9g2JpDOJdbO73XdIDPfIBtqPM02 zmqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:user-agent:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=V21ddycvkr2m4PhYCgi5x6JDfGrZ0eZnTkT7vDtZa30=; b=A1KIf3W3lq2kvO/5s59LLZ9Ti0PNYVCK9iYtFaORa4uj2wsnSc4+4gUz1aYWuYfUuk i8dYJSgFHdPs6e9fpJInCq675CDi8tudO3X+sIwfMFSAK9UM4nU7umFHJTlscPE7z2Jy 94NoV5Bx94ygI0dxaXEu6PDXXQJh37nNsMaYni2zQ3PEVOXuHTCQMO4j7/DVyw0BAw/o jEtfPQ5jcvBXwyvWJ8LCJUMCIYdXMN994RLl+YIPdwWTLxitTm+rpqLg6reqP+6tMz8h nWJ/aKgQd7rGiOIh+9ohUEbJa04+2fqU5/qNRmXnBE1/EZiDHuzim8BCHGvodGnN3TWs CClg== ARC-Authentication-Results: i=1; mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.71.90 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org Authentication-Results: mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.71.90 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Quinn Tran , Himanshu Madhani , Hannes Reinecke , "Martin K. Petersen" Subject: [PATCH 4.14 029/140] scsi: qla2xxx: Retry switch command on time out Date: Tue, 13 Mar 2018 16:23:52 +0100 Message-Id: <20180313152459.998681258@linuxfoundation.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180313152458.201155692@linuxfoundation.org> References: <20180313152458.201155692@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-LABELS: =?utf-8?b?IlxcU2VudCI=?= X-GMAIL-THRID: =?utf-8?q?1594837199077345038?= X-GMAIL-MSGID: =?utf-8?q?1594837304877635431?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Quinn Tran commit 25ad76b703d9ad536f3411b15b1070aeb059ab55 upstream. Retry GID_PN & GPN_ID switch commands for time out case. Fixes: 726b85487067d ("qla2xxx: Add framework for async fabric discovery") Cc: # 4.10+ Signed-off-by: Quinn Tran Signed-off-by: Himanshu Madhani Reviewed-by: Hannes Reinecke Signed-off-by: Martin K. Petersen Signed-off-by: Greg Kroah-Hartman --- drivers/scsi/qla2xxx/qla_gs.c | 34 ++++++++++++++++++++++++++-------- 1 file changed, 26 insertions(+), 8 deletions(-) --- a/drivers/scsi/qla2xxx/qla_gs.c +++ b/drivers/scsi/qla2xxx/qla_gs.c @@ -175,6 +175,9 @@ qla2x00_chk_ms_status(scsi_qla_host_t *v set_bit(LOCAL_LOOP_UPDATE, &vha->dpc_flags); } break; + case CS_TIMEOUT: + rval = QLA_FUNCTION_TIMEOUT; + /* drop through */ default: ql_dbg(ql_dbg_disc, vha, 0x2033, "%s failed, completion status (%x) on port_id: " @@ -2889,9 +2892,22 @@ static void qla2x00_async_gidpn_sp_done( ea.rc = res; ea.event = FCME_GIDPN_DONE; - ql_dbg(ql_dbg_disc, vha, 0x204f, - "Async done-%s res %x, WWPN %8phC ID %3phC \n", - sp->name, res, fcport->port_name, id); + if (res == QLA_FUNCTION_TIMEOUT) { + ql_dbg(ql_dbg_disc, sp->vha, 0xffff, + "Async done-%s WWPN %8phC timed out.\n", + sp->name, fcport->port_name); + qla24xx_post_gidpn_work(sp->vha, fcport); + sp->free(sp); + return; + } else if (res) { + ql_dbg(ql_dbg_disc, sp->vha, 0xffff, + "Async done-%s fail res %x, WWPN %8phC\n", + sp->name, res, fcport->port_name); + } else { + ql_dbg(ql_dbg_disc, vha, 0x204f, + "Async done-%s good WWPN %8phC ID %3phC\n", + sp->name, fcport->port_name, id); + } qla2x00_fcport_event_handler(vha, &ea); @@ -3217,11 +3233,6 @@ static void qla2x00_async_gpnid_sp_done( sp->name, ct_req->req.port_id.port_id, ct_rsp->rsp.gpn_id.port_name); - if (res) { - sp->free(sp); - return; - } - memset(&ea, 0, sizeof(ea)); memcpy(ea.port_name, ct_rsp->rsp.gpn_id.port_name, WWN_SIZE); ea.sp = sp; @@ -3231,6 +3242,13 @@ static void qla2x00_async_gpnid_sp_done( ea.rc = res; ea.event = FCME_GPNID_DONE; + if (res) { + if (res == QLA_FUNCTION_TIMEOUT) + qla24xx_post_gpnid_work(sp->vha, &ea.id); + sp->free(sp); + return; + } + qla2x00_fcport_event_handler(vha, &ea); e = qla2x00_alloc_work(vha, QLA_EVT_GPNID_DONE);