From patchwork Wed Mar 21 06:09:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Madhani, Himanshu" X-Patchwork-Id: 10298635 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 1B66C600CC for ; Wed, 21 Mar 2018 06:10:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0A5F929716 for ; Wed, 21 Mar 2018 06:10:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F391C2971E; Wed, 21 Mar 2018 06:10:29 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 671AD29716 for ; Wed, 21 Mar 2018 06:10:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751343AbeCUGK2 (ORCPT ); Wed, 21 Mar 2018 02:10:28 -0400 Received: from mail-bn3nam01on0075.outbound.protection.outlook.com ([104.47.33.75]:60237 "EHLO NAM01-BN3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751630AbeCUGKB (ORCPT ); Wed, 21 Mar 2018 02:10:01 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=CAVIUMNETWORKS.onmicrosoft.com; s=selector1-cavium-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=B6aCbTXeLYFYi26a2iihZ+8vXRA6zGZknxZEvRuGDmA=; b=kVQTaJsi9XboVczDB/hnajnqT7NcdxKFc+vXAQ+14WHCq9GQvjJrIwfRfBFH3JWmQJO9SElGnDCw9W1EJMEA7/h+tGf3qim5tEZ9AJvDNhzM8MCinrbFV/C5xogHZjW9usAcmLBT/8ZJg1uoEZwAwZ1wwfp6aucD+0unW/vJw/8= Received: from SN1PR0701CA0025.namprd07.prod.outlook.com (10.162.96.35) by BY2PR0701MB2087.namprd07.prod.outlook.com (10.163.156.152) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.588.14; Wed, 21 Mar 2018 06:09:58 +0000 Received: from BL2FFO11FD022.protection.gbl (2a01:111:f400:7c09::173) by SN1PR0701CA0025.outlook.office365.com (2a01:111:e400:5173::35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.609.10 via Frontend Transport; Wed, 21 Mar 2018 06:09:57 +0000 Received-SPF: Fail (protection.outlook.com: domain of cavium.com does not designate 50.232.66.26 as permitted sender) receiver=protection.outlook.com; client-ip=50.232.66.26; helo=CAEXCH02.caveonetworks.com; Received: from CAEXCH02.caveonetworks.com (50.232.66.26) by BL2FFO11FD022.mail.protection.outlook.com (10.173.161.101) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.20.527.18 via Frontend Transport; Wed, 21 Mar 2018 06:09:57 +0000 Received: from dut1171.mv.qlogic.com (172.29.51.171) by CAEXCH02.caveonetworks.com (10.17.4.29) with Microsoft SMTP Server id 14.2.347.0; Tue, 20 Mar 2018 23:09:43 -0700 Received: from dut1171.mv.qlogic.com (localhost [127.0.0.1]) by dut1171.mv.qlogic.com (8.14.7/8.14.7) with ESMTP id w2L69hkF029539; Tue, 20 Mar 2018 23:09:43 -0700 Received: (from root@localhost) by dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id w2L69hCj029538; Tue, 20 Mar 2018 23:09:43 -0700 From: Himanshu Madhani To: , CC: , Subject: [PATCH v4 09/13] qla2xxx: Fix retry for PRLI RJT with reason of BUSY Date: Tue, 20 Mar 2018 23:09:37 -0700 Message-ID: <20180321060941.29468-10-himanshu.madhani@cavium.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20180321060941.29468-1-himanshu.madhani@cavium.com> References: <20180321060941.29468-1-himanshu.madhani@cavium.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:50.232.66.26; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(39860400002)(376002)(39380400002)(396003)(346002)(2980300002)(1110001)(1109001)(339900001)(189003)(199004)(47776003)(186003)(105606002)(72206003)(336012)(305945005)(80596001)(8936002)(8676002)(51416003)(81156014)(69596002)(4326008)(356003)(76176011)(6346003)(81166006)(26005)(50226002)(87636003)(36756003)(6666003)(1076002)(42186006)(316002)(16586007)(2950100002)(54906003)(48376002)(50466002)(110136005)(2906002)(575784001)(86362001)(106466001)(478600001)(5660300001)(217873001); DIR:OUT; SFP:1101; SCL:1; SRVR:BY2PR0701MB2087; H:CAEXCH02.caveonetworks.com; FPR:; SPF:Fail; PTR:50-232-66-26-static.hfc.comcastbusiness.net; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD022; 1:RS748ta8T/05urZtCOcgxczmt6aP24zpnEzvk2AI2iL58mYEKVuje4GnrDIA3YQ5B4la28agSABoMkhZp3dj7H9TwFgCE7BkBwVGlanFfHnqbBgIi+ae1dQcwCEoMMBM X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 17bcc886-a7ba-4ef5-a0b8-08d58ef25f69 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4604075)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060); SRVR:BY2PR0701MB2087; X-Microsoft-Exchange-Diagnostics: 1; BY2PR0701MB2087; 3:OBiDtlyTf8DOC0HwOeJ10wdAIL+VR1fNyqPQXe6g8QjuTLSZlyeVe4l7KEFs8i9tzTmybSlFbX9xTJdf/cZguEiA7bi6McsfRqc0imRys7ZthE0bWo2RnvriGU8SQYOszt7iYc7ZmQcaLhkwvfWLfkD4tTt06VhEuRn1eXh5amFOIzDZ4jRjtwUtMG8vK36QPUpVqTSv4fgYZ2v95ejtMchTtR8qUrGNvDL3JbBH25cwaYiIRNE2Nt9vto8blIToeNVz1OHIKawoOYing+oKQ7tl01c2PNqq9EOXRcR1Sw5S5D22WHqlZFZo/CxZStMY3W2eBZuIuSHMp62V0C2X3z0IlxJXnX1L3b9P+oUc/Rc=; 25:N1rYDcclClaYBNi88UhbQNv4PFe6S32wEaVdMN8v+KOWZ9nmJHao7PwF7AV6RMTnpAhcO4TWQw0eajkwjZIVZgnt5STPrytNy2lfNgaHPWP16r2La1KBeDH7i8D/XxFIPxHYeiQ7UhmqOU4qjK1UvuwLNnV/N0AfdG7cA/JD/J4wSosr974kHFNQb8BUo1LZRYEmhef4HC7CZi0plka0k0uxk0LqEicQrR1A4fkfoJgIHt+iH3V9Avtjv/+m8OeI76I5CaI+MUFpXBpwjDu7xfLCUc0ptf9b26/DpouIUb7CbDONQHXNfAzik9YDsSL0G4/92EM0EXpMFeyUt1J9mg== X-MS-TrafficTypeDiagnostic: BY2PR0701MB2087: X-Microsoft-Exchange-Diagnostics: 1; BY2PR0701MB2087; 31:8cJnJSuIncaxE4uS6W5BSFCm6ewOmr6zma079wCsb20PJaVhE/7X4dKFQk49bGYUC7k81ueM2r9WAYOS6W3/8Mma1s0LeZy0FFym39h2sY5Yv5pQyPO4p8cKHZEXQSuQDVwmDDyYPQuBb+prFUAbLupAP03Lyi8lQ4JSXutqBsLbt5GvdL/sR0AwR/kYEKS8A2nPeNt41HEYx8VETdy4CroTHIH91iUtJ2MJiIE7Au0=; 20:WaFSb5gkfD+EmQszLHiOIhmz0jCYZ73OeMVC3/Mb4tZ9spOxFQVWLXCemhdAC0D5GAYcMjc3orcILiMN8SSEwoSinzuPujuJs6SGMPv5JzrbTuyz03iJB49gqGevOzy7pcE8wCAdqNcLfTdn7Z16bY8mZp3Vkwc2jQiXf8x1d392SF2ec7ak0A+CVTkI9z1xQiWBrWEn/cIWYHFslulTfhJL4Eonf17x9gZtcUn1nGIlO1vVamavBdzmeT2GPzxPmSDbEfdA5rl1BaY/88aPeqBMh3u0kxsY7xJ1z92HA9OXeZfKZCvVH+o9ECRnBNXQZfGCk8fBvOBJd6ipByu7iO0dG3mcnIsGNLXHtn9wkKPweWBKIywtx5jp4z2GfPDabz/Np+V9AcJ5Y6KfN3zSXzQRjpZR9WMxmAeZt5Oth4qV8Pu4XmqVC9+u6tv6v/tGfT4drjkazONGZsBJG3Yq+eXuPAw1+diGK6cp1b2XXhm4kHoI9gGFMZJ1woLcZAI/ X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3231221)(944501319)(52105095)(93006095)(93001095)(10201501046)(3002001)(6041310)(20161123560045)(20161123558120)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(6072148)(201708071742011); SRVR:BY2PR0701MB2087; BCL:0; PCL:0; RULEID:; SRVR:BY2PR0701MB2087; X-Microsoft-Exchange-Diagnostics: 1; BY2PR0701MB2087; 4:ECorrhBq4pbITeXcXJgcEhBVrt4zCXh3F1M7nfKWtFQC/JYD+nyz74Qx2hyLq+JX1hI2JkPk1Vw5kgk2oSZmxkdPFB6VjacgdGioNIytMgmRnzMakzsTYG7XIlCaYPqnhDyNNzD+K5HYOAkOYWyJCLe8V82BudsB1XtcD4kxBibHLigPPYaF8iWTfi04EaY/E3mb3KxxXV+6U7R/DrPTLm9ruNJUJ4YX6kctBdR5kdLkAh94gFd162+oOwz0Wh0feDCr0d05oExRkA6ck8EWgQ== X-Forefront-PRVS: 0618E4E7E1 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY2PR0701MB2087; 23:lryH4uYB7/76YmdJ2THgcVJhxhTdE9JlamhlGdR?= =?us-ascii?Q?59dwx2qhwc4cBhALjvhKTXbrfvE9GLLBOV15b2Vg0Kla70kHbkeR9cnBf3ua?= =?us-ascii?Q?rkvjV3tCRGLPgdWFqrI2ur71zmxdCVZ2inMe33CaxekYrdGYwn6+8q3lPEVY?= =?us-ascii?Q?VxAjKKKF5wHnkOCo+UdUTFJsR8FdtsDT3MJ7VmJ9fynl93VcMFgb0LciHKX7?= =?us-ascii?Q?Jyg5VqY2SoAg0ZcoSWB1xfyKr1iJd7blYpw8cfbY5v0eETLhMimFe4mYWI0l?= =?us-ascii?Q?Inkq0qwJ2h2wKtl2ZGnB5ufKxt5iXd0pOmJcANWopiDOzuSfqVkbOctAlrdj?= =?us-ascii?Q?K4lMngLk/tTLESM2hmhJ2sq3BqUneqnCHlEG4g/qat8HFFKWEZ8nAXqQzfAO?= =?us-ascii?Q?CIiZVt3u0+ra9fmJCund+1NSBsPBLG42pMci86YCKet/HTREycniEslO3CVE?= =?us-ascii?Q?VrLCVDHmbchUQnBWkyAKI+5h1J9HovZ2quUt/Cxjpm8Daw/Iq/EZW0kKl5rM?= =?us-ascii?Q?IBwWacc5rNFBFMwGJW/EoCXcIM6DZIo4sStKDXTnswPRAxxgdab54YEo2hl4?= =?us-ascii?Q?mb5A/px6CuKK8drtPLRERt5usjcXGIO4hZiy9VMF6hSPmRqudAhWNVA1zxsk?= =?us-ascii?Q?arf0DV0VWVBXVuClrfFccGSQBsuJgHr47Khd1NufmXxlCAlVJ+ckCWeiFN5o?= =?us-ascii?Q?K0yBKwpGsuDElA6ZzB/jcShp9htVWBdsBgi//J0WQvuLtJw4mSGejF2wxi7A?= =?us-ascii?Q?zMSuIylhKkRSsAQ9a9LoWo21kcaQwmPnosPuAlQeUfcegaGo497OXqXNAG0C?= =?us-ascii?Q?kZkl8hzWA+454U7KudPeex5CkqyQeSmF7nSwTzRAUruplLz1iKLAnK+v/NgS?= =?us-ascii?Q?3LdX9Q+WvRilrJxBwiocXN2Ng4+qtb5DertGlNBSEZrXZ2iO8Dhudl4MkjuN?= =?us-ascii?Q?Ez844Q2C0pK/DooKX+WV3Kr7BppDU2hmonfLpBd2yq6+XpRNujdhVNRnF1uK?= =?us-ascii?Q?OmzgKmolQuxjAITeyc7k8wuuNuXnsgYl/clNsSKsS1NZa+0ik2Za4x5Gu3wb?= =?us-ascii?Q?uURlu8rcpDpxlVIx6co5XPnXPLwh+SZvmCHYQ7SYTL2YUPjoHabLxED22sv/?= =?us-ascii?Q?OKQEhcSFdDTDLyduxoohMziEJGDFeE+qm?= X-Microsoft-Antispam-Message-Info: Os3/gvSt/8OR7yil4a6syDzQdvaB9heARgZuWB6QexL2fU4mH3wxdAJv6ImW3g5LXX39vEC9c+3XHkYAZn/YGnksRHaihyVXpI/xflySdoWIwEbokb6pVtcIsfmIls0jRrCA7qELC/iGJzSYYGE4dTY81v7IHDgyAQaoh48U7J3atopSB5/OmlVYxb/qfRiS X-Microsoft-Exchange-Diagnostics: 1; BY2PR0701MB2087; 6:Mz61dNmEF6NKuFZVoRJJf9v7byrQOpHPFRnOIV/vtgcRvMowacmEtCwU9l9h0yjMIV89cUw2JyoOciC2Uc8RYtRcizWGnCNMPSX/auhELS8kz2g+s/CyJwS04hMG8IGR0bdxOZ1p/plwANgM/JkqdAbcyJmuG9a6nC8wDGxOETAXPMzW2PVnAZoXqYN3FlHMA317AzfCkvqnEb5QOGscw61hX5a0FC73kKkjs3XTo1MuqLuwbzUHUjkksYZ2rnhjUDOvyLwJYRewJZRbbq5K2E/jONH1EYV/PgHuLv0mDoOldBzkR9ol5g4Chh2blXltPg7B/QTK2SCjW0JUu5/LrvJfKcpy+zEy+kOMB8IB3Ds=; 5:11+pnGVuIZ3d6d5fyK9dOa8B9fkWffqXady41UD49MWXSuhlVE/tNLRIgvPGA61YbStnbNDOkn80YcBRLmfkYOVKJhv464zpBs6p6MMdr6Wcqbjq45CVT9nQ1YKjI5KvdmI/PMK18gWeqWMR48LlpqNjBrPs4WT3reV743caQVk=; 24:7HLdb+4rTZ+se2Znini+l8+mZd1Dm1hx5CKXbUvaBoeVc1lAYTkj8iNi3tzRSyFejIBxs4yFLackcFzRSMLKbOIpfwZr6kuuXop4c26ZRzE=; 7:GQAFsGAoXxTGodQaam1LKCwcT+TxOw9PUASXIqaoc0N/rmg2Ib+HOXud41g0fvmr+Hbhl02U9VNcPC+c3zRw8TMMWgX8uDh+wqDiX+EQwBgADXncbxdZu3JH0fFriRjvti+5zwczv6vECrnG7RKOicQREMhwj9OGLCE9s4GdwSrI1zkKpIziiYLkJkiUGsdmnbeePSGmSYgUEkepk0JFRdiye9YOz2e+ehQVvD9eb5tp2mOrPTqb2Atlbiikgq82 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Mar 2018 06:09:57.3348 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 17bcc886-a7ba-4ef5-a0b8-08d58ef25f69 X-MS-Exchange-CrossTenant-Id: 711e4ccf-2e9b-4bcf-a551-4094005b6194 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=711e4ccf-2e9b-4bcf-a551-4094005b6194; Ip=[50.232.66.26]; Helo=[CAEXCH02.caveonetworks.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY2PR0701MB2087 Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Darren Trapp Signed-off-by: Darren Trapp Signed-off-by: Himanshu Madhani Reviewed-by: Hannes Reinecke Reviewed-by: Johannes Thumshirn --- drivers/scsi/qla2xxx/qla_dbg.c | 2 +- drivers/scsi/qla2xxx/qla_init.c | 13 ++++++++++++- drivers/scsi/qla2xxx/qla_mbx.c | 7 +++++-- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/drivers/scsi/qla2xxx/qla_dbg.c b/drivers/scsi/qla2xxx/qla_dbg.c index 7e9d8f08b9d5..1abc8a9064b3 100644 --- a/drivers/scsi/qla2xxx/qla_dbg.c +++ b/drivers/scsi/qla2xxx/qla_dbg.c @@ -60,7 +60,7 @@ * | | | 0xb13c-0xb140 | * | | | 0xb149 | * | MultiQ | 0xc010 | | - * | Misc | 0xd302 | 0xd031-0xd0ff | + * | Misc | 0xd303 | 0xd031-0xd0ff | * | | | 0xd101-0xd1fe | * | | | 0xd214-0xd2fe | * | Target Mode | 0xe081 | | diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c index 33823d74c782..15a96dc205d0 100644 --- a/drivers/scsi/qla2xxx/qla_init.c +++ b/drivers/scsi/qla2xxx/qla_init.c @@ -880,7 +880,6 @@ qla24xx_async_prli(struct scsi_qla_host *vha, fc_port_t *fcport) return rval; if (fcport->fw_login_state == DSC_LS_PLOGI_PEND || - fcport->fw_login_state == DSC_LS_PLOGI_COMP || fcport->fw_login_state == DSC_LS_PRLI_PEND) return rval; @@ -1238,6 +1237,11 @@ int qla24xx_fcport_handle_login(struct scsi_qla_host *vha, fc_port_t *fcport) qla2x00_post_async_adisc_work(vha, fcport, data); break; + case DSC_LOGIN_PEND: + if (fcport->fw_login_state == DSC_LS_PLOGI_COMP) + qla24xx_post_prli_work(vha, fcport); + break; + default: break; } @@ -1640,6 +1644,13 @@ qla24xx_handle_prli_done_event(struct scsi_qla_host *vha, struct event_arg *ea) qla24xx_post_gpdb_work(vha, ea->fcport, 0); break; default: + if ((ea->iop[0] == LSC_SCODE_ELS_REJECT) && + (ea->iop[1] == 0x50000)) { /* reson 5=busy expl:0x0 */ + set_bit(RELOGIN_NEEDED, &vha->dpc_flags); + ea->fcport->fw_login_state = DSC_LS_PLOGI_COMP; + break; + } + if (ea->fcport->n2n_flag) { ql_dbg(ql_dbg_disc, vha, 0x2118, "%s %d %8phC post fc4 prli\n", diff --git a/drivers/scsi/qla2xxx/qla_mbx.c b/drivers/scsi/qla2xxx/qla_mbx.c index 735079ba691c..c9a134ae0d2b 100644 --- a/drivers/scsi/qla2xxx/qla_mbx.c +++ b/drivers/scsi/qla2xxx/qla_mbx.c @@ -1025,9 +1025,12 @@ qla2x00_get_fw_version(scsi_qla_host_t *vha) * FW supports nvme and driver load parameter requested nvme. * BIT 26 of fw_attributes indicates NVMe support. */ - if ((ha->fw_attributes_h & 0x400) && ql2xnvmeenable) + if ((ha->fw_attributes_h & 0x400) && ql2xnvmeenable) { vha->flags.nvme_enabled = 1; - + ql_log(ql_log_info, vha, 0xd302, + "%s: FC-NVMe is Enabled (0x%x)\n", + __func__, ha->fw_attributes_h); + } } if (IS_QLA27XX(ha)) {