From patchwork Tue Sep 11 17:18:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Madhani, Himanshu" X-Patchwork-Id: 10595991 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 65427920 for ; Tue, 11 Sep 2018 17:18:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 46CE629B19 for ; Tue, 11 Sep 2018 17:18:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3A85329B20; Tue, 11 Sep 2018 17:18:36 +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=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,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 6E95729B19 for ; Tue, 11 Sep 2018 17:18:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727682AbeIKWSv (ORCPT ); Tue, 11 Sep 2018 18:18:51 -0400 Received: from mail-sn1nam01on0072.outbound.protection.outlook.com ([104.47.32.72]:29216 "EHLO NAM01-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726782AbeIKWSv (ORCPT ); Tue, 11 Sep 2018 18:18:51 -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:X-MS-Exchange-SenderADCheck; bh=ArDkzk+rs4VRnJ0hu14kaVRQJA+fqZdh/VFdBqH/Jjs=; b=jNOsO9BiSu4tZ212X9QyE9mdVQJ3TE1SQf9rku4jE/wP10bM7U+LiK68Lfz5W8A5jhc3azzcHYkXDDFemTypavH3Ny2MrI83d37ODMh2duBfO46n5pjAGoUQHX6ZA7Iq7lAcCQn4oEeO7qkOWf06fLYFgN9IYLQF5iv0o1L6C34= Received: from SN4PR0701CA0016.namprd07.prod.outlook.com (2603:10b6:803:28::26) by SN6PR07MB4397.namprd07.prod.outlook.com (2603:10b6:805:58::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1122.18; Tue, 11 Sep 2018 17:18:29 +0000 Received: from CO1NAM05FT054.eop-nam05.prod.protection.outlook.com (2a01:111:f400:7e50::203) by SN4PR0701CA0016.outlook.office365.com (2603:10b6:803:28::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1122.17 via Frontend Transport; Tue, 11 Sep 2018 17:18:29 +0000 Authentication-Results: spf=pass (sender IP is 50.232.66.26) smtp.mailfrom=cavium.com; vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=bestguesspass action=none header.from=cavium.com; Received-SPF: Pass (protection.outlook.com: domain of cavium.com designates 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 CO1NAM05FT054.mail.protection.outlook.com (10.152.96.170) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.20.1164.5 via Frontend Transport; Tue, 11 Sep 2018 17:18:29 +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, 11 Sep 2018 10:18:28 -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 w8BHIRPh029055; Tue, 11 Sep 2018 10:18:27 -0700 Received: (from root@localhost) by dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id w8BHIRJU029054; Tue, 11 Sep 2018 10:18:27 -0700 From: Himanshu Madhani To: , CC: , Subject: [PATCH 01/16] qla2xxx: Allow FC-NVMe underrun to be handled by transport Date: Tue, 11 Sep 2018 10:18:12 -0700 Message-ID: <20180911171827.29016-2-himanshu.madhani@cavium.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20180911171827.29016-1-himanshu.madhani@cavium.com> References: <20180911171827.29016-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)(136003)(376002)(396003)(346002)(2980300002)(438002)(199004)(189003)(186003)(106002)(316002)(42186006)(126002)(80596001)(36756003)(44832011)(106466001)(476003)(87636003)(305945005)(51416003)(76176011)(4326008)(16586007)(356003)(26005)(54906003)(110136005)(478600001)(81156014)(81166006)(2906002)(8936002)(11346002)(50466002)(47776003)(6666003)(48376002)(14444005)(50226002)(69596002)(2616005)(1076002)(446003)(72206003)(8676002)(5660300001)(336012)(86362001)(486006);DIR:OUT;SFP:1101;SCL:1;SRVR:SN6PR07MB4397;H:CAEXCH02.caveonetworks.com;FPR:;SPF:Pass;LANG:en;PTR:50-232-66-26-static.hfc.comcastbusiness.net;A:1;MX:1; X-Microsoft-Exchange-Diagnostics: 1;CO1NAM05FT054;1:mtfX+mfoAGPU+i6c1FEzGb0OLWyPemwZxLZSxQ1iSx2a1yWn/alo576u7hTZK28YJw6K7azzgzTZJdMgVxB8ARjmBM7Bmqmvz/PLkxvjowcAlSjNO5jWQ5l7n8W5JXNX X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 075d354a-f4be-43a5-77f8-08d6180a97d1 X-Microsoft-Antispam: BCL:0;PCL:0;RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(4608076)(2017052603328)(7153060);SRVR:SN6PR07MB4397; X-Microsoft-Exchange-Diagnostics: 1;SN6PR07MB4397;3:WniK48Cg+uAI314ziA147t1aPmPdfSHQ89jbcfL4pFttKN7WZamvAwRY0QEK0vzb1V/a9LyoXKiewDBMQVmAefkRyrUyj3n5z3L0FCZAKNaqRdb2+dK1BopIgjDc8Ou2F6MTcy+0FLDTcgMajvmc2vzfDe5JFMgEo5N/hjaynK2aUmcTQkLv1lrm3IPVidjFtepjKO0VeuCAvxsssOtNSCWH821UI+f8UsKdJFoOEHv1t6M569pDB692PBhlMgf9VWYAJkSDgiTl7H2JhxXA/L3DkO5Erk13b1eUxrIjQsW1mhXvUeqZUl6hRvc+kXya1AYHuXI6nc33hJ+NswfkJcRxlbaaSCoOSS/EwH1TecY=;25:fULK0bac1cKoeFRFRb8UapUaoxgHU66Ouq8sHHI/KBW4c0WaLx/8LKf6D2ENHV2lTuKT+hloE1rw41huJtlh2yyp/tuE3WICjZNUEjsMBqc44/9AeLfkt3MyrwYnZnPTEEKNtnFgOiDB5G/pLU24kWJfJ1cLRhpGPd40Nu3cA5RogvtafUClSLHkyBtMXkZaz4D/HEkYkEUFic15uRY+pk3YNnzIlBsy5P0ctCkCPGNP4TtyTyj8i7WFiHJ7uDyZGc6qSfrPn/55UcQTwGFwLqvRfR0DunFzSZA1p4GdKdp+alad+H3wJ8zRnizMyOtg8mxHuUt62FuUoPZm9Ask0g== X-MS-TrafficTypeDiagnostic: SN6PR07MB4397: X-Microsoft-Exchange-Diagnostics: 1;SN6PR07MB4397;31:f9Ym70+yyaRu+fcrHaIYFxtD23GJfeIlUGSZ81SVtaaMLBuDR3GHXLG9FgeNLXKKLa68/hNMBHl0ja/82wd9e8jn6cZ84cy59ZYbNursqmkRH7NO9Fj23OJjHh3bfv2MLR6m2x8ll/Aanu/5LPnJu/4sSKxca3pq0MUva9Xfc0+LsQh8CBVOAHL/MJ0U5S2JK8G4f5torittrI3sAOU9OIyXPv7RIqknD+RMdM2jKM8=;20:suTUSNVXYrxB2Vs7VE2xD/7whd6DPPHZkYUuJ5mBg31/grq8EUONy6zJAOnc7JVZgFAYs4WUfdwF4G7a3A42lPwA/sqXI6k80OeYI6cw4HYtvIAUWWQcdgN+HEyyLIUqjdWAa8L1PrWFkQ0SWbM7FRF8SM8DJZTf/waj9s3Y03ChIwBb2Fy/LGxBzxlu2jJgdvgfthQtxPdnYIoiQLnZXVLcf96yO1SXwN5qdh2q6YsPwfj/+oWJia2rH8NUhmc3FLBbqzvw5ZIntlMOBPnFOr2555YYfNynHYADmBIHcbiaL2AH9R3Qg4AJ2bUVSeI1xh84rXqMC5Y1oqIxa208irt5PCOA2EJAkaT7Ix6harONHB3qwIuEvyf6bVf4tkkn2I+IWJDjTA/hqHDwyo3eENv/0vmSJay/ObNoi1NSM7xvKhDYclZZ70UgUNdYVDxErOB+7DRoTMlCHm7QUJ2O8q0ZkytvzONAjqn45REMPEwYZRJR+TErG3u0De9z+N+z X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3231311)(944501410)(52105095)(3002001)(93006095)(93004095)(10201501046)(149027)(150027)(6041310)(20161123564045)(20161123558120)(20161123562045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(201708071742011)(7699050);SRVR:SN6PR07MB4397;BCL:0;PCL:0;RULEID:;SRVR:SN6PR07MB4397; X-Microsoft-Exchange-Diagnostics: 1;SN6PR07MB4397;4:KNDd2jZttbEzegPb6bzFvrd6IMRtK/ZwsKCMK7svUTG3SsEcQzlU12tA4SqZjOdZGpc3bjwmmU2kJK0q4HWXUjVNAcd81RJrkLm0jWIn0MnnThlFcrKWD4dbhINy1tgF06FB185Nxypy2Ax7VQNZJ+p4wh+PDRcQ8LrM3qt87AiZY80Z617Yh4xRy5K/ZLrN+QCIomZLPobCLNuxl56V3WaLnR0HWaM3ihPycv0jDJNvyf8a90kmZ3B0gVy4GOTydyfOw+/uu7/zOXyk4frAfg== X-Forefront-PRVS: 0792DBEAD0 X-Microsoft-Exchange-Diagnostics: 1;SN6PR07MB4397;23:Y1gWv6iHm0Kkl971vzpoIjwatkDPKPoH1a6l2H8uVS//f9lFdbOEpJWBZrVeThFNtLc+9eREAXwqB52y07Bo1XpE2+jeWfWJ6dMTOyBvZ3TFv+DAbtQfZloSXm9XfurXC4JX/QXVK8S8c5x5jtKcYJMK4lxK+d/mXFz04KVxKR6jYjDzIAX1AYVsn4rIdmDZPWcGN6cOtYAKFHVz/POT00tSbQ7VfODdaPMvlW1eXUWX8QSGZEglQs9Qv/olT7a7kmxmX0AmbCELs1hE5JDHjMBLNQnRGSmpk0/ufLE7bysQkcqDl9sMWgeWhq+B6n1DZ+8QhCny6hjQcjNFqDVngTqMHC2ie/SwvhHYl/uRs4cGH8ZP1wDtw5o6LIc9eU8UTF9K/gdPSrUhllyqoqifIMH7ShI8v91uOxyjzpkmvc+TA43Zfst+3dKP3AhjJIUPsTwfw54RIdL/FirczH0iSH511Qg6LGKhvh37lKKaY+WSvW+JcTiAjHWELTpI6oObGEkR/mq5yxhnam7efv5YGpb/1zuE2CuhsuXXqLtiwAb1PederIcZvxSgqVOFV84wBlLhVFaK/j2IjTrVfUJDg4PJzxxcOV5Drekdjo8onAeBfEcrgjFgYIL/+Bscl2N16dwt7smvLyIUYHxr0RZOOeKvF+8l+f0kHT0t/JQr/F6U4W2hK6n1HFHZ6oMUc0nnD9s+3mf0JzJL23FXT+bfoJVQjemrh7FhpZD+VKQaqevIZFtQBv7uU1XW/abw0cSiAbU2ha50K5OjLl0VLlLQqyOWzCAbgLAicPJz2/WreE++CBMbpOepht/H6ym7lYnA46U6FDZoVBk1RI8hV1qX/RyWpdpKnVDBLC884M9klo/MoWbOj1Xju4Ly9IIkxMeSVRXpkm5Ow92nqMzN/nzOGdf0Nfe8R+r54bG7FIYCBH+SpT2BOaYdc5iC6lMvulzrqvZZR2VI6h0YrirFRDWHZnVft7BiycqzrL/zP5hxk+eGx1WOfiF1GkU7UgE94gKKcXCL+VsqBiJdJvw2/FuT0MPc3pWM6VoqlxP9SQI/Pc4+peuGu7q4/mKyBd5fy1yEDSWe/2HB0ChBSD5+naPAzZNk6m64zQ7l9O17OGb5u3ME8OfHW7YgB8Vva7kOkhhZ X-Microsoft-Antispam-Message-Info: Bl6FYSxdnHL8gDtMfuc7nAwtXXbRggVHS+ejWsUSnDZOHsUd8dRtHk9vysJ6dP+lByCExGmGYFBX7+x3igarzfQPh8Id0TEUVJBwxlg0uKCdoHmwJkvSG0dgpxpPjcTLDLRtrQtngQUlhgsN1sG/+yDJKXtTMaaA454m8JC71Z3KgcEZKokSyoD+F0nZPMHyjPYm7vrOLDk4lB44ylOKfb7RT8EIn6bg4SQtAXd8sCr+Gu/ItU+kdUPZz4YHlNK9/VG2ko2WOO27VRMYUVqKQKrWlNGg91nH7s4BGTTnNC1/qCvFtgbyIWOxz5nkqhzp7cnyCyjoqXQganfIKJQuZhWIJC/YNR98Dil0t9DboT4= X-Microsoft-Exchange-Diagnostics: 1;SN6PR07MB4397;6:IFAuVOdVpBk21eVJRUnkWR6RqUcH/iHJQCAQNi9BPjuCu2nzYnlNwYpul37Ou539YyGVaGH1tXjoeKRrVvSBDsnP9eBMdCV5k0Cszsr84oDLmRdaE+bkiWd6HEtIlmAGKJ6K/pUz3cYwpTn0xcH77HcX48z4vWrZR4MLy3Bqij9JXD/y13dxgfm2DXIJE96Sizl8tSap2lc45bvMDjd19nzjtAz5P/CumIy65LNL9b82QP8t/+j+V6HIb8UwHzKZyrXXchfyCLotEPGAr/gGt8i3n89dM1l2vzG53c/kWk+nyMt9mDwEbbB8Y8MxkwthNhGBgDrP7XRaPNjZS4Ld62DXkgr+BkQ1CkU8Uu3cPRuX53XleY9cu2JoZIfqPjxJSlWdcnzZPLt/Iat1eNjimcMRvRQNWxB/cDZqa1TfFJ6bEuHnd8Vpl48ia52hoGx1gLjEA3w/YiCAtLAEoAMzZA==;5:T4ETT7HiIFnd9dJbWVWt6DDWxpPJr0cMbNTyHkDxJy0qPWVP8rMsbILzx2ei+OSe6CLGsBD0HofBa5VhAjzkElvB/2iAb1ziLfV0m7TxvahTI1gsgg4voohOVmrzI/GOlAYSy27HINOYlutoGB9y/sOk9EY4H931ox0sSRDtJAQ=;7:Ww9uneVMEmInLYThUEpSXBX/dz8dAaRsgjci4S29IO72Sb24MrKvt6KsSnlWC0UW/CZ5USEJuTAKv6a1oQ7uiXnnou8veV1YREEJtS5uu9iLD6+5EsXRLN08bjBkhPGA6VnZvq0yG/5v4vUOwTMjOgxsTXBdDeFeTvmRvfYFKEBghzSd7NsVfL3Wci2xgg7T3QvyarAfreuDvESvnkC2JWFJmdXfF6Ko+tn21JdB4dO3uSlnPvbwAPgRgQ+zoLE2 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Sep 2018 17:18:29.2830 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 075d354a-f4be-43a5-77f8-08d6180a97d1 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: SN6PR07MB4397 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 This patch allows FC-NVMe under-run to be handled by transport Signed-off-by: Darren Trapp Signed-off-by: Himanshu Madhani --- drivers/scsi/qla2xxx/qla_isr.c | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c index bc97e3a1bef7..0087174d3766 100644 --- a/drivers/scsi/qla2xxx/qla_isr.c +++ b/drivers/scsi/qla2xxx/qla_isr.c @@ -1850,11 +1850,12 @@ static void qla24xx_nvme_iocb_entry(scsi_qla_host_t *vha, struct req_que *req, struct sts_entry_24xx *sts = (struct sts_entry_24xx *)tsk; uint16_t state_flags; struct nvmefc_fcp_req *fd; - uint16_t ret = 0; + uint16_t ret = QLA_SUCCESS; + uint16_t comp_status = le16_to_cpu(sts->comp_status); iocb = &sp->u.iocb_cmd; fcport = sp->fcport; - iocb->u.nvme.comp_status = le16_to_cpu(sts->comp_status); + iocb->u.nvme.comp_status = comp_status; state_flags = le16_to_cpu(sts->state_flags); fd = iocb->u.nvme.desc; @@ -1892,28 +1893,35 @@ static void qla24xx_nvme_iocb_entry(scsi_qla_host_t *vha, struct req_que *req, fd->transferred_length = fd->payload_length - le32_to_cpu(sts->residual_len); - switch (le16_to_cpu(sts->comp_status)) { + if (unlikely(comp_status != CS_COMPLETE)) + ql_log(ql_log_warn, fcport->vha, 0x5060, + "NVME-%s ERR Handling - hdl=%x status(%x) tr_len:%x resid=%x ox_id=%x\n", + sp->name, sp->handle, comp_status, + fd->transferred_length, le32_to_cpu(sts->residual_len), + sts->ox_id); + + /* + * If transport error then Failure (HBA rejects request) + * otherwise transport will handle. + */ + switch (comp_status) { case CS_COMPLETE: - ret = QLA_SUCCESS; break; - case CS_ABORTED: + case CS_RESET: case CS_PORT_UNAVAILABLE: case CS_PORT_LOGGED_OUT: + fcport->nvme_flag |= NVME_FLAG_RESETTING; + /* fall through */ + case CS_ABORTED: case CS_PORT_BUSY: - ql_log(ql_log_warn, fcport->vha, 0x5060, - "NVME-%s ERR Handling - hdl=%x completion status(%x) resid=%x ox_id=%x\n", - sp->name, sp->handle, sts->comp_status, - le32_to_cpu(sts->residual_len), sts->ox_id); fd->transferred_length = 0; iocb->u.nvme.rsp_pyld_len = 0; ret = QLA_ABORTED; break; + case CS_DATA_UNDERRUN: + break; default: - ql_log(ql_log_warn, fcport->vha, 0x5060, - "NVME-%s error - hdl=%x completion status(%x) resid=%x ox_id=%x\n", - sp->name, sp->handle, sts->comp_status, - le32_to_cpu(sts->residual_len), sts->ox_id); ret = QLA_FUNCTION_FAILED; break; } From patchwork Tue Sep 11 17:18:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Madhani, Himanshu" X-Patchwork-Id: 10595993 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B7AD414E5 for ; Tue, 11 Sep 2018 17:18:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9A5AF29B1D for ; Tue, 11 Sep 2018 17:18:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8E2BD29B23; Tue, 11 Sep 2018 17:18:37 +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=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,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 2C2AC29B1D for ; Tue, 11 Sep 2018 17:18:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727709AbeIKWSx (ORCPT ); Tue, 11 Sep 2018 18:18:53 -0400 Received: from mail-eopbgr700048.outbound.protection.outlook.com ([40.107.70.48]:52566 "EHLO NAM04-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727419AbeIKWSx (ORCPT ); Tue, 11 Sep 2018 18:18:53 -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:X-MS-Exchange-SenderADCheck; bh=p/cbRhx+eIBzucbWTZFIPFiLqiTbYV6DaG2PJe4T+hw=; b=J9ttIV+/iGKssU5w1IdTutY3UvXUCRLOi5/12gOaI6IMV+hVc3C6eQE6UGTQjQzCTAF4q2/cM0xIhnzUd3SzcxgdJxA2mQX5vjTKwiLU7qVm5sSjidsr0Nm7N6e10gB5qVHSjx1k0PUjiomo/5elvoGeVp/Q40+It8z1oXx7xWM= Received: from DM6PR07CA0004.namprd07.prod.outlook.com (2603:10b6:5:94::17) by DM6PR07MB4668.namprd07.prod.outlook.com (2603:10b6:5:a0::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1122.15; Tue, 11 Sep 2018 17:18:33 +0000 Received: from CO1NAM05FT061.eop-nam05.prod.protection.outlook.com (2a01:111:f400:7e50::201) by DM6PR07CA0004.outlook.office365.com (2603:10b6:5:94::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1122.16 via Frontend Transport; Tue, 11 Sep 2018 17:18:33 +0000 Authentication-Results: spf=pass (sender IP is 50.232.66.26) smtp.mailfrom=cavium.com; vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=bestguesspass action=none header.from=cavium.com; Received-SPF: Pass (protection.outlook.com: domain of cavium.com designates 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 CO1NAM05FT061.mail.protection.outlook.com (10.152.96.179) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.20.1164.5 via Frontend Transport; Tue, 11 Sep 2018 17:18:33 +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, 11 Sep 2018 10:18:28 -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 w8BHIRov029059; Tue, 11 Sep 2018 10:18:27 -0700 Received: (from root@localhost) by dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id w8BHIR3i029058; Tue, 11 Sep 2018 10:18:27 -0700 From: Himanshu Madhani To: , CC: , Subject: [PATCH 02/16] qla2xxx: Increase abort timeout value Date: Tue, 11 Sep 2018 10:18:13 -0700 Message-ID: <20180911171827.29016-3-himanshu.madhani@cavium.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20180911171827.29016-1-himanshu.madhani@cavium.com> References: <20180911171827.29016-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)(376002)(136003)(396003)(346002)(39860400002)(2980300002)(438002)(189003)(199004)(126002)(42186006)(14444005)(316002)(1076002)(356003)(48376002)(16586007)(106466001)(81166006)(50226002)(69596002)(106002)(50466002)(80596001)(8936002)(36756003)(47776003)(8676002)(4326008)(186003)(26005)(446003)(87636003)(478600001)(81156014)(11346002)(72206003)(486006)(305945005)(86362001)(6666003)(476003)(5660300001)(2906002)(54906003)(2616005)(110136005)(336012)(51416003)(76176011)(44832011);DIR:OUT;SFP:1101;SCL:1;SRVR:DM6PR07MB4668;H:CAEXCH02.caveonetworks.com;FPR:;SPF:Pass;LANG:en;PTR:50-232-66-26-static.hfc.comcastbusiness.net;MX:1;A:1; X-Microsoft-Exchange-Diagnostics: 1;CO1NAM05FT061;1:dkTTrS8EiAW6LX1OpZlosSpSsRgKKXl7mgcz8l1A1uSNaJxuA+MKFwBtppDXRBT97/hcebvQmLS08nUCPMjP+UTf8KZDYHYAr+Q+1R8doOsZYIblZPV5AH+5urBAz4dS X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4a695c7d-2441-4377-28d5-08d6180a9a2e X-Microsoft-Antispam: BCL:0;PCL:0;RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(4608076)(2017052603328)(7153060);SRVR:DM6PR07MB4668; X-Microsoft-Exchange-Diagnostics: 1;DM6PR07MB4668;3:ThSnvJ/ZPkiFMcPyS6hrI61roj7IbcvR7/qxOB6OnxcwL+yswbdTmZegNDUI0JxuVJXyb3IMiD8tX3OhdxHcfYdrXX9AfTqUMOTlKIzYg582Z0h5oVJIwDGfyTSuJuO5mswdincIdX0RYyCeBhsscOhoR6XIklF6DMKCYTXAlYvpQSPSrhUcNMD00w/V6feocyZVNVPhKH9BhQ5BklOT6EXw10tKKt6/WZ1JASOAZWs+GD2EShluuamm2Bax+3FMihjm4rnU+WQWy3bHQ9C1NTzzWraC/WVtcU8Fo3z9Vtcsr3vS9m8K3DId380JKjD4loLf824Y0+TUgUvE/1Gn2XZRR1IkOc3/3wkabCrLGrg=;25:5weyWsp9SqegwQgug6EQ5p8GA8ofMK82IQx+UKyB6On0SuT1/DQ5yximif5y24rOtpUAqS1Ke4E+1nr7LZhfMedUoNSADSdJk5Lrb39uIpkyf3ttr7DX75yg+cHenfSkDE6c+M4Usa+NZiojS/N+TkJcbmOkeSQtT7jlx3Ggosn6GzhHBAkuBS7i1bLOLnBWcCHnE9R5tcpROt3sqeOTnS1JQ7fJiokWgKfRTFPzPQ833c7EhCI6CDAtPEQQEeuQzVAwfIXu/MN+chTXEPtAVAVv4QOTqirm5LuENvWaS345gQclRvLV+b3iW+fVLKSeKYZ/Ww0fWkJDwywW9N0iZw== X-MS-TrafficTypeDiagnostic: DM6PR07MB4668: X-Microsoft-Exchange-Diagnostics: 1;DM6PR07MB4668;31:g8oHcQmGGO9oH+X2HjaN89UaWLuCSGkjnSvnFgidUtQFQFV4IRAmam0UnFxdQcr6CjtjFaEhABPIHdtGYGacuvwprXvhicltPmvvUCCL6jcO2hXen/1DFWhEukmJr61ijyEznOCJVQ6Ck70CbMD2mkieATn4PWof7rEAhrxU+KQM1cRrDeBAtPQsurFvv8J4lMBoO/rUsSWep1pCsoQ+zM8s1gHgPpfW6QitYMxyF+c=;20:dQnWIWstCkMJooWaUpH9li71f2wzUgK4hrITwBrDZ6rcUGgdkEJFgYPBFmWt1W5DD/duTC4m4uMRRd0oAei7D3oLFmlEE+0NvnnmrQQY3NjK3ylGMS2/z52WztYUoQX7tPibFJMyNl4c/B3ek87gYAWOBI0HywAGnbUgBGuUgnzikETFDVQHlFDAfhg9DUKr+7beQZgg7gAaB6pv7NH7pzqHdkFlxZsx7VX3E95Zd3PqieiHJtjwZ146y4/8ull7oj+3BXTgVKBjHIk2YGaoi/Jdrt5LYPHfqzSCPCtTueY5aNCtkF5/q4L2qvcieyNbHfyNNGVpCCEVg7t8C9i+hhvw7xq8LL51p0tJFctaBQbrIjQWGKMGEeUGlciNFyiROT6uSF4C8BR3AINHGv6McWixI5Apf2lC74J19npphZ4I7c3Bx3bk6pgbkvIPIUv1QGd6UhsCJnG2zqfiUvVHz7CYc5dcyHkPwt4HDksEccSm1uH1XoHOjzkU+dzT8ejS X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3231311)(944501410)(52105095)(10201501046)(93006095)(93004095)(3002001)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123564045)(20161123558120)(20161123562045)(201708071742011)(7699050);SRVR:DM6PR07MB4668;BCL:0;PCL:0;RULEID:;SRVR:DM6PR07MB4668; X-Microsoft-Exchange-Diagnostics: 1;DM6PR07MB4668;4:/lm7TEkQjbgqWpHB9MN8BqOXFdIGYWqN8CBtro+2V3nPthn7aRSfFmFo4/VldYGLrmreVkMBKyr9Ja8l0NXIDgWDfrGOukjWtoyrYZFUCuwVQUL1G/lTkp44BDPfd6FRtLMCaThQ9incgiFIo3HkV1e+4oElqXZ1frkvMkaD2aD/TH95L3r8V+7b9jYQmQ8MLeDbLbOhe34gDDaY4Y9YEFJYprd5MObeFpOm5Rn4JyG65Zzw+vZHCeLoGbO14pjRu6KvLtgWtKYWZnw9H/pt5g== X-Forefront-PRVS: 0792DBEAD0 X-Microsoft-Exchange-Diagnostics: 1;DM6PR07MB4668;23:HP/lc/Twd3n4EwB+6KB433pb5Bbqqn9WkLvePUEo/dXbWFnB3RkzEe3PrCHUE5ynGX033K4id0C241/Yi5/336fFi1uXNeQZZ8zt1xmA3bjGOA0nCbPLsiMokCoAE/u+hoC5ADyJz+lzS56sihkOdU8BFVy/38nVSZfefNKYjzycu19WnbjFabSf+VpAALTR2Xji0sIXNZCkvUPjFzX/8/UCnmd8NQiHwVhfhjOz6yCgBvSIHPY8AjIyJ4Z/yHhLNh74c2o027qabD5Y/gI6f/J59l9nH8iWM/yJHNimtw8AmgaZvdsokp+R2RiJROZxh6DD+DpkmWc8wBExQfO5IyNNF3RqZ7v3ZK0AZ7f52i8Onrgq/ml/lMi2Qxodwk/4K4BTtxJCmzzbPzjx9Y5/aVamXwJeqih7ABWbfHi4P+vsEKvBBD3qIsZWPvFxRTa6b182O9LjI4ZRrAXh2qamU/7a1SZEzkJe7leurqiJNPQfJT4aF+l100NBy47lH60cJbxuQkGJEerddjR4NGXLrWUK74e6RDnpNFn27qq/5cw9uHJ6Rg67CAunhRkb3WtkydLRAQ+/AiMvHHd5qE4cotMZFRrm++i8mtFSOF8TQUQLY6+xF0ceWr1xZjZ0U4K/ubXd1OGP1U83HF/DVY+9ug+1FYA6txHTjQqlm9MbSeDKlTUrVh34RlVaZBPF6F3FBOokFMaU4kSV++sqF+BcpVtz1edqqeQhMvyYAhBvx8YiacmbGPLyxXGPb5YNKQ05DKidcpG2ZBp0fCM1xXURfiKZUZWt4tFsNL+BX02c/I4JsCyHXsKxMpobbxH4gJ5DbAcJDqR74zOU0f+rnvOOOIJCIUhfKT/aAfadIg3V7BrjuemG+RDyg8fjhe8EZz1Z0hT0IoJ8HbGtmwXCNjCnQgDSoWSoBqTVsLnRZ6FGLlm/Spm/3Bld1PiYZ7iSW7MzbhcFGPTVcwJUPQx4puDEwEhZYMYeAkTh1KWTNfaCukAGFckLiYI7xwjH9devLNruOh0HLdRzrSOe+OYG4SIjrT8PPepeHqGpY61N7Qg4iHyAj6u8Q9N2a4HcH9i4HVzP74Lq2hqBFJQVhrNFVTj13HG27VD0WXToB3NnPu6yjp/5bQL4gEsjRB3r2VYd1mbY X-Microsoft-Antispam-Message-Info: H720jYtFKIKL9qrkgVboa1Qbrq/KZIAYYBjhIn2tLnHrNKg7anRl8YPp1agCmkQEXaVDe2tGo1lk1L5AO6pIOhIGJGkwdqA/45QpG2dv76A+104VWJjsCvb106e7en+CGlgw8nh/ekqImgBykkygDWqkdo7vIeo7saIzmpC6G36LAZMhvkzGQ6epkgUTtsObDCm5C0frU7JCTQeUaDv3stMc9gKcvxBqth1DMzKOLfSRjI+coNnZlyyliNwKyGDrJX9148KfrM/s5ocpLXZJuX24bSLbyzGdoICGjkGNcjrOTtrV0K/vEos71BRFeF4EM/iyKrLScUodT9QNZWMnYNOiTWGAZC/d6rTcgJiQuPA= X-Microsoft-Exchange-Diagnostics: 1;DM6PR07MB4668;6:FyZr6W0HkvY3faaiNcWIFO0nZ9p07hhSbSejbt4h9UrzHsPypjSwKRxNnzIsqjLnWB69N7rseJLwozeknsW2iG5m0LrokWCLKJUNFsR83maB5ingW/KglcSdqQkHglxeubNWRfkuRDQkwZrccOYoJEYUjRdJeVUQggMpl8zU2ujSMCW6mCJWRrwMlzU4l5x4kUu4ZZZKhPBtI6jSiEydRwXQYzvp6jkdxtm4eNb2x9LRvZuN03qYA4TYWSe12k4CU0/0Zb82wYMNSMjQyzVykad7IAFclZIs+J6WeTXBf+5DtmUpdnwA081DI8G5qQ09M8pfOGayhybrrZ4lHmLz7T2khkFvoPssI6aAMj1SNZFWcAEbOETQwK0vxVSMiIIm7SyW3ewkKL8rvyO3pQXJYCLroRDxoNv0Pt7Wx1Rzrj3EK7ihuN0+gVqwikFzvfGlwZF4pWjgK4pWtZmqvFs+7g==;5:TYiZhZA+Ko5ltWWqQyDlGsIEvyMbS7lvAWFJqerNjn9oILqoM6hUA+n0agJc4U7FMER++JiNKgFLONLc9wPptSRyejmL80O5TxiWwMRsBjkn9ZKwfGJg5Cfo+kstE/eN16gIkpUfJ/duNz3SGWv15oGPu/7IsWr6Rpq2ur5y8Gk=;7:NcOwUtaluscqVDjDDEVbRZKpGeXnTL9f89fFDfG1BeZo0tDQHv9MK/WkAks1YFoOlAeY2N02lNp3S/xhuj2DR9kDIF0gIYkxSIrtqkCCDanaLytLLwofGqf5rHMpXnuHHBcglKadTQKpq4rLMXoA37CrMRNvkJBAQWkRxdgDeqT/WniBZEPeGIWkCgleoF2Kbag1SwPtHH62ZymzI75hCEikNWedEVA4Vh3eb4a3fSTWnlVJMAVJ4zEWwjvYN4Wb SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Sep 2018 17:18:33.2601 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4a695c7d-2441-4377-28d5-08d6180a9a2e 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: DM6PR07MB4668 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: Quinn Tran Abort IOCB request can take up to 40s or 2 ABTS timeout. We will wait for ABTS response for 20s. On a timeout, second ABTS can go out with another 20s timeout. On 2nd ABTS timeout FW will automatically do Logout. Signed-off-by: Quinn Tran Signed-off-by: Himanshu Madhani --- drivers/scsi/qla2xxx/qla_init.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c index cb2538a91f4c..096743331ec4 100644 --- a/drivers/scsi/qla2xxx/qla_init.c +++ b/drivers/scsi/qla2xxx/qla_init.c @@ -1830,7 +1830,8 @@ qla24xx_async_abort_cmd(srb_t *cmd_sp, bool wait) abt_iocb->timeout = qla24xx_abort_iocb_timeout; init_completion(&abt_iocb->u.abt.comp); - qla2x00_init_timer(sp, qla2x00_get_async_timeout(vha)); + /* FW can send 2 x ABTS's timeout/20s */ + qla2x00_init_timer(sp, 42); abt_iocb->u.abt.cmd_hndl = cmd_sp->handle; abt_iocb->u.abt.req_que_no = cpu_to_le16(cmd_sp->qpair->req->id); From patchwork Tue Sep 11 17:18:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Madhani, Himanshu" X-Patchwork-Id: 10595995 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B116F14E5 for ; Tue, 11 Sep 2018 17:18:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 93AF029B1F for ; Tue, 11 Sep 2018 17:18:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8768129B23; Tue, 11 Sep 2018 17:18:38 +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=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,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 26BE929B20 for ; Tue, 11 Sep 2018 17:18:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727764AbeIKWSy (ORCPT ); Tue, 11 Sep 2018 18:18:54 -0400 Received: from mail-eopbgr700053.outbound.protection.outlook.com ([40.107.70.53]:29957 "EHLO NAM04-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726782AbeIKWSy (ORCPT ); Tue, 11 Sep 2018 18:18:54 -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:X-MS-Exchange-SenderADCheck; bh=MJjcW3f5ezibDHvCPZr6DofNiFFi6CtORRJkLTz7+p8=; b=OEefv3wMeWSo+OINDAu9Z/H0XEWrECy0k5KG7cG5zMKoFLvzVkW6+LlvlA5vpl6UGJslWrHRFlpTTTWtNgC+p+emMf3g2Ih0XZ/FIKAbyBMrZMi9dzpss2Vk90WnjvoUr0C6WOIX8IdxM1UpmVHHaNzOY9ypkSCmafo0xRVC+98= Received: from DM6PR07CA0033.namprd07.prod.outlook.com (2603:10b6:5:94::46) by BN7PR07MB4659.namprd07.prod.outlook.com (2603:10b6:406:f1::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1122.16; Tue, 11 Sep 2018 17:18:34 +0000 Received: from CO1NAM05FT061.eop-nam05.prod.protection.outlook.com (2a01:111:f400:7e50::206) by DM6PR07CA0033.outlook.office365.com (2603:10b6:5:94::46) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1122.17 via Frontend Transport; Tue, 11 Sep 2018 17:18:34 +0000 Authentication-Results: spf=pass (sender IP is 50.232.66.26) smtp.mailfrom=cavium.com; vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=bestguesspass action=none header.from=cavium.com; Received-SPF: Pass (protection.outlook.com: domain of cavium.com designates 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 CO1NAM05FT061.mail.protection.outlook.com (10.152.96.179) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.20.1164.5 via Frontend Transport; Tue, 11 Sep 2018 17:18:34 +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, 11 Sep 2018 10:18:29 -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 w8BHISA5029063; Tue, 11 Sep 2018 10:18:28 -0700 Received: (from root@localhost) by dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id w8BHISOs029062; Tue, 11 Sep 2018 10:18:28 -0700 From: Himanshu Madhani To: , CC: , Subject: [PATCH 03/16] qla2xxx: Check for Register disconnect Date: Tue, 11 Sep 2018 10:18:14 -0700 Message-ID: <20180911171827.29016-4-himanshu.madhani@cavium.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20180911171827.29016-1-himanshu.madhani@cavium.com> References: <20180911171827.29016-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)(136003)(396003)(376002)(39860400002)(346002)(2980300002)(438002)(189003)(199004)(2616005)(81156014)(47776003)(50466002)(48376002)(305945005)(8936002)(8676002)(356003)(36756003)(50226002)(6666003)(106466001)(69596002)(80596001)(81166006)(5660300001)(316002)(76176011)(42186006)(486006)(26005)(86362001)(72206003)(16586007)(2906002)(186003)(51416003)(4326008)(446003)(1076002)(126002)(11346002)(476003)(478600001)(87636003)(336012)(106002)(44832011)(110136005)(54906003);DIR:OUT;SFP:1101;SCL:1;SRVR:BN7PR07MB4659;H:CAEXCH02.caveonetworks.com;FPR:;SPF:Pass;LANG:en;PTR:50-232-66-26-static.hfc.comcastbusiness.net;MX:1;A:1; X-Microsoft-Exchange-Diagnostics: 1;CO1NAM05FT061;1:LFhb58V0J+Anrjm/6Wu/hxeWwuXG0UtQUL815kwdONqDGdY6bYLqZT2WLncQTw6Hd9r/LZPV92IMRgZjVREIFD9GFCbfJ5Hj1690EdNDdxg2QoRMgnKEIMgRNG3PrD3M X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 59558c7f-d3d1-47b3-8554-08d6180a9aac X-Microsoft-Antispam: BCL:0;PCL:0;RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(4608076)(2017052603328)(7153060);SRVR:BN7PR07MB4659; X-Microsoft-Exchange-Diagnostics: 1;BN7PR07MB4659;3:5XubcTmkuCjnHkhHdwua5BeB5rjOw4thhIu7CSvcMxUGHs/D9jMqCaEp95l8541Se4HyLwBvVKEvAqkQieIrQr0oPmgDG+XYeS1ik+mHkya2VngEOz3zmqpWzj15x2d4gv2lvMC//Knlr8BdO6NfCuCLhjaVzgmtGBPo4lHH9wr09P2RvrzV1OKn4WcKAbh9vZyZ470gUwzpml8ktu8L4bOrq/ZFNZJCF4ye9litREETnmHFsMEtdULEl3bU6rNzNa7S+6jvrByioXsBC+N1ieZdPcrEOSNIoNvakzgH4OHcOb9NoWgLMG6AbKFDIeC2r+djpWB4oXlVS1br2RXQUxKLRp7X53FHRv8bR0MoSFw=;25:fNjXGOLbIweQIk+W4RQHk+VoyOvaZYnAfHed2mfdE7YZzd2bJPH94UU7gc4rnCAnaAAAmNExpT6HsSzJbyCj2V4uB0VPN2Lyh4a6av+kZpQwYHKSYMwuzGBJBs2tjwZXDpfm6wozYEimlbJg3yPrfiPcO/5iNUTR4Lpw/N2bLhZtnNAiOJrUKyFLt9Q6QfBrTrUBFOLWqW2+x/iV+jyKReYdlv94xyXRCuI7ACFuHR2Xf0VdTIPPk2xaayiT93UH4tW0vcWMvXAXaNMFUPKRsldsR5itrwHJS/x18VRrjpWuMSCAJdipXn4q1gj4cg+Ecxku0qrDfmN8QzcQ2DQ1Tg== X-MS-TrafficTypeDiagnostic: BN7PR07MB4659: X-Microsoft-Exchange-Diagnostics: 1;BN7PR07MB4659;31:CBtoRH/cgWqNUxrQVQpjEutM6Yfs9zdFTy9SOhNnFH/SRsv3+HV4lYXX4TiMEJ7xBtgPpnLvCzhMRHHejzYF8vjl6Ffo3ruyWjxknmEZkkiRGlqWymQbej4QxdLSO0C6V9jtWnCfhRX716mP7HsyJjtjFBEDD2ythB/VyTmxT4ISRFAvvYCVjYbnjG0Gkj0OtDYNt4fqSv58U8iYJE/3l6P21QxtoyV0rWkLgH9LM/s=;20:yQwqkvXF7r3Pg83YHJ48CD1aOcYRByEpEZEWtFCq3qcpuOctCOS6VPV4BPkikrQ83SOkT3eMv57jGO10o2mXUj/55MLxXRpRsGLf4/L0FwY0yhtjuUnWTnozW3GN11zRGvHu99YFKBl2caZ+X9nvin6XMxk14TzEWQbppJUMV1wk+gj8stTBdqW8t4JgVzfRb9WGcGGFAlUn7osVX8ArMfA37o1IMxfOibaRFpvg+G3qpKoerXVpPRg4O7//XcFrw5sumGIp+BGahmPU55liA5Use4Z12B4WmWb7istxpsPEczUlBoyUDEZEeDIYVcF11Y41619MB6ZW/yHbpgr+ibFVW3JhfOp72TTeZgTO2V5+bY6yBUxaurLXmVe6k3S3Ee6agGSCPn9D4j+mGLmae7gSXFdNGBhtZAIk7TKMdCQ3wRzJVpymUeUz2U0zneR6f+YfmWZAO88R/uMLOps+2H6oLbyV+UuvxGDw06+eHSJ4vh9KdbhkhRIHPRm6/eSt X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(93006095)(93004095)(3231311)(944501410)(52105095)(3002001)(10201501046)(149027)(150027)(6041310)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123558120)(201708071742011)(7699050);SRVR:BN7PR07MB4659;BCL:0;PCL:0;RULEID:;SRVR:BN7PR07MB4659; X-Microsoft-Exchange-Diagnostics: 1;BN7PR07MB4659;4:zt+S8Hr8RDOhczOC/PnONLnXfIduNEDKqsja8K517v98AQPpD5nq4gbNNm6PvwBVO3A8vRbsIlY83tenaNVKs6UWAz9AOFtu/qVwbkfmgKKeW8hPuq7eMNV4ouBEXfhRf7SljH2TGU80p9RTjKGFz0goQtgVnzhei6IMssk9QSND/o5rvj1tcJzm5BbzAVUFpZITbFjJfRHPfkFw0EWQ31vSikIOg4dnmmLN23jUMPPFvS8Oe3CvMeNlIXcXN82i098KCzzaziIgsu1UD5zfrA== X-Forefront-PRVS: 0792DBEAD0 X-Microsoft-Exchange-Diagnostics: 1;BN7PR07MB4659;23:BsjOHlzIvgpHAPN/u3+usTvbY2shOPtLGhRNZlHLTx1Lpe0tHUS3LooHwh9yPD4iEQBUyII7nl/Kg1AFKnWovkLch15Ft/R0/31TNrqjZqY4uqQWkIZyKnnWs5gYBdSGtxyQNHnw6f69o3E4ugkac740RWFdEOuyK3w4YrqScxAmDIo4VPGQwz2hzWHVfAktobJ4iQRz62ZH1jB1IfDDZGzzA0OmhtclIVedw4ikcDmTh/pk7SFea2cb1O69UFoWqL9DGshJIg3cKHt4sSDTrWbCDKt4EB6udIFp3kh/O2wuTC2Z8EYvjgemtJFU/BxaCuUdrHG6/VYgt+Z3VMpagVgi2YSz7MOKXwWfitQG4G3RJi7oV1bJKgw4Wk294DcHDGJ9HewDX1ycBt4li5oi3ycC2wJgA5EFSIosgfopcCCVY65jm3Aedf08eR8SP99lYS3t4MSxAFrSzKh48O0CltBGS3y+V5XR8qvXBqQEaQLM1eqslk1wzRy4qs08xnA1VPB2g9jIIs3Hu5ToEkCr/VjIBqPIVd+VoLgTQsb4pVLaS79FRY+szUUlWXfq/xvv/KyZ47mLDS9JfpsTrGxGSJ01M4cYYnUvy+cmENVYBiFJBktgInU1bu8BdMkTtPa5wBcj8I2FT88dIGd8w95csIB+qru03seLp244uKCu8+0Ga72Po3rkBlDC/qbQGyIQWo6olzs8T55bwUavH+mk16S+wySTV2hrjbX+lMlU+ec/ZsopZ9M6/vJ0ktk5DE8gOS+4kcsbOI5D3vwQbG73PByi9Iz29JtN/BFX1giD3RZ9svNHmG0mSSRc0EArgeuVoQZ0xz8xWbt0xwAF/55PpR3EILV2iXFYhtJUz2J353emsl+F24iygyMYmrYyTR6hjBIhR/H6lF8PxgDIXSJUNH/ER0ldWNPNf6tBICNXMaRf/jEy71huDQivCqA0yJZCOnNjTsPPzBfiTF6RJ5JD9CzGpqILF6M/qwopyK9bdcnqDRcN1VvyE5hXSib1k5X6yYWwm4v/0s3ZjWk/UEfH7RHk3N0VPu6TvbleyVKDeRPQF3AHpEN4VpU9KHcXpyw4yjz/NavMrJVSgKzjPeEpHnIqmdkoi66R3MKYn0fxcjg= X-Microsoft-Antispam-Message-Info: q0BaWGKl4+cPWIyyF9awX9CXDScW1cc7ZxGF6TnNJqg3BDcIBGOm6QopeQIEWpyQgywhEsUGeWaij8oOhpW4vlETveIqFblJ85a42skJz0q6gGvwEykKz1DAe/8E+HnrDWralvglPb6pYqip225TETtVbNs+GSSEaNSRoM6iMC+6KQzC6S29F+h0tJowCwBjXuANNTvPXFvr9eg02PVgCoctB+ZgEmDMkoq8caq2AKx8TZMFlTqpUAp6ZsD3cynO2wDZWSthoUnazysxSniERFwMDwgm1dKn3zc/kCRNA9Jh0jY54RioNCP1JiiwBn2fj4eABLHdVZk6lCyi0LoWOB4OnI+AlfauAf3FVfeZ6dc= X-Microsoft-Exchange-Diagnostics: 1;BN7PR07MB4659;6:OSCdcpqCR2X6Ekq9dk5h8tTy6fhmBwFsIGQOjZWYChxhz6dvgXgXJCK6Ipsgq251QhRo1Pm4rHRDAXNeqP0L5ZqWhXfXoCBBqgOPRzcZPVMB7b3hj3dKsAJOAkZGXo7sWiQCyyFpvtVAnmDbL4v8A6gysj5YvTx19+bQ8eIlZV1/zVEFG+4xM2bcntwkOEJRmLiYMV8sLm42jUFe5l0UUWwmLXUKJK1btD5XWjafH/OvNRMCzhpaOo4Trb2T1KtVgUqkc+aGULYicQV4FTMS3yl4UZgu0xrbNAlgePokuXVMJeUl+ueV/N4ZyBZH+poEmcZqWyb6hlyvWUbAUjvdz/N9qICUt9xiF/sMhIKDJcNc4d5RGWYqUnVWO7Qk7JXi9ZvJUkqwqjZzQGsjFORMXNjTqGZIbWZK1mn/sMm1aqQFp6IslLqgYYQK/7BmG1TZebCmiWqXQfP/kAvPfj3eoQ==;5:Um1UBbjqdqVVi+DqAcF3LfzYxT8qKvVR2kpqBwOpQ6mski+a+VNh5oqBaVKJzl1v6p8uT6UG4qqagajT83whprZPSSjPZmISuyrg7RrMU3WP/FDZWn5diHlObI3VuJSBx5JSCwZjGkI4+3FqDpISvoanpeCBR1pk4ZDW9vFsfjE=;7:6eMy0g3F0XgIdTIAAgcX1N/WqrOJse5eP21j3AHMX27KjH9d0s4LMpnNxbI7AdjIyxt1RaBSGrvRxI9uVD8EdiT8KwRopOFAqO+aCGsjY22srb+nwwWiuA1LYmlpPCY+2aczmsWUVkJnsOOa+s7Jy9SEfGUwwP22ysEtFIyybM0MBobOKgEyQpSiaeYoaBBN3PnJ8uvZENv5cH+yP1GhQ5Wkq7y9YBTysqOFNXKzkjntxNYlcGsxCXrIBgcDP9dW SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Sep 2018 17:18:34.0741 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 59558c7f-d3d1-47b3-8554-08d6180a9aac 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: BN7PR07MB4659 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: Sawan Chandak During adapter shutdown process check for register disconnect before proceeding to call PCI functions. Signed-off-by: Sawan Chandak Signed-off-by: Himanshu Madhani --- drivers/scsi/qla2xxx/qla_os.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c index 8a2ba6bb5d1b..3befe11d6425 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c @@ -1783,6 +1783,7 @@ __qla2x00_abort_all_cmds(struct qla_qpair *qp, int res) !ha->flags.eeh_busy && (!test_bit(ABORT_ISP_ACTIVE, &vha->dpc_flags)) && + !qla2x00_isp_reg_stat(ha) && (sp->type == SRB_SCSI_CMD)) { /* * Don't abort commands in adapter From patchwork Tue Sep 11 17:18:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Madhani, Himanshu" X-Patchwork-Id: 10596013 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9E42214F9 for ; Tue, 11 Sep 2018 17:18:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7E7B029B1F for ; Tue, 11 Sep 2018 17:18:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7306B29B23; Tue, 11 Sep 2018 17:18:54 +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=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,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 0EF4729B1F for ; Tue, 11 Sep 2018 17:18:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728145AbeIKWTK (ORCPT ); Tue, 11 Sep 2018 18:19:10 -0400 Received: from mail-by2nam01on0068.outbound.protection.outlook.com ([104.47.34.68]:60355 "EHLO NAM01-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727419AbeIKWTK (ORCPT ); Tue, 11 Sep 2018 18:19:10 -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:X-MS-Exchange-SenderADCheck; bh=fw1sSfvLLIfa0dqSHmiMmRDSfqF0CVhn8VrDH82o4uM=; b=fmfjWl6xpbYp/BLVuKDO10oudM9FL1cI0ysEG9UzpWJvrtPoinvEMNLDNtQ+16CKySy2UXuS/fRcdnEhm9K6185HBCU6eX4uMrhG+hy5/4vDQuqOjwRWOwx3Wlry+ri2MQ94JKSl1m3KJA87chOLkb0Dd2lwJiiRpdq5w+5iKx0= Received: from DM6PR07CA0033.namprd07.prod.outlook.com (2603:10b6:5:94::46) by SN6PR07MB4400.namprd07.prod.outlook.com (2603:10b6:805:58::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1122.18; Tue, 11 Sep 2018 17:18:35 +0000 Received: from CO1NAM05FT061.eop-nam05.prod.protection.outlook.com (2a01:111:f400:7e50::206) by DM6PR07CA0033.outlook.office365.com (2603:10b6:5:94::46) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1122.17 via Frontend Transport; Tue, 11 Sep 2018 17:18:35 +0000 Authentication-Results: spf=pass (sender IP is 50.232.66.26) smtp.mailfrom=cavium.com; vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=bestguesspass action=none header.from=cavium.com; Received-SPF: Pass (protection.outlook.com: domain of cavium.com designates 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 CO1NAM05FT061.mail.protection.outlook.com (10.152.96.179) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.20.1164.5 via Frontend Transport; Tue, 11 Sep 2018 17:18:35 +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, 11 Sep 2018 10:18:29 -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 w8BHISk1029067; Tue, 11 Sep 2018 10:18:28 -0700 Received: (from root@localhost) by dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id w8BHISoY029066; Tue, 11 Sep 2018 10:18:28 -0700 From: Himanshu Madhani To: , CC: , Subject: [PATCH 04/16] qla2xxx: Fix port speed display on chip reset Date: Tue, 11 Sep 2018 10:18:15 -0700 Message-ID: <20180911171827.29016-5-himanshu.madhani@cavium.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20180911171827.29016-1-himanshu.madhani@cavium.com> References: <20180911171827.29016-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)(396003)(136003)(346002)(2980300002)(438002)(199004)(189003)(305945005)(478600001)(26005)(186003)(36756003)(486006)(87636003)(72206003)(8936002)(81156014)(2906002)(50226002)(81166006)(1076002)(446003)(50466002)(126002)(106466001)(76176011)(51416003)(2616005)(476003)(11346002)(47776003)(336012)(8676002)(6666003)(69596002)(86362001)(106002)(80596001)(48376002)(44832011)(356003)(110136005)(16586007)(42186006)(54906003)(4326008)(316002)(5660300001);DIR:OUT;SFP:1101;SCL:1;SRVR:SN6PR07MB4400;H:CAEXCH02.caveonetworks.com;FPR:;SPF:Pass;LANG:en;PTR:50-232-66-26-static.hfc.comcastbusiness.net;A:1;MX:1; X-Microsoft-Exchange-Diagnostics: 1;CO1NAM05FT061;1:f9+1Q3Ldw7K1vN3vx6PvMZVU8fZkUXZJRoMMTpNWAMGJhEHdvOD+xVVibXP8fMR+MsG6b+yvA45RyOhWAvUfRZxh9GNu6MutiaA8bBIOiW90ei0/glZ1CNpyC6Dpp18C X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: bdd58789-adcf-4bf0-427f-08d6180a9b4c X-Microsoft-Antispam: BCL:0;PCL:0;RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(4608076)(2017052603328)(7153060);SRVR:SN6PR07MB4400; X-Microsoft-Exchange-Diagnostics: 1;SN6PR07MB4400;3:/D94anv0lsiIB/sOAh9cvMqlGdn1U0psLE7hGFZ22EZykIqktQw0ixdL7zYPOzWnZhslhns6GzffXldySrXenHOjEp07DxBdXYbgadDjxQ6S+YNSIUX3QXmjSe7psjZwP3L8FRVCMsGmNEPMWMe4Domr2xoMm347v4nxF9Ns9Wvj90dQMDVQPboMS2pyOH0UBMMLNNFbSPgllnYIqQOdLBu54WYDYgYrotW9Y8w3xJmFWIWT1r59rN4r+0jcXu5Q6/sHql6me5yTRvcoYvHujQY09ANQJch22UccvFXKhocLeLAtJzBfEh3dlk2dhc2zqO/anLfy4wAp9vk8BSZ4wgCcE6RjK34JEOo+7AJWkvA=;25:L7bTf0y2LlRxm4wxLDOTRVTAHJdsCdzs+pX0QingB4aSNpvxXJx3Nzyp4cLlEUEVz4gtCA6BItcH2QeCbIXMvJDgWQTM5STZ8GFqk4SCeHuR8u5M8dihsDxQWaV+9mkW1Zj5WgdasMiajL0QvlVIaxuABV1p+BmCEJdZcp2L3uxJTjt7PyvNsLF9WsEg8KsysHADuDyxFtKCajycMykqIFkAs0/rMVIU5QWEwZ3L5p6GwyF3G/SrRb8nxZf0uIFIvTNUC1i0TfwNTKdxGaQ4jCDSK26qfgq76twBJ1r76Bg84c16aRgnKam0dHNS0v/p80+XHP4d+bsOSYSNXmaKYw== X-MS-TrafficTypeDiagnostic: SN6PR07MB4400: X-Microsoft-Exchange-Diagnostics: 1;SN6PR07MB4400;31:TTsB/ut8axl644RWS/l0lwRdeBXZVa9515TfhFsq9TeQlRUfSk9rDFqo0G5GXC6cYRtJlBA7xK+N9EQPdyfpffEUzTTpkfI3yoF+u5QVtJq6Fzi5BGmbPps/Z1NFGDECuHSKajN4rkg+Q0DBqUgbzXnJNFhxY2d2tZJl3ANlKmz4DggwIcHrw0BfPpbDV4vfQt/M11jQ/2DgGPmZTBXN2RZw2Xm224oZXa6VAHqDZR8=;20:s/NC4/I6MJBXf8KamspWktHnHRvMgD613vbwvmD+xb8K9ICTuuCNW4ffOpQtmzmGi/aHIPE+4WqSYRH/yX1ze+OrvWqZRy1qcVKyVkTriMQeu2rqaUp7nujU/IoZPD9knzCmdCda7bH0EVQMP22eWF+uEXrOsCWy/g3CZBPptc9Vy3Pu4OoZ/BIJNIUiO5e0Itdf33QoS8t3jzcTI4pMHDnMxqhI4z1tWQLCwqppy4gfzvdVTpQ5EE1kJMy2R6ti/TBgxbtojc4Mkvk1kni8+DcbOoS0cXhecRxlAxa5XUcNgLAzj9tQvNiotlzl0bUh5BcjbH73QdwDN7Eqym6xz+XqGTwoAjITq+1H0M5HcgSYUzP5W8ejAQVxUdVJ2uvLoAhX3X0O9FHV73Tfq2WpFI63M1ygUnUs+h/6Dksqwg1ANz2y9uYyViR66JfDiE/gsLQ0AbiPc6pu6ZtMgrMZlXcbQEdoV3aY5yui0wyIb1rUpLfTpPgQBM2O+P4VwRlp X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3231311)(944501410)(52105095)(10201501046)(93006095)(93004095)(3002001)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123564045)(20161123558120)(20161123562045)(201708071742011)(7699050);SRVR:SN6PR07MB4400;BCL:0;PCL:0;RULEID:;SRVR:SN6PR07MB4400; X-Microsoft-Exchange-Diagnostics: 1;SN6PR07MB4400;4:iceUxgHlPUvr2yfLlLLg4x3KDUlTs17SYebJF8UyTL/Eqo9TuMQcLD65r7sMFKeK6fgWzhHyE51Xjz1yNVblg2UZ26Zfl01HVjJ8BtG7lmbAGZT8jBWxysK//TyfvoDvTeMjIMnJO50Vu4c3p9QphmcVy30Fg07Ahzlx2A5RNsu04B42YFlZwvcjUuXuC+ICKXo4OQo8yBRfaGmcBdxaWXZj2k2mPAHlPht8PbbXgrgWC7RYfqHgEO4WaHQsfSwVU6mlQfm439k/rdqWkwsQag== X-Forefront-PRVS: 0792DBEAD0 X-Microsoft-Exchange-Diagnostics: 1;SN6PR07MB4400;23:hytqy1MvzL3ghWwQIj2fGMAP1XWHTkFcllFP8IQoZxiZM/KWpanhD8VBEC1wyqOkbpiarbZDur9aA55AoJarIyu06o4R/VDAnM/qNNYKRo46sH8htdXCoOeQtKc9cq0LfS711z1jUI9wdMapL/eQVnXAyIoPDSG0Dig/AzBFF/KW96xDO8dMqe0dOR43wIqFzP6caW4DbjUmhrX6zPGTtliGooep5qJHdqrCRen/hYRPyUvv1elkzNRz7L2URrd3HZ2cd6KgMStP4QTGiIk2Obzzk1tqf6j2idLPDdS9WfcWX3UDxU+znBwZr8AVUWexkrVxx6M1g+kBBMvKcAnboyLYmohDxaSglYRJXLZqRTkVRx1qfSY/yZSq5scLTdJq3tQnCSNqrfxLhVTuEc5+VMFBB49UGA9WQ5rhY334PHBw+TSoIhqYDgI2MJStNqNq9OzCN/Gv7fV55KXwnaLR2K4imv6lPEhPH+jZrIwhO9BZClK71FPJPJxoRIDW0ac85Xg+QjWYtJa4GfL9OsJ2pZ+qeoQ6xuynuLjrTzffGby05eKC37UiHgPu4zqc0TgFm4h1G3JxSMJSVgvnfxlUDZ1FVbSVFjfX7YvVxKFISCChIIukY9n30+R82LrzMD+x/CfRszGq76cvrOMqjRxrEc0cgVIAfzHro6nBkYaeuCqCPXwHLe5EPW1/LtT61eP8UWDAR9AE+GJiWQq6rbGUxJeaay4k7ge8OUS6WB9zMimcyOgxs/1oh7jEquupL3ZTfeLnphH+ITwyMX8IhvpWodqMTQQKP761wu3EPP9twZLIMSDXfOtX+NoMxwzHZs76w0IP9/oi1+itaz3AjLKG0SRay+cQLSIsxRe4C/sjaez5nWMK7iIh2ambx3HMogF71/wD8s3bH6k3b1NIdswzHctqCidaJheV+W6SMDPAydByyOdtY38PLbvsBZbVuCWrTCZ/VvN5UTkhK2mDcD6u0NzCgIqlXJ7WhHR2CvGTMcmoj2/zFQosDlm3VDRuwFn6JSEKvbOsqYfJ/K8X4vqSxqPM5qLaY0xDfKO8V2fN66vSiPgqCtzzcYLMenkEnNIC47gbhI+pkHQnsIT1wFLJgzZsS7fIFDfBofCc2Sgk8u4= X-Microsoft-Antispam-Message-Info: arNvLcsxS0UPu+ZrzVFXKvd+AKodQDSX3i6GmfokRLoMLPCDoIqQtgqwYZl6YqX6UUYW04b0xpqPyOGFowZC4sbY8BAjJqXzgC85DDjM0eUWwEntFvvzznJP/I6bUFp+IREYDZHEsG/+bbxr2+FOIPbeoKixhLGsbAHWmDQ/om0lewsScJInMck5agH1Q0rgbIN2ihwhu6k3tk1bP/ZdGVum3JAT2UYmk/VKfwr0yTM7spomQKu2QMMUu8N776kO8jSF24WGjHg8+AK67BmCBRk/YKhG19eSUxnIECNyV+vTq/vtawab097xrFz3jgKdvm3sBnD1FUFTBQhMPBeh6nwj7D5hp/N4S7MmXI3pLgI= X-Microsoft-Exchange-Diagnostics: 1;SN6PR07MB4400;6:PTQz5m9trSTElq9a+r9Qdg2hShg8XKP7vFLTjd79EQ5E6Rk029f5DRZG87lxiMuUvGshtMd6KdmvlzFSVG1JhYcaTOvinMrozRUa7fKYYdPPMoQsmCNiwZJfGuY77zAWmqSX0ceSWE+zIQrjwWwMeEYlXB7XGfBf97WFXi7UDXXhOfq4PNKOnbtwpBUhaFyHnGKn1vthW0z/fWoSCqgApy6X6CZ6DG6dAwVLxKxXiYGmkzXfSS2yLYB2v1yAPPeMmFZGYAFJFeEEUdoT47TkrpaA9q9rL1vqaJQu1bTQkkBVkfW7LGlt82+CbyBzpnOjlij8xbh6a2KBuw3sba4aswiPGHfjh3VoCsVgsv0TgCGDv4zDl3qHe+QOZIGA0XdzsWVSkfwnQFPWYLU5acWHijvRTqy9VIE+6R5LT5A9NwJ5swgVxkP3wad/w/ZAwhHg1ICjnDeMWMFtBAIDMaK+FQ==;5:1FlybioiXX4NavGwqDiN64tItYZB0SbLrZcVGfCgYn7AydfrnEFCHucFr/LciAuopRiknqwJhtnOYmEhCnEeyCJFaTyPCMy6sFYfjhMSW03MHAshhkG1bwlSiTfvd6P7wRCMQO50948zFdbUYo30enjeAgXK0uBqfz6PGlpVx0M=;7:L9ngE0jcV7eU3v+bHlqj6ofG+a+P7TK+51N3wQLuZf3Jtzh+yP9I6GT9kJMkccIVKj4PiZ5FkUBX2qlrYGQ9+dMJZFzeDvgXxEu3bh9Jh4VNHhnUFCC8+YsKyr3IR5IdrqhJ/c+iUBf1d5QGdgN3o6FYVgo+KlfN7QBN3k5cSfOkvpu3bHg1/JuBUKiyU+VW/aBcGHNPLfqwgNSK47XhMb5yHlbR1GrKk4ll3jrz41YPB8diAaL6HsL8RPb3kIe3 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Sep 2018 17:18:35.1209 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: bdd58789-adcf-4bf0-427f-08d6180a9b4c 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: SN6PR07MB4400 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: Quinn Tran Clear port speed value on chip reset. Signed-off-by: Quinn Tran Signed-off-by: Himanshu Madhani --- drivers/scsi/qla2xxx/qla_init.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c index 096743331ec4..4d04603dd4ae 100644 --- a/drivers/scsi/qla2xxx/qla_init.c +++ b/drivers/scsi/qla2xxx/qla_init.c @@ -6560,6 +6560,7 @@ qla2x00_abort_isp_cleanup(scsi_qla_host_t *vha) if (!(IS_P3P_TYPE(ha))) ha->isp_ops->reset_chip(vha); + ha->link_data_rate = PORT_SPEED_UNKNOWN; SAVE_TOPO(ha); ha->flags.rida_fmt2 = 0; ha->flags.n2n_ae = 0; From patchwork Tue Sep 11 17:18:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Madhani, Himanshu" X-Patchwork-Id: 10595997 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D48D5920 for ; Tue, 11 Sep 2018 17:18:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B760429B1F for ; Tue, 11 Sep 2018 17:18:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AB9AA29B23; Tue, 11 Sep 2018 17:18:39 +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=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,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 42E8B29B1F for ; Tue, 11 Sep 2018 17:18:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727860AbeIKWSz (ORCPT ); Tue, 11 Sep 2018 18:18:55 -0400 Received: from mail-eopbgr710088.outbound.protection.outlook.com ([40.107.71.88]:7066 "EHLO NAM05-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727751AbeIKWSz (ORCPT ); Tue, 11 Sep 2018 18:18:55 -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:X-MS-Exchange-SenderADCheck; bh=dU9Z45NJXXFkbNRt+i6HF+ujDwo7nFSI5iMkjrOowoc=; b=AoNU4QGi2q0IWOUNxgxCUSnNsa2mniXa5AZ8enLERPPvCy01ghSLHRNEZj+QgRIGvLiq/DhHIIlO6zAc0CGfylSlW6niRfZnFbw44gyoRErTsrEz8yzQTXa03XUmsZBhlhKcpkK9ZZcMNSIwj2jFnD28fvVjZ24Z+NYOjQG7RYg= Received: from DM6PR07CA0033.namprd07.prod.outlook.com (2603:10b6:5:94::46) by DM6PR07MB4395.namprd07.prod.outlook.com (2603:10b6:5:bf::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1122.17; Tue, 11 Sep 2018 17:18:36 +0000 Received: from CO1NAM05FT061.eop-nam05.prod.protection.outlook.com (2a01:111:f400:7e50::206) by DM6PR07CA0033.outlook.office365.com (2603:10b6:5:94::46) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1122.17 via Frontend Transport; Tue, 11 Sep 2018 17:18:36 +0000 Authentication-Results: spf=pass (sender IP is 50.232.66.26) smtp.mailfrom=cavium.com; vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=bestguesspass action=none header.from=cavium.com; Received-SPF: Pass (protection.outlook.com: domain of cavium.com designates 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 CO1NAM05FT061.mail.protection.outlook.com (10.152.96.179) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.20.1164.5 via Frontend Transport; Tue, 11 Sep 2018 17:18:36 +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, 11 Sep 2018 10:18:29 -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 w8BHISg8029071; Tue, 11 Sep 2018 10:18:28 -0700 Received: (from root@localhost) by dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id w8BHISZt029070; Tue, 11 Sep 2018 10:18:28 -0700 From: Himanshu Madhani To: , CC: , Subject: [PATCH 05/16] qla2xxx: Fix dropped srb resource. Date: Tue, 11 Sep 2018 10:18:16 -0700 Message-ID: <20180911171827.29016-6-himanshu.madhani@cavium.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20180911171827.29016-1-himanshu.madhani@cavium.com> References: <20180911171827.29016-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)(346002)(136003)(39860400002)(376002)(396003)(2980300002)(438002)(199004)(189003)(305945005)(86362001)(36756003)(47776003)(478600001)(87636003)(72206003)(2906002)(106466001)(14444005)(1076002)(8676002)(356003)(110136005)(486006)(476003)(26005)(8936002)(44832011)(2616005)(50466002)(42186006)(48376002)(316002)(336012)(4326008)(11346002)(126002)(186003)(106002)(6666003)(81156014)(69596002)(80596001)(81166006)(5660300001)(51416003)(76176011)(50226002)(16586007)(54906003)(446003);DIR:OUT;SFP:1101;SCL:1;SRVR:DM6PR07MB4395;H:CAEXCH02.caveonetworks.com;FPR:;SPF:Pass;LANG:en;PTR:50-232-66-26-static.hfc.comcastbusiness.net;A:1;MX:1; X-Microsoft-Exchange-Diagnostics: 1;CO1NAM05FT061;1:CNMERuF+UIWzTGkmJxtnikkSa+AZmdNApcuv7GFqfJXTQTxeF3fW8dFJ5VRBKSenKeZQOMMFatziaktk/+hazj6sgWlyG5B705D5/JKuJRgrODtUVrWFA18/zBNCs0fx X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5b5f4f89-e6fb-48c5-b6fd-08d6180a9bd6 X-Microsoft-Antispam: BCL:0;PCL:0;RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(4608076)(2017052603328)(7153060);SRVR:DM6PR07MB4395; X-Microsoft-Exchange-Diagnostics: 1;DM6PR07MB4395;3:BLCJCA7w8jdFV64BqD9xUx0kua5wahV5cZS1ynZuO/MJjG77Ilx8zOnZ0pMg3XSceBpCU/15gIQ/1kxBArRxD7Fpw+nd0vVdCNz31QITA0L54yL7j+QP8FObQ73Y2XSjknnfHub2Ut6GjvLK1MCjvOKfL43k0iH5o77hFFV0SjWEU4re6Bctulfycl6zbxLBYyQyWR37tT9UheXWwwS5J/NX7vNBW86bZU8+F+1GNxBnOYM5uSN491SHa4C5kY7sQkHqgmE8ljmBeg3q3QqjlTo7LEuedgJr1IEUgk9Xm810Ghn27cAmN9F6AAzmLPdzgU5cd0gX3ie7JYJFMvmfaGohi8v+tZRtnsoxHrMrufI=;25:NTZkUuyt+fLPkVDSx5c2WUlp3Z3Sprsj9Brks3/teFqCOldzLLNLV/R/lWNJRj26rluNqHME1UZjoAnSqJONKXtF5L7sJSPm78VVPkoad98xaI7i8+ZWm+if/j6wViUGGaLCEpmSwLAI3JYvtup+0wlwOQ6jRl6q35j8jnGEk/29PFPavxCZ0rBKHI+mU3maOowAQvfuyGsYyajWNoO+fRMbDHc7TA55Yg3X7+QlvvEoLugJRuaGsiGHieGJLo2RrIfQxxnR25eS/sNID53EnLt5AkdvxL+XOuamf/xGgIkZBRx3ik4UaGJFghmQ87qSPlXHAgxRG/vRfZKirOTRtA== X-MS-TrafficTypeDiagnostic: DM6PR07MB4395: X-Microsoft-Exchange-Diagnostics: 1;DM6PR07MB4395;31:c/GDQ7LTnW71zIuChGsguLFHhX8drFA5186jm4/EG+CN6U5/2oovRgTQynaQpwjXDbXWDM6QUB31hVx6wHx+yexN2m4+pKIqnx91CCq8NvnanWcjh93mYVtTxF15iB37iovRQY71UR/jIlZX/y8uAW2Y8TlBwGnmzXC9xS0ETHSTO0TCzSTBE16A3d6UkZBckTJ3ZzuDSjmXg3hZ+zciwzIavHTzl38JOcWIXkgGSWs=;20:wjeCHhdyoH1gHCFhANuYmumjpFuPpFDQrUcu5lLzwwjYj8adpupuTQnMBaklbtsE7R7OlZvClEgxy0glgOWbHp6JQCSDAMj7YM6qav878p3+kQho+nucTHvtsFXkK4ZAZSKZng6cBgTWQYDu0I+wqCsXwBOlZTORt0z/SQH6J4Q86IN445bPZjdWEx2Cyo9XTXPLECEmr2nFXa6n8NiBgtNoD/AkOfCBy338s0SdedoqhyDGJLKE7jVxQEnvwbuFR5cgknRhMTj1TCqEhvMR/p3Jo1ur7YzK7EloQz40lpvsio+oS3IvHQsASaz6yJvLIo0V3piomNBcZPlAMJylnyc45gDoIMeHJoGa/clOJIMKhgumOkIURF6mILTq9DlMoxeHFLWQR46p5tkS0fF4G02miIFRk9exZoJF4MQuGXxJXyIVOxwUmSHV9IjXoDQGA67ces/FTOMVGyGD808me/wx3Vxzeso8dsEbS6NnjNAiOMK+wDOc0Y4H/0fhrQFq X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(3231311)(944501410)(52105095)(10201501046)(93006095)(93004095)(3002001)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123564045)(20161123558120)(20161123562045)(201708071742011)(7699050);SRVR:DM6PR07MB4395;BCL:0;PCL:0;RULEID:;SRVR:DM6PR07MB4395; X-Microsoft-Exchange-Diagnostics: 1;DM6PR07MB4395;4:VLv1ckDjwn5MrORWjI6aAhN/ppGlKldVogfI5UIkH33WToX18G+YxyNCzO79KAq18h2OjNiXfKGE7oKE4/ptRGnALuK4bmf1uHsRfyeuvR6uBjF+qI6a7ADmbMdVIdu4AXo1zKxsEu/ysAsXuvkKTz7Sxaj7aZrGGVJQM/CMsvPLGBXx80/6Gwi0Lk2JWnjsWBW37+88C55MQS7Z/daYdpcwCV3bfaRdA55LgeqF1TFoPsSt/sKpknIZHovrMlsCO+SXIBK2TSjF6U14s7DVoA== X-Forefront-PRVS: 0792DBEAD0 X-Microsoft-Exchange-Diagnostics: 1;DM6PR07MB4395;23:kxuuwXRMGU3/9PwY6YSADd+VlBkRnf4mPxPhNN1bJPbkA2QykZ6JEW4sDeqPfzBCf9Q4zRlPTij5dY/S9xEj48OM6a5UnkVhUofKnpz9Q7l8b1hlXpnolkdQJXt2Eel1WMLytzrYMmLAssOkslWiQ5LA5pznZ1QwNoL9dOPsZwm+aWnAJNodwFUMrthzfcQX31Bj0fVnEI5y0oT12f1YEK4OhXyTdh/lUjslMDRFzo4H9TYpqZjrhjhqy9x3W2i0mriBSu8kPISn2Lr5+kpq5o9qFmbmSm6OuwQAzp5Uwuqz/xaSuZeRT/osWQ+8RRZwSULsWTzwO6JhUW/eiK/0aQxrFd4O9DaiC4Q4Cb1q2EFt8euOfTp4SPGqzVoI6U2zP4mXG8KXFsufW+GdaydwhhTFo4Vz3ExVlLCn6J0JHHLYpiy9so44e9ttIbhTIRZfIXgKugLsHa/9ngHidjDiWe5fYh3aN0dESQfIcSaSgEzBb7yjkJvBRsXH/ppTjjkCIZeNpjUw/91kgHlAHRXCi46K3bzU846A7CW+7rG4/Kk9QYh7uHmKsG8uAasP4XmXF5UWQP1OlyuGmidtrTykXbPTp0hur1hZHq6VnJiMB3zVBUI0EBu3eiKiTfP0Ili/GSzPcb1qTi3an2VK+k3slFsRPZzCqHoNa44vqTaSS8IqjN/fEwoJTVQyKLt1mfZH8lq9rNGDbn4r0dVN2x89CdTPK0/cGP6vtbX24KbPWkmmBG7MVCaS44XFVyJ3jH+Sj0sNWzKh0VGKzuayzGdnqbVQxTrxxqrOGJvmi1bi1iX5+tiAODRI7xf1MnTIiluiCnH2KbsJuKiak46t/qSd9CCQ7ssIZ6tto/asqoA1iNFzE90SMupuZrVfr8sfT92CxNNnWofzcna5inrWVoG0DJ9eE4hgNBJ+iFlGT1q7huDMZ0e7O1BkTO8TSLLO67Yn/MaGquxEZKwmKqwBeqY+EFcgCQ7FepADdnAlHb/RS0V4YYORC7UcdqyMmX1hVbb/qOYsDaS2FnWkuypMhLFXePbggR0siCMVuO3UdZsipH10j+2L9o5OPp1cq3pnEFO8gHscSuQWzVhiIOG4JETIi/Q2Hd7q3odZPhK3wV3QhNr6yTXWQ31QAyKg3O/dTomW X-Microsoft-Antispam-Message-Info: UsFqIhiK+x++SF8VPqbj9tWFGd9DBxVuVvb0eAr3QtHHFYOJQdhu3FN9WsGau5vJHmv+XAaPFpNX1QwL6CkAJvEFHrEKq0kf7K4LHwzJuKDoUyKc/1Kow18anMJaBRnUgyGIEsFtAGzxnO4qdcjPezLUbZGoAy+M4FuS4Z2NoEW3SugepmpNDp34O6QbN6JCrqtBcU1X7q5/20JoronH/SPQ3EjqX8/RN1iHeqTg+j7uDK1Ku8t7wGb1t7xq1UpdQLy7x97JU2AmBQj+GnRcEJ6KHj9pqcwoZRVz49LenSCIx11CADGpsMoG8EZ5KfV88Iv5JmFbeWrHKJgZjaVzAPWw5iXLGneQCslgcuggF50= X-Microsoft-Exchange-Diagnostics: 1;DM6PR07MB4395;6:dj98l1/DAAFNn2xpFXgLP+wVsLrNB6cbC1MQ9NoW7kNU/Qu/XAa9eIHvnwl8SvddUVGbHdT85C60B3vnN3ziCH2D9kDzz9KLeL67MSEiLx5pg2iIIsh6W9qjxRF9IkMdhDl8/vJ1+anpTtiyB0d75B0mKnP5jBSJmUfm1TLVod74U9174DtJJqWur5lL2oUQHSmbPVEaD0GnQ3iSdP8CuAjst+ZyCywOZhK1Ua+4tsAAL+5mw3CmgT+B9ZEYbzxYstfM56R1RefrOYsXjlRJaK7kgwYY30laU7gt1mRWSydG+oyu3mKRDf9udIJk4P/b/4h/fXj4XbffRHoSBkyMpBPu0KHvnS3JayxTKTvtTdm6NX0QLO1OZBFiYMjRkWKbK6CHuYHP2rVfWr99mwWw+NhCPFQ0+ejixkuNlNp+Bp+lrCzHuXg51BEvbk+b92Eusfr1kM8jS8pzjd3hdBuR5w==;5:IOKXNqKI3uxRYpTobNzeElNLqSypZo28sVzaGADsU9v31LUUqxtXsK++99JbtNzl0ygGNLPeeavQrRTOpsn82rrNC9ImF8fb2Cc6ifibh+reK7+udy7g/fbfk8Gw9uFP3Z/A+n/Aln7KCtLmZnyR0XaUnfY2Yxo0T4QOzyi+0LI=;7:jvJzdii2pF17muSJ5QVfmsQ9NAc0khKVTP0BsoEuB7lxKtMSg30MFbeJkiqhKq8SjJgPYb2nvCVH0bbCUV6ZWQDqJngB8E14ns6C2zLH8kKSQEKbJI0XCy3Zm1wTLfSG0l0uR7jFzd+kvKppg0EEar8zzPc1VgafWO3sH6sQrKpFRUO0eVNPUvirwB4AE95wuWdmd2yLKk566cYyTatEFHiylCUG8nLR9tti5g6ndcfm4cF2ve3UcOyaHvDpWNUJ SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Sep 2018 17:18:36.0283 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5b5f4f89-e6fb-48c5-b6fd-08d6180a9bd6 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: DM6PR07MB4395 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: Quinn Tran When FW rejects a command due to "entry_status" error (malform IOCB), the srb resource needs to be return back for cleanup. The filter to catch this is in the wrong location. Signed-off-by: Quinn Tran Signed-off-by: Himanshu Madhani --- drivers/scsi/qla2xxx/qla_isr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c index 0087174d3766..d73b04e40590 100644 --- a/drivers/scsi/qla2xxx/qla_isr.c +++ b/drivers/scsi/qla2xxx/qla_isr.c @@ -2845,6 +2845,7 @@ qla2x00_error_entry(scsi_qla_host_t *vha, struct rsp_que *rsp, sts_entry_t *pkt) case ELS_IOCB_TYPE: case ABORT_IOCB_TYPE: case MBX_IOCB_TYPE: + default: sp = qla2x00_get_sp_from_handle(vha, func, req, pkt); if (sp) { sp->done(sp, res); @@ -2855,7 +2856,6 @@ qla2x00_error_entry(scsi_qla_host_t *vha, struct rsp_que *rsp, sts_entry_t *pkt) case ABTS_RESP_24XX: case CTIO_TYPE7: case CTIO_CRC2: - default: return 1; } fatal: From patchwork Tue Sep 11 17:18:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Madhani, Himanshu" X-Patchwork-Id: 10595999 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 583E2920 for ; Tue, 11 Sep 2018 17:18:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3B14229B1F for ; Tue, 11 Sep 2018 17:18:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2DB5729B23; Tue, 11 Sep 2018 17:18:45 +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=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,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 AAC7829B1F for ; Tue, 11 Sep 2018 17:18:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727969AbeIKWTB (ORCPT ); Tue, 11 Sep 2018 18:19:01 -0400 Received: from mail-eopbgr700046.outbound.protection.outlook.com ([40.107.70.46]:15781 "EHLO NAM04-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726782AbeIKWTB (ORCPT ); Tue, 11 Sep 2018 18:19: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:X-MS-Exchange-SenderADCheck; bh=+TehTMszJuVZzhKvXbHpb1Co9vgJg4AQr/GVy5kQItk=; b=jOO4OH0iRDOkDcANflX0Bna3HgSLF6JPDtPsmwkLQ6DLmAB70G8Mn4vSXEYt5RUX4s7+QB8qGagBeEuN7oAXtRd1yZwJH3jviF62Z3uQTEf+Z4kuw6AYT6cPr/9WsLiXCqeT2MJ+EgZrpZsFPSoJnrnYUZNwBsw7KSr97aMiBkc= Received: from DM6PR07CA0033.namprd07.prod.outlook.com (2603:10b6:5:94::46) by BYAPR07MB4392.namprd07.prod.outlook.com (2603:10b6:a02:c0::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1122.15; Tue, 11 Sep 2018 17:18:37 +0000 Received: from CO1NAM05FT061.eop-nam05.prod.protection.outlook.com (2a01:111:f400:7e50::206) by DM6PR07CA0033.outlook.office365.com (2603:10b6:5:94::46) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1122.17 via Frontend Transport; Tue, 11 Sep 2018 17:18:37 +0000 Authentication-Results: spf=pass (sender IP is 50.232.66.26) smtp.mailfrom=cavium.com; vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=bestguesspass action=none header.from=cavium.com; Received-SPF: Pass (protection.outlook.com: domain of cavium.com designates 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 CO1NAM05FT061.mail.protection.outlook.com (10.152.96.179) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.20.1164.5 via Frontend Transport; Tue, 11 Sep 2018 17:18:36 +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, 11 Sep 2018 10:18:29 -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 w8BHISwS029075; Tue, 11 Sep 2018 10:18:28 -0700 Received: (from root@localhost) by dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id w8BHISqq029074; Tue, 11 Sep 2018 10:18:28 -0700 From: Himanshu Madhani To: , CC: , Subject: [PATCH 06/16] qla2xxx: Fix race condition for resource cleanup Date: Tue, 11 Sep 2018 10:18:17 -0700 Message-ID: <20180911171827.29016-7-himanshu.madhani@cavium.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20180911171827.29016-1-himanshu.madhani@cavium.com> References: <20180911171827.29016-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)(136003)(376002)(346002)(396003)(39860400002)(2980300002)(438002)(189003)(199004)(316002)(336012)(446003)(42186006)(16586007)(26005)(2616005)(476003)(126002)(11346002)(186003)(48376002)(51416003)(76176011)(2906002)(50226002)(86362001)(305945005)(54906003)(36756003)(356003)(47776003)(106002)(44832011)(8936002)(14444005)(486006)(110136005)(81156014)(81166006)(87636003)(5660300001)(80596001)(6666003)(8676002)(1076002)(478600001)(50466002)(4326008)(106466001)(72206003)(69596002);DIR:OUT;SFP:1101;SCL:1;SRVR:BYAPR07MB4392;H:CAEXCH02.caveonetworks.com;FPR:;SPF:Pass;LANG:en;PTR:50-232-66-26-static.hfc.comcastbusiness.net;MX:1;A:1; X-Microsoft-Exchange-Diagnostics: 1;CO1NAM05FT061;1:t+TsSZ8fs+gO8KPgFvJqUU4i3m9vsOwONz4Z46WyYGBgXzud8/hqh5TPH43f2u5xRTMpZHEi73znmg07r0PocrVVSENAKjPLBIogezkvhkaxUdil3hvyPq/fB6Y/+ntP X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: efc7fd75-76f5-47a3-b0f6-08d6180a9c52 X-Microsoft-Antispam: BCL:0;PCL:0;RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(4608076)(2017052603328)(7153060);SRVR:BYAPR07MB4392; X-Microsoft-Exchange-Diagnostics: 1;BYAPR07MB4392;3:b1NJ1EW5ISuDbkdQ9qPGYYamtFxx+7aQ/v37WTCUIp7VioQcvMjQkTEG5fHJjKSR1xX+3xUvd2DiTZOZ3J7tVBslk+zqWcy5cT4uCXMcRbgpkz4LOblAGAlsGC8oe2BF9cdyBmShW1kT+gtldOPm3w43thb6jCiwSxUhp5rPzTRv0/NctWnNPpjS1bzoBykMOOJ19jATOZj2521ODv8zpzE1kvkadG+r/o4eBa9prawJQqfYcnyvWHDTZr9T/N2Ak59exUDIz5ZCatrTpfeXu5g2VY0rJSKtFCaG92G7CMPnTLaQb7s/o+VvcYt/Ahf+98wizO1lQuoAv3N5PVA7C9ZO3wW/KDIV7TuepIX8ChQ=;25:B/5ntZ1WpmVEUDC8LOE+2NvGKpLi5yynwEKFv2Ef+LMmbLn7+ud0R4bswKk2zB1WBhAgJuFs8OpfNV7j2b+ZL1MI62W1hZlGDC0nH2hSqt4KbcJGHLMWx7gHonVGKHHQ8JRoeg/VFyKdNYL3oksr6b4eD6jS6k6ahn2QbzYULUQZkKFduKSTIY9AxBc9Vo5ctIkrZMG91FjxPh/UeFYxyknyYLwfJQr5incWG7MrJIiWRAEbjHlG+qTjv/6/+Jgd4horBOoR7qAfOE7L2BAtkj7BZoTla86KOIf8WiZfv8tNraBlD0IYEyBPGB9VdpXvYrJoW/WmF31GXDj8xzjTIw== X-MS-TrafficTypeDiagnostic: BYAPR07MB4392: X-Microsoft-Exchange-Diagnostics: 1;BYAPR07MB4392;31:jvUxVQUPY/FSO6fGcZDhh+/1GrXaZAO4yKpSr0iHpURD8e2RiE7C7iZSVL+F32CvppsFUJhw/qmLUbUu9abMcwXyDB6UWz2buiFY+UhvPINhG50eNZqlmfMkXbiihXqhi7lhaiTUvLtug44AA0B2Ec+oTX1HufVHSJ4wpnotpdq6J1NXdvn/EnyTBqxa7dzUxZXgNyGgfpEpsbpFQHRFwPVGa6jBa3LRDZuxPccuLB8=;20:ES5pXPuJjK7BPpV2La7gOh5aCEXYBwdZ4dtXLZrEUjyWlipe6bbaAhGU18R8sjGPnsQD85xaR+AVo2JuNoedffWlY5Szdwh1gkNY+4gEBgRhsZS5DEA54E6FTx9OLxXaY3WPWS/IQh/W9pGaqRrYc9DWXGCw+bFHvFmEerXh2UHY3aCiH6Voyup//pMF9VMU1V2JGgv4ojuGIMyakqtcAT6F4mhYc+dMyV2vgNc+o4H0uEFAT336nUL30VbMTISLSoQJxMahb6v3oG/gRF+2NWNQgvMBH7GFJXIS3cechj8MMUyV9AU62PuURDKNcjXwZlbjTaypv8rNlHhWUl4+l1REI2aLDY/DmK9bADlmflQGMjtPJ69WAceohe5pE/O/fDDf3CFrqnFHO1cQfwabwVVrxPtP6qVIRwlHtwCbkryjW34BBoQ7vu1vj02e5X1dSIFFQyahRb8NxHT85kPBVLL6/It5+G1ad3/ZiMxwPhiM7uzGfaJq9CyQtipi7RU+ X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(10201501046)(3231311)(944501410)(52105095)(93006095)(93004095)(3002001)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123558120)(20161123562045)(20161123564045)(201708071742011)(7699050);SRVR:BYAPR07MB4392;BCL:0;PCL:0;RULEID:;SRVR:BYAPR07MB4392; X-Microsoft-Exchange-Diagnostics: 1;BYAPR07MB4392;4:hWhr9Rqhrh6TH1zMrDc7BbkO6CW27ypE1FGukFAVB0Abdta8GtTNXeAhzumEjEKL4BS6BbYlkV+nHGOoPlFnzVg2Dh+Iub2q4/GydbGalLCgSVKn45PWWhHuoXiwg4Vg8VSDyIcUsvgdQurV052qvuqUJchmtIERCt0qPzGV0YEBBwYPIfBG5x9CAEryWf77ch4dhDS/fDWhYSJtB3nwSx/sgl2QW7QALHicHAHDeOGbyo4k0eygittL0L6BPUFpEbmQqM3JiX8Qje2CV8i/Vg== X-Forefront-PRVS: 0792DBEAD0 X-Microsoft-Exchange-Diagnostics: 1;BYAPR07MB4392;23:wGDDU8smbNx1HxqOFcbWqlXfATW2PuCf12MKCyTCQLQoAT9MwGPguyu3qVgEUFHjnd+puj08MX0BBC8ybRnv72FJo7V450sMFZ6GP2OY5GSh8hJgMPFxA4Q4+9j5P6e7GCxFsw6Wox+p/2gi6VRX4I2QUebPhXpl/2kgVfpQwkdi1Ea/M+QaXQkN4Rc/CIp2lg7Pc1UhYcVDcE1/ZPC7EDfm5RsPTLS03P5CdGqwp6JCisgnThTeA5Wgqc0zeLlAbqavjThDcHTjg1TOu/nNp4V8lPJ4vqkzozhWCZPdIwgcfx9/S7ZbDXQT4CwpEPAoZuQ0SBmRZOEIdFrUSYiaCNEoJcuxfqanKnYbLzSkLj8FRqbiGImrHX7CrsEHhAZg+6BZ1ELkZotfe+F4FSFx+3efoQGiGkb7MGfghg9ImzgpRy/rn8eU015xVGm04UdqkBLhXh11Sopcjppz6gfauKosFMr0OO7BQYl2ULGEfn7QciRcWUS30mzXt7aVy1ITTUwDeicPuw9q04jBYrGYTjGlprL6sxtkaOSxOjfOsHeoENxD34WPikw3l+7HkIU1NdLHfXJew9Tr/+e3Ui97cxPBTkepHKeI4mUFHNJUUVkswx8vz7TZdha+LRCZ9TlL7qyTFsCR1LG8UPOq3BS75i+ANh6Rg1CDE58RnOa60DiG3cxodH888UDlXEJLlc4+ev5ghlH6WVzcBklbHY1Y9Rw5MIemC8RGPgwCl3V+Gg5lY6BdmuDdt8GZ3U4L56l/iVnRYasf+EdgdfLaYQ1+T5sP4OIkAVHd+W/GpIdcodWv3RSDEDvwoh6yW+TpmhsaXV/T+TwXRmdfQ54sqzdV+AURuwqKmQm7s6DB7fTVdx2yqbqGU9WM+Hqe0YQv+qDnle/GfgNYGNi+aA84xF0dVSwDlwDqsnon/5oIkBJmRPOcrFyAnmrIBQsoFHL3pbB1V3kqy4sM7zEkdxUneuvXlIG7JD3xk9/XSSPZWMU9NqzjYNsgbLjJTizL1jdpeYFZDioca583p4O1hMjKI46RWLUjV+IzVgOU3tPgTz/7SaQMuZ8fx+FzRTQcqVsUArrqDgk/5xQNvCTLoIzyurQK8GQCI2WGNqKtScnFcuvxHNdKEUANYFM7L6S7yf+vOTT5 X-Microsoft-Antispam-Message-Info: +/JGVu8mA2YADlcR64U0slXPKlL2/N5Qwq1bpBZ5skZwco3qZkaWx35je6J2HwDxSbfIYpWXUkQA9+PyL9OmxRHCv/hWsiMh7hTjc9uKDCXJDyyqvcVhvDUlTvxx33DwImGdixHJNXmhCedKFORvYFJiNULkWI6jNU5Xogtyu2Jf4igw4Hld6GOwSJSeUgd0KlW3BUk+iFu+AMvp5STb6z9BJvmvuoZTclm0LGC1zkzFO4uvvFXuYmaBg9nsI+1YExqAsT8qqH8aForRl7axQYR7jLOC5ZJEYmHfvPLsHxsNCCCjJYfGBKQtjJhXH7seP4dlIbWnoeCoKGFgTPRVSNSMvJVboaVROszd4OVq27o= X-Microsoft-Exchange-Diagnostics: 1;BYAPR07MB4392;6:xPex04wlsajWKjNMDX8pyHsc0OvxfcFiJPSk37aiS5AqKvorlV0j+eIfK8tLs/O2gYCATRBgu1ojtDCVsxzpV4sbXbUbUANDCLetEOwT6yJFxoN6AbPeD0eK9/73tp9I44F4RxdOQsun45yrqaRSFcQBRi0idGv9YPlp2ywtDnCaFWS4aaYLP/TcfCq471aOVaFXkSLUM+XoImSYtEr56iRlscVym0Sl34fHSYmu5b8GknLYwnDPgYcc8tGQl+0BqH7488BLIWHZRWcjtSJDbC18VFtbFqa50FHYaYv8/0+R4QSx5T4u41F5/16gpytwyhL5nP22Uw2g6N1V0Yf10xhs1gaKaCVez8NVhXwlCSkjPYS5IlEuI7RZS4keD4jNcoP76H1vMD4pxpxptm7FgWx1xEWNtNpCGstPvyolNKXkNHkl8wgX0ushJjVCuyaTOXOD+fMh5G7pB4/h4Nrspw==;5:9tAgspM75KMakDw3vES+4WcpdkajCRsKq0yAfbnfVT7CWjUblop6vxWfHST0HvszFhTQ4VaqH4pgxrjKgzQH4njHDQYmPrk+6qaqDwIQe3x1O5bYX622ICdTZYLlTdjy6Gu9P71QGC8xWdhD7bLlYnwkkD7aspecWffvrEtka2w=;7:acauzC5xhnB5Y09e+kBWqrz0MccYyabexUZrH89AcZLo0sxj42zpr14dDRagC0apXEYEb2SuJUfNZN+np98lHHYO54y7gTgy6JnaCcjN24RzzGFj4eOvuPdjHZEBN0d/AL2W994KxcJSPzgUSidmgX2o+dSHKoObS5U41fFRcLMH+pp4hjPx+vEeJph5JzdBJHSE9jdC+odT3msAEfKJrjtVtlQJ+1KUNckDm+HzugbABFCRQ7aQtrJL61NOPCbv SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Sep 2018 17:18:36.8408 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: efc7fd75-76f5-47a3-b0f6-08d6180a9c52 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: BYAPR07MB4392 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: Quinn Tran For Loop topology + Initiator, FW is in control of PLOGI/PRLI. When link is reset, driver will try to cleanup the session by doing an Implicit Logout. Instead, the code is doing an Explicit Logout. The explicit logout interferes with FW state machine in trying to reconnect. The implicit logout was meant for FW to flush commands. In loop, it is not needed because FW will auto flush. Signed-off-by: Quinn Tran Signed-off-by: Himanshu Madhani --- drivers/scsi/qla2xxx/qla_init.c | 13 +++++++++++++ drivers/scsi/qla2xxx/qla_iocb.c | 3 +-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c index 4d04603dd4ae..6f6739b945ea 100644 --- a/drivers/scsi/qla2xxx/qla_init.c +++ b/drivers/scsi/qla2xxx/qla_init.c @@ -4991,6 +4991,19 @@ qla2x00_configure_local_loop(scsi_qla_host_t *vha) (uint8_t *)ha->gid_list, entries * sizeof(struct gid_list_info)); + if (entries == 0) { + spin_lock_irqsave(&vha->work_lock, flags); + vha->scan.scan_retry++; + spin_unlock_irqrestore(&vha->work_lock, flags); + + if (vha->scan.scan_retry < MAX_SCAN_RETRIES) { + set_bit(LOCAL_LOOP_UPDATE, &vha->dpc_flags); + set_bit(LOOP_RESYNC_NEEDED, &vha->dpc_flags); + } + } else { + vha->scan.scan_retry = 0; + } + list_for_each_entry(fcport, &vha->vp_fcports, list) { fcport->scan_state = QLA_FCPORT_SCAN; } diff --git a/drivers/scsi/qla2xxx/qla_iocb.c b/drivers/scsi/qla2xxx/qla_iocb.c index 6335b8ce5fbd..4de910231ba6 100644 --- a/drivers/scsi/qla2xxx/qla_iocb.c +++ b/drivers/scsi/qla2xxx/qla_iocb.c @@ -2270,8 +2270,7 @@ qla24xx_logout_iocb(srb_t *sp, struct logio_entry_24xx *logio) logio->entry_type = LOGINOUT_PORT_IOCB_TYPE; logio->control_flags = cpu_to_le16(LCF_COMMAND_LOGO|LCF_IMPL_LOGO); - if (!sp->fcport->se_sess || - !sp->fcport->keep_nport_handle) + if (!sp->fcport->keep_nport_handle) logio->control_flags |= cpu_to_le16(LCF_FREE_NPORT); logio->nport_handle = cpu_to_le16(sp->fcport->loop_id); logio->port_id[0] = sp->fcport->d_id.b.al_pa; From patchwork Tue Sep 11 17:18:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Madhani, Himanshu" X-Patchwork-Id: 10596021 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4AF84920 for ; Tue, 11 Sep 2018 17:21:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2B7A029B75 for ; Tue, 11 Sep 2018 17:21:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 29F2229B6A; Tue, 11 Sep 2018 17:21:54 +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=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,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 8FA1729B78 for ; Tue, 11 Sep 2018 17:21:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727517AbeIKWWJ (ORCPT ); Tue, 11 Sep 2018 18:22:09 -0400 Received: from mail-dm3nam03on0081.outbound.protection.outlook.com ([104.47.41.81]:37056 "EHLO NAM03-DM3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727866AbeIKWWJ (ORCPT ); Tue, 11 Sep 2018 18:22:09 -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:X-MS-Exchange-SenderADCheck; bh=VacP0A7yAvx4n2atdykfiD1ubSqd641HOmz1BmeaBKY=; b=ARwwaxwNaaKFIC4JDFR1X7XcWxE+XFj9U8QvPaoTwCqt8qBGzShnla+mqagge6xc7+Z2iSyEECNiMRJdoy3GcUbcLPMb+eTXauCN8x9q4BkMTDRwWfCLbrVI7zrHipq0DlnOMr6FmVK3azE5IWZP4NPqh/lTumWYZAVCOonh674= Received: from DM6PR07CA0006.namprd07.prod.outlook.com (2603:10b6:5:94::19) by BY2PR07MB1443.namprd07.prod.outlook.com (2a01:111:e400:515f::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1101.16; Tue, 11 Sep 2018 17:18:40 +0000 Received: from CO1NAM05FT061.eop-nam05.prod.protection.outlook.com (2a01:111:f400:7e50::204) by DM6PR07CA0006.outlook.office365.com (2603:10b6:5:94::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1122.17 via Frontend Transport; Tue, 11 Sep 2018 17:18:39 +0000 Authentication-Results: spf=pass (sender IP is 50.232.66.26) smtp.mailfrom=cavium.com; vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=bestguesspass action=none header.from=cavium.com; Received-SPF: Pass (protection.outlook.com: domain of cavium.com designates 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 CO1NAM05FT061.mail.protection.outlook.com (10.152.96.179) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.20.1164.5 via Frontend Transport; Tue, 11 Sep 2018 17:18:39 +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, 11 Sep 2018 10:18:29 -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 w8BHISBT029079; Tue, 11 Sep 2018 10:18:28 -0700 Received: (from root@localhost) by dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id w8BHISgH029078; Tue, 11 Sep 2018 10:18:28 -0700 From: Himanshu Madhani To: , CC: , Subject: [PATCH 07/16] qla2xxx: Add mode control for each physical port Date: Tue, 11 Sep 2018 10:18:18 -0700 Message-ID: <20180911171827.29016-8-himanshu.madhani@cavium.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20180911171827.29016-1-himanshu.madhani@cavium.com> References: <20180911171827.29016-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)(346002)(396003)(136003)(39860400002)(376002)(2980300002)(438002)(189003)(199004)(5024004)(106466001)(14444005)(81156014)(476003)(8676002)(1076002)(36756003)(44832011)(5660300001)(47776003)(486006)(446003)(80596001)(2616005)(87636003)(478600001)(69596002)(6666003)(11346002)(50466002)(72206003)(126002)(2906002)(48376002)(316002)(110136005)(106002)(50226002)(42186006)(8936002)(16586007)(4326008)(86362001)(81166006)(186003)(26005)(356003)(305945005)(575784001)(336012)(76176011)(54906003)(51416003);DIR:OUT;SFP:1101;SCL:1;SRVR:BY2PR07MB1443;H:CAEXCH02.caveonetworks.com;FPR:;SPF:Pass;LANG:en;PTR:50-232-66-26-static.hfc.comcastbusiness.net;MX:1;A:1; X-Microsoft-Exchange-Diagnostics: 1;CO1NAM05FT061;1:hJNw9waA+MdAX0G0UrYV8pZ5tnp4iNQLt2iGEumTFediXs8KIfJYSM/h7n3oIot6B2VfmBtm6cVgrmOCc38jryQzYJY4rukgf0U5cnjQTdmjVhQ5AedZ5l9hgJ2Mb5M0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: eb247b1e-bdf1-48c4-7967-08d6180a9da0 X-Microsoft-Antispam: BCL:0;PCL:0;RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(4608076)(2017052603328)(7153060);SRVR:BY2PR07MB1443; X-Microsoft-Exchange-Diagnostics: 1;BY2PR07MB1443;3:lixPUG1TMIV268ozfcBgLCNoCd89KZfnHx/NUJFegGzk9bgLjKayd4ugIkShBEy2W//sUne4putbMKA/EcBCqPak8+OfrXRtcGmlUlJZIifoKX9EBO54RD9G38kguuglq+d268tgr/EjAid6VcsEZWzqZgQtjYi7Go/t0QtZ5tyXAhivHX4pRwzA2f53YEgf+RRn6IYm2iSITFK/MManKyAO2uQVmODIoogGGtvrqjEnk8VIdKy5kzmPxcu/x26csAUhk+s8Xsbv8j+0SU9UOKYWAYo/QFZUm7ttMRPfOdHo72SrzI94Pm37P7bZa6T5fqPqxkY+IcqOJereYivLI18bNhsOvWcpMhnL1vDemp4=;25:t3X8B72rb50d7PgldJg9RtWdDApD28owPMJTf819XyXgby/wSlVHxMfcBdEUbi6hb9QvrgrMtXIpNVrFEATfJ77lDWcP6zsYK7Eg80i/G/xCSWPLfmZnyzHUNjxubT9P9VUcMl1AeuFWMEot1jjvh3QkThDH3yITS0MLnrN3F1Z+QcOCuTp+xtrjNkYhi8JA+nGBfUmWUkMcORxLESatJXOIxKqgL+VtS4hgjG0bGEHStEbAkiQEskh3ictyoO9zkWfnevbjNmvIDhEWySzX0DDpHaqEukHO1JpkvqDiww74rSEIs68StiaWoJyDojAvIYYU6Z5VQaLlkmSfX5zznQ== X-MS-TrafficTypeDiagnostic: BY2PR07MB1443: X-Microsoft-Exchange-Diagnostics: 1;BY2PR07MB1443;31:D8VWjl8rBxnY5JVGpUN/vgNeH3UARIND0qniktBo7YMwl+Q2OdYB6S6RFNAncACbJ3R384yGpSfqfQiEJn/pQFIuzj0Fjtt8IBXhb3a8xVYAn10jxX4lAumpW6vd4s2bXIR7bp6PRfO8HmH5o4011EK3uprN+MQvFWcLRtyTfIj2n6YFtTB00URkbWoGpmpaMAil8M6t2PIgak56nkaL34D9KsszHZwcqOHL1chESBg=;20:kHhI3tcBLinkzYr/ptzgqqsTbjiuVbLQpW29E7W7Ay1CdyfAyTn+vbL99gbtgu9MdZmUXJYZ091TQfNyhjJj9+FzX/h4aaQoeHZUsqARZyAq4uI2MjmBBFoO92EEiUj0a/6NWzDyY1pA2jLh+2dv/kbUSDyIojV3muGb5/e+VhRADe+KFCW1Kygc9Ow9mjniEDAsa0yVNyUtmt+AslWdKdZfIwKgyz+Jf0Kn/2Nd0s6H0rp4QABL3akyXYf9q/XHvsiGo5o5RlWZKlz6/RrwTeg8qkpo7MxzOFSiMYm5APYdYpw5WTJQyHINPoV1zIsEOaQflZBQun5QgiM/OFOteN0i9RQu1YLdKu3FXx26GITuQpWhmMi7N9vIBcI0AHMJFwOumQcjLY7sjR+JdY6g/EotXBuuQ6Wpga9WmVPIeLP6p8PG62h4zJrNSMU9uFST/hI93eZx4pMmWv38b3dfgNbKgCrRr4tQJeV9WaI0xBk4q3F/JQfbEr0yKMzebjGo X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(209352067349851); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(93006095)(93004095)(3231311)(944501410)(52105095)(10201501046)(3002001)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123558120)(20161123562045)(20161123564045)(201708071742011)(7699050);SRVR:BY2PR07MB1443;BCL:0;PCL:0;RULEID:;SRVR:BY2PR07MB1443; X-Microsoft-Exchange-Diagnostics: 1;BY2PR07MB1443;4:SR3U4bGE9OL97lksq7fdiaIwfe9iiWLSzqD9NGaRc1aTP6ZPB0xqiqqgZUlOY0Bq3w1Z8WiRng6gSEfM37k4oVyP4qgaFFkoCHlYcB9mwBd4muNSNrgywDn+/DMejM8tZ6O8o5O4EJFoWDc/JHx8Q93h5D/v1DS5tBA78B3Js0X3A5KvlpgFxcJDlRp9vbVImMzPilFs4mSxLU2apczh2OhTVxKppws3MBlMqr2ZW93LmT93OW3qWuSkhJ037Sxd00tiPOtqIMvWVimMkDUM52KlcivkQHm7eEdd5J3TuRBQt1wDwoIIEUCNQGBCw1qi X-Forefront-PRVS: 0792DBEAD0 X-Microsoft-Exchange-Diagnostics: 1;BY2PR07MB1443;23:FsQ7tyUMzUIVyUMjtUnR/e3mA1vYdSlPAjGbvOrMIY70oL2sMwv7xCjsl6BmjzXJXXwUHms3WaslbBwf6BAJ3bb6VRdzP7T2d0dR4OhnKHnR0r38TaujrXdSDE40gvBUvkKkJ4hknOVA2RkqZxaOIZiSGmbmuJMffB+5bdNwgKznIMbVxTN6fzzB+1st6CEz6dvmLwZhVAJ7qCDIyvnoH2T3k7G6vleRxWZ6kxxvKw28aPkS21urs0q7DVnqdQKFi+mF9PTMRyeAB/iKeC5/+VlisLPUVviISsJF5pgUOpA0m1irgC7OIgwr0w7RRBcVcgslBvG0i0k4KHafOqy8IGUbwJaNZY+mUo+9Kd0epsmttzfewgcoB8unfVfmp84FRI2ASwkaZ3XYgOILgD2ceG1rOzZbDBrhAxmkeqDq5BW3dEqGtgmrpsp0Dh+0zf+1pSRg3VV6zqwDHDhT5+JEicrf+lV5K4jqL5H+Ki6k4VOgfwHoCBzmLV1q2x/nfh4wVG9EDVUHeTXvNnyWdx4Tdlk+GHnBNx1ZOpf/sqzwX3LX1Dr47YPfcIjEF6vueJUEJTsT8aEovLZH3cIB/p0y2xDkGFLoWczBOf4/46mIhsb6P3UJYVETa1yyYE8HPBhiD+RKj8YoWQVymvmnpGClnhgGVRdJVP21q/+jrou/H0n9tASDovEKWecg2mHSqXi4CYoJfWexuspULib1UuuiPQzBKLB2ZnPToHZxDXIxt053qnPFXs/g6LAKlzeIC2n6umL9ojz/KakMRJfpk+t+DHt6I77YkkdHSlgGKEKjMXcncFhbHr9a8xuk9Gum8oI0HTMoizXeYkB+tngKCc7lyQ/LoObLQonqKpDuVhDM3Kll9ZIMJmgH2OppNeuclCObWdtzsgSvmkbA/t7xy/Sn5X014kVmoTAsM+oAyZgRU97k+K5jsAtWhSg7waqCn25CHokN+KtNSMmovGHqCAxihner7pWjGcoqJW/2vhrOA1oGe3WAn5Dg83FAWvYUiyPu9+vFSA2ZbTXohz03ly7h4EhvIXkH04ZJ2dspMR2rAgu8vG+RSWlEso4kG7qqkjwgruCn5AA+FNY+/xqVoy6ROzx5HYh0mUiJtk3qexR2sXoCKVgLIOvSMa9kAWTJMIBviOn4uJA+CkhpfG2uG2fWnxFxeR/HINa8X0xXy+3SMu0= X-Microsoft-Antispam-Message-Info: RvEZKFq81oGGRleFQgGySF9vQBIGRsvoWFpqM7CcP0th2Y3czoSMaY1zTJieWQ27NVZjJ6gokkbulfOwBmdhTBnJndVmtRvNwFe568aH+Gn1S7sx0zKKTr7I5kpwo1hsTl6/tSba5rJFZarCpP9TNGxkFeS53EQiPXYMK1LRWng6dwtkPLFgA8aNZ6OS4tK9udg1Ir0MJo5LA7UklUEjofI7v+owCDqLEYvf/mRZwT6xLIqrOrYKooYt6/+o1HEtdGHNU7TjbWFqNnrv3mM4M+3KLV9F5kTKuV8iIpbJC5vC27xabMohnQPA6brd2RHD6oHsIw59aDDoITy7KhqEstssT+0ce0GPxTA9NOA9X2o= X-Microsoft-Exchange-Diagnostics: 1;BY2PR07MB1443;6:Z+1YZFtWAW8DKjlwT9V9WnNCQnPYK05kxLPILkVNDqyKEUIaiaI2DcG8f2w9rD1OnLLC28suR0JxagrFw/fQL1HJxdsmPbPnZsKGy6tgnsWLDBfCQshgPZOMuU8Z3UkXKOYdtMKeo43r1JLry11kjcJ1r4O/v8KNyR9Hpe5DuVufRJ7Gu/Ba9tbFf53VnXw+WnTk4uDfeUWwvrUJoN5Kudo6/vJJn7gCY7c48c7YdOF9uFH57VWilbRMYyhIPXnhZRRAddtfz1YG+kcz8VFKftbdjpfnvpc4qWMicfzsIIPeNeCig0qw8Emn5rpdfRIIzLdy0ce0Fn3WjEM32UXgoAoZw0qt/yj0dmqWbvNk/0+clEf8g6SOdAD7QzsEay66gfQs/7SVuO7H8YiXCpjHgv6P9WV8cH9zLe1uRFuvXmDOjd8P8RGWH680tTx4wH/fYsz9kPFKwOUEuorj91YVjQ==;5:z/b9TO6A7c6u1Ap1mGywDlvciL3+VuQdK08K3vJLfy942n6rWrblCEQyq4eZMiEf6cltP7vphZ239PCyHUk35Iad4MwqCfNQCkBHTOcZD+8GPzo/MpBQA0VQqteErCprTl8xNBGayo2Y7+DpADTDt2JvgVGi1CY1txzo+Wgzvpg=;7:KuiXA7wtXOp/ADET18ca67MDgDrMW8vIdxmS3VpZwiqMOr3Ba7Six+L8ls581mo0VW43smGOSxtHrYFCW1+qtcnWF4YSSKv8og/XQHOXrmkiKZgKMonkHkSsqWr2gFxWpP9JZJNo8gb0E9/ErI4u4MWITJgF7bXFRcsczqW4PYdyb3qsConvhnr2mmcON0KEz77SaMDpF/g9rmparYTDDtsJaokzCX9MCBVe1giOpe9G7KPTysaPeogMcZ3u/wag SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Sep 2018 17:18:39.0283 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: eb247b1e-bdf1-48c4-7967-08d6180a9da0 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: BY2PR07MB1443 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: Quinn Tran Add ability to allow each physical port to control operating mode. Current code forces all ports to behave in one mode (i.e. initiator, target or dual). This patch allows user to select the operating mode for each port. - Driver must be loaded in dual mode to allow resource allocation modprobe qla2xxx qlini_mode=dual - In addition user can make adjustment to exchange resources using following command echo 1024 > /sys/class/scsi_host/host/ql2xiniexchg echo 1024 > /sys/class/scsi_host/host/ql2xexchoffld - trigger mode change and new setting of ql2xexchoffld|ql2xiniexchg echo [] > /sys/class/scsi_host/host/qlini_mode where, value can be one of following - enabled - disabled - dual - exclusive Signed-off-by: Quinn Tran Signed-off-by: Himanshu Madhani --- drivers/scsi/qla2xxx/qla_attr.c | 449 ++++++++++++++++++++++++++++++++++++++ drivers/scsi/qla2xxx/qla_def.h | 7 + drivers/scsi/qla2xxx/qla_gbl.h | 5 +- drivers/scsi/qla2xxx/qla_init.c | 15 ++ drivers/scsi/qla2xxx/qla_inline.h | 6 +- drivers/scsi/qla2xxx/qla_os.c | 59 +++-- drivers/scsi/qla2xxx/qla_target.c | 26 ++- 7 files changed, 542 insertions(+), 25 deletions(-) diff --git a/drivers/scsi/qla2xxx/qla_attr.c b/drivers/scsi/qla2xxx/qla_attr.c index e1ae880d5b68..a31d23905753 100644 --- a/drivers/scsi/qla2xxx/qla_attr.c +++ b/drivers/scsi/qla2xxx/qla_attr.c @@ -1632,6 +1632,433 @@ qla2x00_max_speed_sup_show(struct device *dev, struct device_attribute *attr, ha->max_speed_sup ? "32Gps" : "16Gps"); } +/* ----- */ + +static ssize_t +qlini_mode_show(struct device *dev, struct device_attribute *attr, char *buf) +{ + scsi_qla_host_t *vha = shost_priv(class_to_shost(dev)); + int len = 0; + + len += scnprintf(buf + len, PAGE_SIZE-len, + "Supported options: enabled | disabled | dual | exclusive\n"); + + /* --- */ + len += scnprintf(buf + len, PAGE_SIZE-len, "Current selection: "); + + switch (vha->qlini_mode) { + case QLA2XXX_INI_MODE_EXCLUSIVE: + len += scnprintf(buf + len, PAGE_SIZE-len, + QLA2XXX_INI_MODE_STR_EXCLUSIVE); + break; + case QLA2XXX_INI_MODE_DISABLED: + len += scnprintf(buf + len, PAGE_SIZE-len, + QLA2XXX_INI_MODE_STR_DISABLED); + break; + case QLA2XXX_INI_MODE_ENABLED: + len += scnprintf(buf + len, PAGE_SIZE-len, + QLA2XXX_INI_MODE_STR_ENABLED); + break; + case QLA2XXX_INI_MODE_DUAL: + len += scnprintf(buf + len, PAGE_SIZE-len, + QLA2XXX_INI_MODE_STR_DUAL); + break; + } + len += scnprintf(buf + len, PAGE_SIZE-len, "\n"); + + return len; +} + +static char *mode_to_str[] = { + "exclusive", + "disabled", + "enabled", + "dual", +}; + +#define NEED_EXCH_OFFLOAD(_exchg) ((_exchg) > FW_DEF_EXCHANGES_CNT) +static int qla_set_ini_mode(scsi_qla_host_t *vha, int op) +{ + int rc = 0; + enum { + NO_ACTION, + MODE_CHANGE_ACCEPT, + MODE_CHANGE_NO_ACTION, + TARGET_STILL_ACTIVE, + }; + int action = NO_ACTION; + int set_mode = 0; + u8 eo_toggle = 0; /* exchange offload flipped */ + + switch (vha->qlini_mode) { + case QLA2XXX_INI_MODE_DISABLED: + switch (op) { + case QLA2XXX_INI_MODE_DISABLED: + if (qla_tgt_mode_enabled(vha)) { + if (NEED_EXCH_OFFLOAD(vha->u_ql2xexchoffld) != + vha->hw->flags.exchoffld_enabled) + eo_toggle = 1; + if (((vha->ql2xexchoffld != + vha->u_ql2xexchoffld) && + NEED_EXCH_OFFLOAD(vha->u_ql2xexchoffld)) || + eo_toggle) { + /* + * The number of exchange to be offload + * was tweaked or offload option was + * flipped + */ + action = MODE_CHANGE_ACCEPT; + } else { + action = MODE_CHANGE_NO_ACTION; + } + } else { + action = MODE_CHANGE_NO_ACTION; + } + break; + case QLA2XXX_INI_MODE_EXCLUSIVE: + if (qla_tgt_mode_enabled(vha)) { + if (NEED_EXCH_OFFLOAD(vha->u_ql2xexchoffld) != + vha->hw->flags.exchoffld_enabled) + eo_toggle = 1; + if (((vha->ql2xexchoffld != + vha->u_ql2xexchoffld) && + NEED_EXCH_OFFLOAD(vha->u_ql2xexchoffld)) || + eo_toggle) { + /* + * The number of exchange to be offload + * was tweaked or offload option was + * flipped + */ + action = MODE_CHANGE_ACCEPT; + } else { + action = MODE_CHANGE_NO_ACTION; + } + } else { + action = MODE_CHANGE_ACCEPT; + } + break; + case QLA2XXX_INI_MODE_DUAL: + action = MODE_CHANGE_ACCEPT; + /* active_mode is target only, reset it to dual */ + if (qla_tgt_mode_enabled(vha)) { + set_mode = 1; + action = MODE_CHANGE_ACCEPT; + } else { + action = MODE_CHANGE_NO_ACTION; + } + break; + + case QLA2XXX_INI_MODE_ENABLED: + if (qla_tgt_mode_enabled(vha)) + action = TARGET_STILL_ACTIVE; + else { + action = MODE_CHANGE_ACCEPT; + set_mode = 1; + } + break; + } + break; + + case QLA2XXX_INI_MODE_EXCLUSIVE: + switch (op) { + case QLA2XXX_INI_MODE_EXCLUSIVE: + if (qla_tgt_mode_enabled(vha)) { + if (NEED_EXCH_OFFLOAD(vha->u_ql2xexchoffld) != + vha->hw->flags.exchoffld_enabled) + eo_toggle = 1; + if (((vha->ql2xexchoffld != + vha->u_ql2xexchoffld) && + NEED_EXCH_OFFLOAD(vha->u_ql2xexchoffld)) || + eo_toggle) + /* + * The number of exchange to be offload + * was tweaked or offload option was + * flipped + */ + action = MODE_CHANGE_ACCEPT; + else + action = NO_ACTION; + } else + action = NO_ACTION; + + break; + + case QLA2XXX_INI_MODE_DISABLED: + if (qla_tgt_mode_enabled(vha)) { + if (NEED_EXCH_OFFLOAD(vha->u_ql2xexchoffld) != + vha->hw->flags.exchoffld_enabled) + eo_toggle = 1; + if (((vha->ql2xexchoffld != + vha->u_ql2xexchoffld) && + NEED_EXCH_OFFLOAD(vha->u_ql2xexchoffld)) || + eo_toggle) + action = MODE_CHANGE_ACCEPT; + else + action = MODE_CHANGE_NO_ACTION; + } else + action = MODE_CHANGE_NO_ACTION; + break; + + case QLA2XXX_INI_MODE_DUAL: /* exclusive -> dual */ + if (qla_tgt_mode_enabled(vha)) { + action = MODE_CHANGE_ACCEPT; + set_mode = 1; + } else + action = MODE_CHANGE_ACCEPT; + break; + + case QLA2XXX_INI_MODE_ENABLED: + if (qla_tgt_mode_enabled(vha)) + action = TARGET_STILL_ACTIVE; + else { + if (vha->hw->flags.fw_started) + action = MODE_CHANGE_NO_ACTION; + else + action = MODE_CHANGE_ACCEPT; + } + break; + } + break; + + case QLA2XXX_INI_MODE_ENABLED: + switch (op) { + case QLA2XXX_INI_MODE_ENABLED: + if (NEED_EXCH_OFFLOAD(vha->u_ql2xiniexchg) != + vha->hw->flags.exchoffld_enabled) + eo_toggle = 1; + if (((vha->ql2xiniexchg != vha->u_ql2xiniexchg) && + NEED_EXCH_OFFLOAD(vha->u_ql2xiniexchg)) || + eo_toggle) + action = MODE_CHANGE_ACCEPT; + else + action = NO_ACTION; + break; + case QLA2XXX_INI_MODE_DUAL: + case QLA2XXX_INI_MODE_DISABLED: + action = MODE_CHANGE_ACCEPT; + break; + default: + action = MODE_CHANGE_NO_ACTION; + break; + } + break; + + case QLA2XXX_INI_MODE_DUAL: + switch (op) { + case QLA2XXX_INI_MODE_DUAL: + if (qla_tgt_mode_enabled(vha) || + qla_dual_mode_enabled(vha)) { + if (NEED_EXCH_OFFLOAD(vha->u_ql2xexchoffld + + vha->u_ql2xiniexchg) != + vha->hw->flags.exchoffld_enabled) + eo_toggle = 1; + + if ((((vha->ql2xexchoffld + + vha->ql2xiniexchg) != + (vha->u_ql2xiniexchg + + vha->u_ql2xexchoffld)) && + NEED_EXCH_OFFLOAD(vha->u_ql2xiniexchg + + vha->u_ql2xexchoffld)) || eo_toggle) + action = MODE_CHANGE_ACCEPT; + else + action = NO_ACTION; + } else { + if (NEED_EXCH_OFFLOAD(vha->u_ql2xexchoffld + + vha->u_ql2xiniexchg) != + vha->hw->flags.exchoffld_enabled) + eo_toggle = 1; + + if ((((vha->ql2xexchoffld + vha->ql2xiniexchg) + != (vha->u_ql2xiniexchg + + vha->u_ql2xexchoffld)) && + NEED_EXCH_OFFLOAD(vha->u_ql2xiniexchg + + vha->u_ql2xexchoffld)) || eo_toggle) + action = MODE_CHANGE_NO_ACTION; + else + action = NO_ACTION; + } + break; + + case QLA2XXX_INI_MODE_DISABLED: + if (qla_tgt_mode_enabled(vha) || + qla_dual_mode_enabled(vha)) { + /* turning off initiator mode */ + set_mode = 1; + action = MODE_CHANGE_ACCEPT; + } else { + action = MODE_CHANGE_NO_ACTION; + } + break; + + case QLA2XXX_INI_MODE_EXCLUSIVE: + if (qla_tgt_mode_enabled(vha) || + qla_dual_mode_enabled(vha)) { + set_mode = 1; + action = MODE_CHANGE_ACCEPT; + } else { + action = MODE_CHANGE_ACCEPT; + } + break; + + case QLA2XXX_INI_MODE_ENABLED: + if (qla_tgt_mode_enabled(vha) || + qla_dual_mode_enabled(vha)) { + action = TARGET_STILL_ACTIVE; + } else { + action = MODE_CHANGE_ACCEPT; + } + } + break; + } + + switch (action) { + case MODE_CHANGE_ACCEPT: + ql_log(ql_log_warn, vha, 0xffff, + "Mode change accepted. From %s to %s, Tgt exchg %d|%d. ini exchg %d|%d\n", + mode_to_str[vha->qlini_mode], mode_to_str[op], + vha->ql2xexchoffld, vha->u_ql2xexchoffld, + vha->ql2xiniexchg, vha->u_ql2xiniexchg); + + vha->qlini_mode = op; + vha->ql2xexchoffld = vha->u_ql2xexchoffld; + vha->ql2xiniexchg = vha->u_ql2xiniexchg; + if (set_mode) + qlt_set_mode(vha); + vha->flags.online = 1; + set_bit(ISP_ABORT_NEEDED, &vha->dpc_flags); + break; + + case MODE_CHANGE_NO_ACTION: + ql_log(ql_log_warn, vha, 0xffff, + "Mode is set. No action taken. From %s to %s, Tgt exchg %d|%d. ini exchg %d|%d\n", + mode_to_str[vha->qlini_mode], mode_to_str[op], + vha->ql2xexchoffld, vha->u_ql2xexchoffld, + vha->ql2xiniexchg, vha->u_ql2xiniexchg); + vha->qlini_mode = op; + vha->ql2xexchoffld = vha->u_ql2xexchoffld; + vha->ql2xiniexchg = vha->u_ql2xiniexchg; + break; + + case TARGET_STILL_ACTIVE: + ql_log(ql_log_warn, vha, 0xffff, + "Target Mode is active. Unable to change Mode.\n"); + break; + + case NO_ACTION: + default: + ql_log(ql_log_warn, vha, 0xffff, + "Mode unchange. No action taken. %d|%d pct %d|%d.\n", + vha->qlini_mode, op, + vha->ql2xexchoffld, vha->u_ql2xexchoffld); + break; + } + + return rc; +} + +static ssize_t +qlini_mode_store(struct device *dev, struct device_attribute *attr, + const char *buf, size_t count) +{ + scsi_qla_host_t *vha = shost_priv(class_to_shost(dev)); + int ini; + + if (!buf) + return -EINVAL; + + if (strncasecmp(QLA2XXX_INI_MODE_STR_EXCLUSIVE, buf, + strlen(QLA2XXX_INI_MODE_STR_EXCLUSIVE)) == 0) + ini = QLA2XXX_INI_MODE_EXCLUSIVE; + else if (strncasecmp(QLA2XXX_INI_MODE_STR_DISABLED, buf, + strlen(QLA2XXX_INI_MODE_STR_DISABLED)) == 0) + ini = QLA2XXX_INI_MODE_DISABLED; + else if (strncasecmp(QLA2XXX_INI_MODE_STR_ENABLED, buf, + strlen(QLA2XXX_INI_MODE_STR_ENABLED)) == 0) + ini = QLA2XXX_INI_MODE_ENABLED; + else if (strncasecmp(QLA2XXX_INI_MODE_STR_DUAL, buf, + strlen(QLA2XXX_INI_MODE_STR_DUAL)) == 0) + ini = QLA2XXX_INI_MODE_DUAL; + else + return -EINVAL; + + qla_set_ini_mode(vha, ini); + return strlen(buf); +} + +static ssize_t +ql2xexchoffld_show(struct device *dev, struct device_attribute *attr, + char *buf) +{ + scsi_qla_host_t *vha = shost_priv(class_to_shost(dev)); + int len = 0; + + len += scnprintf(buf + len, PAGE_SIZE-len, + "target exchange: new %d : current: %d\n\n", + vha->u_ql2xexchoffld, vha->ql2xexchoffld); + + len += scnprintf(buf + len, PAGE_SIZE-len, + "Please (re)set operating mode via \"/sys/class/scsi_host/host%ld/qlini_mode\" to load new setting.\n", + vha->host_no); + + return len; +} + +static ssize_t +ql2xexchoffld_store(struct device *dev, struct device_attribute *attr, + const char *buf, size_t count) +{ + scsi_qla_host_t *vha = shost_priv(class_to_shost(dev)); + int val = 0; + + if (sscanf(buf, "%d", &val) != 1) + return -EINVAL; + + if (val > FW_MAX_EXCHANGES_CNT) + val = FW_MAX_EXCHANGES_CNT; + else if (val < 0) + val = 0; + + vha->u_ql2xexchoffld = val; + return strlen(buf); +} + +static ssize_t +ql2xiniexchg_show(struct device *dev, struct device_attribute *attr, + char *buf) +{ + scsi_qla_host_t *vha = shost_priv(class_to_shost(dev)); + int len = 0; + + len += scnprintf(buf + len, PAGE_SIZE-len, + "target exchange: new %d : current: %d\n\n", + vha->u_ql2xiniexchg, vha->ql2xiniexchg); + + len += scnprintf(buf + len, PAGE_SIZE-len, + "Please (re)set operating mode via \"/sys/class/scsi_host/host%ld/qlini_mode\" to load new setting.\n", + vha->host_no); + + return len; +} + +static ssize_t +ql2xiniexchg_store(struct device *dev, struct device_attribute *attr, + const char *buf, size_t count) +{ + scsi_qla_host_t *vha = shost_priv(class_to_shost(dev)); + int val = 0; + + if (sscanf(buf, "%d", &val) != 1) + return -EINVAL; + + if (val > FW_MAX_EXCHANGES_CNT) + val = FW_MAX_EXCHANGES_CNT; + else if (val < 0) + val = 0; + + vha->u_ql2xiniexchg = val; + return strlen(buf); +} + static DEVICE_ATTR(driver_version, S_IRUGO, qla2x00_drvr_version_show, NULL); static DEVICE_ATTR(fw_version, S_IRUGO, qla2x00_fw_version_show, NULL); static DEVICE_ATTR(serial_num, S_IRUGO, qla2x00_serial_num_show, NULL); @@ -1682,6 +2109,10 @@ static DEVICE_ATTR(max_speed_sup, S_IRUGO, qla2x00_max_speed_sup_show, NULL); static DEVICE_ATTR(zio_threshold, 0644, qla_zio_threshold_show, qla_zio_threshold_store); +static DEVICE_ATTR_RW(qlini_mode); +static DEVICE_ATTR_RW(ql2xexchoffld); +static DEVICE_ATTR_RW(ql2xiniexchg); + struct device_attribute *qla2x00_host_attrs[] = { &dev_attr_driver_version, @@ -1719,9 +2150,27 @@ struct device_attribute *qla2x00_host_attrs[] = { &dev_attr_min_link_speed, &dev_attr_max_speed_sup, &dev_attr_zio_threshold, + NULL, /* reserve for qlini_mode */ + NULL, /* reserve for ql2xiniexchg */ + NULL, /* reserve for ql2xexchoffld */ NULL, }; +void qla_insert_tgt_attrs(void) +{ + struct device_attribute **attr; + + /* advance to empty slot */ + for (attr = &qla2x00_host_attrs[0]; *attr; ++attr) + continue; + + *attr = &dev_attr_qlini_mode; + attr++; + *attr = &dev_attr_ql2xiniexchg; + attr++; + *attr = &dev_attr_ql2xexchoffld; +} + /* Host attributes. */ static void diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h index 8145636c759d..26b93c563f92 100644 --- a/drivers/scsi/qla2xxx/qla_def.h +++ b/drivers/scsi/qla2xxx/qla_def.h @@ -4376,6 +4376,13 @@ typedef struct scsi_qla_host { atomic_t vref_count; struct qla8044_reset_template reset_tmplt; uint16_t bbcr; + + uint16_t u_ql2xexchoffld; + uint16_t u_ql2xiniexchg; + uint16_t qlini_mode; + uint16_t ql2xexchoffld; + uint16_t ql2xiniexchg; + struct name_list_extended gnl; /* Count of active session/fcport */ int fcport_count; diff --git a/drivers/scsi/qla2xxx/qla_gbl.h b/drivers/scsi/qla2xxx/qla_gbl.h index 7018067b5707..3673fcdb033a 100644 --- a/drivers/scsi/qla2xxx/qla_gbl.h +++ b/drivers/scsi/qla2xxx/qla_gbl.h @@ -159,6 +159,7 @@ extern int ql2xnvmeenable; extern int ql2xautodetectsfp; extern int ql2xenablemsix; extern int qla2xuseresexchforels; +extern int ql2xexlogins; extern int qla2x00_loop_reset(scsi_qla_host_t *); extern void qla2x00_abort_all_cmds(scsi_qla_host_t *, int); @@ -675,6 +676,7 @@ void qla_scan_work_fn(struct work_struct *); */ struct device_attribute; extern struct device_attribute *qla2x00_host_attrs[]; +extern struct device_attribute *qla2x00_host_attrs_dm[]; struct fc_function_template; extern struct fc_function_template qla2xxx_transport_functions; extern struct fc_function_template qla2xxx_transport_vport_functions; @@ -688,7 +690,7 @@ extern int qla2x00_echo_test(scsi_qla_host_t *, extern int qla24xx_update_all_fcp_prio(scsi_qla_host_t *); extern int qla24xx_fcp_prio_cfg_valid(scsi_qla_host_t *, struct qla_fcp_prio_cfg *, uint8_t); - +void qla_insert_tgt_attrs(void); /* * Global Function Prototypes in qla_dfs.c source file. */ @@ -895,5 +897,6 @@ void qlt_unknown_atio_work_fn(struct work_struct *); void qlt_update_host_map(struct scsi_qla_host *, port_id_t); void qlt_remove_target_resources(struct qla_hw_data *); void qlt_clr_qp_table(struct scsi_qla_host *vha); +void qlt_set_mode(struct scsi_qla_host *); #endif /* _QLA_GBL_H */ diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c index 6f6739b945ea..2e836d1427bb 100644 --- a/drivers/scsi/qla2xxx/qla_init.c +++ b/drivers/scsi/qla2xxx/qla_init.c @@ -4056,6 +4056,7 @@ qla2x00_init_rings(scsi_qla_host_t *vha) ql_dbg(ql_dbg_init, vha, 0x00d3, "Init Firmware -- success.\n"); QLA_FW_STARTED(ha); + vha->u_ql2xexchoffld = vha->u_ql2xiniexchg = 0; } return (rval); @@ -6702,6 +6703,20 @@ qla2x00_abort_isp(scsi_qla_host_t *vha) return status; } + switch (vha->qlini_mode) { + case QLA2XXX_INI_MODE_DISABLED: + if (!qla_tgt_mode_enabled(vha)) + return 0; + break; + case QLA2XXX_INI_MODE_DUAL: + if (!qla_dual_mode_enabled(vha)) + return 0; + break; + case QLA2XXX_INI_MODE_ENABLED: + default: + break; + } + ha->isp_ops->get_flash_version(vha, req->ring); ha->isp_ops->nvram_config(vha); diff --git a/drivers/scsi/qla2xxx/qla_inline.h b/drivers/scsi/qla2xxx/qla_inline.h index bf9a6f01fd9f..512c3c37b447 100644 --- a/drivers/scsi/qla2xxx/qla_inline.h +++ b/drivers/scsi/qla2xxx/qla_inline.h @@ -318,13 +318,13 @@ static inline bool qla_is_exch_offld_enabled(struct scsi_qla_host *vha) { if (qla_ini_mode_enabled(vha) && - (ql2xiniexchg > FW_DEF_EXCHANGES_CNT)) + (vha->ql2xiniexchg > FW_DEF_EXCHANGES_CNT)) return true; else if (qla_tgt_mode_enabled(vha) && - (ql2xexchoffld > FW_DEF_EXCHANGES_CNT)) + (vha->ql2xexchoffld > FW_DEF_EXCHANGES_CNT)) return true; else if (qla_dual_mode_enabled(vha) && - ((ql2xiniexchg + ql2xexchoffld) > FW_DEF_EXCHANGES_CNT)) + ((vha->ql2xiniexchg + vha->ql2xexchoffld) > FW_DEF_EXCHANGES_CNT)) return true; else return false; diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c index 3befe11d6425..d21dd7700d5d 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c @@ -4290,29 +4290,34 @@ static void qla2x00_number_of_exch(scsi_qla_host_t *vha, u32 *ret_cnt, u16 max_cnt) { u32 temp; + struct init_cb_81xx *icb = (struct init_cb_81xx *)&vha->hw->init_cb; *ret_cnt = FW_DEF_EXCHANGES_CNT; if (max_cnt > vha->hw->max_exchg) max_cnt = vha->hw->max_exchg; if (qla_ini_mode_enabled(vha)) { - if (ql2xiniexchg > max_cnt) - ql2xiniexchg = max_cnt; + if (vha->ql2xiniexchg > max_cnt) + vha->ql2xiniexchg = max_cnt; + + if (vha->ql2xiniexchg > FW_DEF_EXCHANGES_CNT) + *ret_cnt = vha->ql2xiniexchg; - if (ql2xiniexchg > FW_DEF_EXCHANGES_CNT) - *ret_cnt = ql2xiniexchg; } else if (qla_tgt_mode_enabled(vha)) { - if (ql2xexchoffld > max_cnt) - ql2xexchoffld = max_cnt; + if (vha->ql2xexchoffld > max_cnt) { + vha->ql2xexchoffld = max_cnt; + icb->exchange_count = cpu_to_le16(vha->ql2xexchoffld); + } - if (ql2xexchoffld > FW_DEF_EXCHANGES_CNT) - *ret_cnt = ql2xexchoffld; + if (vha->ql2xexchoffld > FW_DEF_EXCHANGES_CNT) + *ret_cnt = vha->ql2xexchoffld; } else if (qla_dual_mode_enabled(vha)) { - temp = ql2xiniexchg + ql2xexchoffld; + temp = vha->ql2xiniexchg + vha->ql2xexchoffld; if (temp > max_cnt) { - ql2xiniexchg -= (temp - max_cnt)/2; - ql2xexchoffld -= (((temp - max_cnt)/2) + 1); + vha->ql2xiniexchg -= (temp - max_cnt)/2; + vha->ql2xexchoffld -= (((temp - max_cnt)/2) + 1); temp = max_cnt; + icb->exchange_count = cpu_to_le16(vha->ql2xexchoffld); } if (temp > FW_DEF_EXCHANGES_CNT) @@ -4350,6 +4355,12 @@ qla2x00_set_exchoffld_buffer(scsi_qla_host_t *vha) if (totsz != ha->exchoffld_size) { qla2x00_free_exchoffld_buffer(ha); + if (actual_cnt <= FW_DEF_EXCHANGES_CNT) { + ha->exchoffld_size = 0; + ha->flags.exchoffld_enabled = 0; + return QLA_SUCCESS; + } + ha->exchoffld_size = totsz; ql_log(ql_log_info, vha, 0xd016, @@ -4382,6 +4393,15 @@ qla2x00_set_exchoffld_buffer(scsi_qla_host_t *vha) return -ENOMEM; } + } else if (!ha->exchoffld_buf || (actual_cnt <= FW_DEF_EXCHANGES_CNT)) { + /* pathological case */ + qla2x00_free_exchoffld_buffer(ha); + ha->exchoffld_size = 0; + ha->flags.exchoffld_enabled = 0; + ql_log(ql_log_info, vha, 0xd016, + "Exchange offload not enable: offld size=%d, actual count=%d entry sz=0x%x, total sz=0x%x.\n", + ha->exchoffld_size, actual_cnt, size, totsz); + return 0; } /* Now configure the dma buffer */ @@ -4397,7 +4417,7 @@ qla2x00_set_exchoffld_buffer(scsi_qla_host_t *vha) if (qla_ini_mode_enabled(vha)) icb->exchange_count = 0; else - icb->exchange_count = cpu_to_le16(ql2xexchoffld); + icb->exchange_count = cpu_to_le16(vha->ql2xexchoffld); } return rval; @@ -4605,6 +4625,10 @@ struct scsi_qla_host *qla2x00_create_host(struct scsi_host_template *sht, vha->host_no = host->host_no; vha->hw = ha; + vha->qlini_mode = ql2x_ini_mode; + vha->ql2xexchoffld = ql2xexchoffld; + vha->ql2xiniexchg = ql2xiniexchg; + INIT_LIST_HEAD(&vha->vp_fcports); INIT_LIST_HEAD(&vha->work_list); INIT_LIST_HEAD(&vha->list); @@ -6081,15 +6105,17 @@ qla2x00_do_dpc(void *data) !test_bit(UNLOADING, &base_vha->dpc_flags)) { bool do_reset = true; - switch (ql2x_ini_mode) { + switch (base_vha->qlini_mode) { case QLA2XXX_INI_MODE_ENABLED: break; case QLA2XXX_INI_MODE_DISABLED: - if (!qla_tgt_mode_enabled(base_vha)) + if (!qla_tgt_mode_enabled(base_vha) && + !ha->flags.fw_started) do_reset = false; break; case QLA2XXX_INI_MODE_DUAL: - if (!qla_dual_mode_enabled(base_vha)) + if (!qla_dual_mode_enabled(base_vha) && + !ha->flags.fw_started) do_reset = false; break; default: @@ -7020,6 +7046,9 @@ qla2x00_module_init(void) if (ql2xextended_error_logging == 1) ql2xextended_error_logging = QL_DBG_DEFAULT1_MASK; + if (ql2x_ini_mode == QLA2XXX_INI_MODE_DUAL) + qla_insert_tgt_attrs(); + qla2xxx_transport_template = fc_attach_transport(&qla2xxx_transport_functions); if (!qla2xxx_transport_template) { diff --git a/drivers/scsi/qla2xxx/qla_target.c b/drivers/scsi/qla2xxx/qla_target.c index d5f6ce8c86df..c0b9e0d079c0 100644 --- a/drivers/scsi/qla2xxx/qla_target.c +++ b/drivers/scsi/qla2xxx/qla_target.c @@ -1570,6 +1570,15 @@ void qlt_stop_phase2(struct qla_tgt *tgt) ql_dbg(ql_dbg_tgt_mgt, vha, 0xf00c, "Stop of tgt %p finished\n", tgt); + + switch (vha->qlini_mode) { + case QLA2XXX_INI_MODE_EXCLUSIVE: + vha->flags.online = 1; + set_bit(ISP_ABORT_NEEDED, &vha->dpc_flags); + break; + default: + break; + } } EXPORT_SYMBOL(qlt_stop_phase2); @@ -6617,6 +6626,9 @@ int qlt_lport_register(void *target_lport_ptr, u64 phys_wwpn, if (!(host->hostt->supported_mode & MODE_TARGET)) continue; + if (vha->qlini_mode == QLA2XXX_INI_MODE_ENABLED) + continue; + spin_lock_irqsave(&ha->hardware_lock, flags); if ((!npiv_wwpn || !npiv_wwnn) && host->active_mode & MODE_TARGET) { pr_debug("MODE_TARGET already active on qla2xxx(%d)\n", @@ -6679,15 +6691,15 @@ void qlt_lport_deregister(struct scsi_qla_host *vha) EXPORT_SYMBOL(qlt_lport_deregister); /* Must be called under HW lock */ -static void qlt_set_mode(struct scsi_qla_host *vha) +void qlt_set_mode(struct scsi_qla_host *vha) { - switch (ql2x_ini_mode) { + switch (vha->qlini_mode) { case QLA2XXX_INI_MODE_DISABLED: case QLA2XXX_INI_MODE_EXCLUSIVE: vha->host->active_mode = MODE_TARGET; break; case QLA2XXX_INI_MODE_ENABLED: - vha->host->active_mode = MODE_UNKNOWN; + vha->host->active_mode = MODE_INITIATOR; break; case QLA2XXX_INI_MODE_DUAL: vha->host->active_mode = MODE_DUAL; @@ -6700,7 +6712,7 @@ static void qlt_set_mode(struct scsi_qla_host *vha) /* Must be called under HW lock */ static void qlt_clear_mode(struct scsi_qla_host *vha) { - switch (ql2x_ini_mode) { + switch (vha->qlini_mode) { case QLA2XXX_INI_MODE_DISABLED: vha->host->active_mode = MODE_UNKNOWN; break; @@ -6736,6 +6748,8 @@ qlt_enable_vha(struct scsi_qla_host *vha) dump_stack(); return; } + if (vha->qlini_mode == QLA2XXX_INI_MODE_ENABLED) + return; spin_lock_irqsave(&ha->hardware_lock, flags); tgt->tgt_stopped = 0; @@ -6975,7 +6989,7 @@ qlt_24xx_config_nvram_stage1(struct scsi_qla_host *vha, struct nvram_24xx *nv) if (qla_tgt_mode_enabled(vha)) nv->exchange_count = cpu_to_le16(0xFFFF); else /* dual */ - nv->exchange_count = cpu_to_le16(ql2xexchoffld); + nv->exchange_count = cpu_to_le16(vha->ql2xexchoffld); /* Enable target mode */ nv->firmware_options_1 |= cpu_to_le32(BIT_4); @@ -7081,7 +7095,7 @@ qlt_81xx_config_nvram_stage1(struct scsi_qla_host *vha, struct nvram_81xx *nv) if (qla_tgt_mode_enabled(vha)) nv->exchange_count = cpu_to_le16(0xFFFF); else /* dual */ - nv->exchange_count = cpu_to_le16(ql2xexchoffld); + nv->exchange_count = cpu_to_le16(vha->ql2xexchoffld); /* Enable target mode */ nv->firmware_options_1 |= cpu_to_le32(BIT_4); From patchwork Tue Sep 11 17:18:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Madhani, Himanshu" X-Patchwork-Id: 10596017 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1650F14E5 for ; Tue, 11 Sep 2018 17:19:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EDCC829B28 for ; Tue, 11 Sep 2018 17:19:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E237729B2F; Tue, 11 Sep 2018 17:19:35 +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=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,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 640D129B28 for ; Tue, 11 Sep 2018 17:19:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728182AbeIKWTv (ORCPT ); Tue, 11 Sep 2018 18:19:51 -0400 Received: from mail-by2nam03on0045.outbound.protection.outlook.com ([104.47.42.45]:64849 "EHLO NAM03-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727751AbeIKWTu (ORCPT ); Tue, 11 Sep 2018 18:19:50 -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:X-MS-Exchange-SenderADCheck; bh=NC80Nt6sIYvz0wfhvWqNDXcEzNLZRF8QFh70kqWqnkg=; b=Yg3JHptu4GwzF55xhqOw89ZjYyYhgZW3AZsRXMRSkOOSiTIl7CQUB/jwR0pSOfAnug0TH2AiCPe79UyXWvF52Tx3BdGxx7wSZdOBCYrXaRt8yf9sHivQdnCBkmLh4gLMlXuBw4MrbMqNPyDSGgqL3nw32u9AM5e46KRKRqT/gss= Received: from SN4PR0701CA0009.namprd07.prod.outlook.com (2603:10b6:803:28::19) by BN7PR07MB4387.namprd07.prod.outlook.com (2603:10b6:406:b6::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1122.17; Tue, 11 Sep 2018 17:18:39 +0000 Received: from CO1NAM05FT054.eop-nam05.prod.protection.outlook.com (2a01:111:f400:7e50::200) by SN4PR0701CA0009.outlook.office365.com (2603:10b6:803:28::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1122.16 via Frontend Transport; Tue, 11 Sep 2018 17:18:38 +0000 Authentication-Results: spf=pass (sender IP is 50.232.66.26) smtp.mailfrom=cavium.com; vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=bestguesspass action=none header.from=cavium.com; Received-SPF: Pass (protection.outlook.com: domain of cavium.com designates 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 CO1NAM05FT054.mail.protection.outlook.com (10.152.96.170) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.20.1164.5 via Frontend Transport; Tue, 11 Sep 2018 17:18:38 +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, 11 Sep 2018 10:18:30 -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 w8BHITkO029083; Tue, 11 Sep 2018 10:18:29 -0700 Received: (from root@localhost) by dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id w8BHITs7029082; Tue, 11 Sep 2018 10:18:29 -0700 From: Himanshu Madhani To: , CC: , Subject: [PATCH 08/16] qla2xxx: Fix early srb free on abort Date: Tue, 11 Sep 2018 10:18:19 -0700 Message-ID: <20180911171827.29016-9-himanshu.madhani@cavium.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20180911171827.29016-1-himanshu.madhani@cavium.com> References: <20180911171827.29016-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)(136003)(39860400002)(396003)(376002)(346002)(2980300002)(438002)(189003)(199004)(51416003)(8676002)(72206003)(8936002)(50226002)(81156014)(1076002)(81166006)(76176011)(36756003)(4326008)(87636003)(305945005)(106466001)(478600001)(48376002)(44832011)(50466002)(26005)(356003)(80596001)(476003)(186003)(42186006)(16586007)(106002)(126002)(47776003)(69596002)(110136005)(86362001)(336012)(54906003)(2906002)(446003)(11346002)(486006)(2616005)(6666003)(5660300001)(316002);DIR:OUT;SFP:1101;SCL:1;SRVR:BN7PR07MB4387;H:CAEXCH02.caveonetworks.com;FPR:;SPF:Pass;LANG:en;PTR:50-232-66-26-static.hfc.comcastbusiness.net;MX:1;A:1; X-Microsoft-Exchange-Diagnostics: 1;CO1NAM05FT054;1:scmlhjkFKTkpGJ1TSA4GaS7ikJPX1ES1ghQBBPHreG0Mge6JTWfmkqHG7J/jvwXPRKmtQOmfk8ctWRSMWMaIYkTffvlA2JTvHfL7Co00e5MyBGDj53uK1+VjA/+gqh1d X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7d2e6d1a-6b52-4847-5402-08d6180a9d57 X-Microsoft-Antispam: BCL:0;PCL:0;RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(4608076)(2017052603328)(7153060);SRVR:BN7PR07MB4387; X-Microsoft-Exchange-Diagnostics: 1;BN7PR07MB4387;3:WoUsaJ8PnaE6ou6tIar8874XHkRGzkPq5Dvx3GXxHepQVHL0SOckezSMpAv4ANxALniPAjBwoSQ1Nwf+mbpSwLLWmKfXWwqPfkf6BGkn7TkUxYlq5TM5/keU1lY79/IpqPU17Z4aXxkmsndWoFBynm6iDuqNzk14Ke0VUn0WsjSvrOXMD8jFqFXXzSrGWHHKU+htDVJyJf9/LmdiHSj7KToBkXD6daxBYvVmsefaBkpRoS1zWWs/2x2Ztm79bUI70WRwxJ7U+Q0cKyODGwkfUf3CUHY2ckcCJ0QvSKjkf4Evd1sXEB6iZPKiYGMSDuWsGYdMxFjgQ8FU9/Gc05Xz7QlE7fdxCckXV+5nqjaEpu4=;25:Hj7paNu/WSXzWTyvaL6cikjI5CX4WtyH95Kj8coI+P+t/OJX5hRxHJ3tXtyGSfi1h8XOT99gjK/E2l1t9qI7UBwJGKrfKA9s3SQxA9OY5Tj1jJv8anhXuykENvm2vPQIhGYp4izdEOxW507O7wIUQLuEqlYQpUROmi0QBJQyWw6UhgbLSG9g8pWopPhSylKJGkn7fgm4egs0Yld+qzum4rmgj93+K0Kxbl3DG63JKUa/M+IvXhDqMvcobZB8hsmyhQtCmV1PtYxIicLSNGaB9JYwjGvxbFcZAlVYOwKhj1VnvlkaXwpd/kzkkNXXMBjPIUTHIV2P4xpnkvvvVBPiYA== X-MS-TrafficTypeDiagnostic: BN7PR07MB4387: X-Microsoft-Exchange-Diagnostics: 1;BN7PR07MB4387;31:Wd4SrZ3Py8z8odajLaorpRPHGdFr9EpPaVTBc75Nysbl8MWj1Ul4T9ZSb8jnOCAmb8GvIpg6Jd3IcZmX993PEXYrFdDczeoBgxp0IXnmTir4+9iWyb7AzQYZOKOji13EbrR5plnZLh0/oTR93DfFZJnnXnY0DbfWNo0lQMYkX9q7W1GdordpGZV0NkdUglPomwuj0CYbB/RcA49HEZBxwVkHiM0Oczaje8LzC/IXxF0=;20:TXgB6TwkwJZ5FUx6KfWsNjFuaqv8e6k7sTCGWUBIi1VE4AZNgZG3HfE4MARckvqmheelWVHEbhHtYfsbHf5tbo7Wey8jeWAOzYtr6X/BgBpfjJSxmly2KGMiuRp/9M7XNEYUxxVil+g9a65Qks5u6DFsJQJ1jtl9/p+BydToY6jDfNzMiyP5OFy3M5roqcaElpI0ZX/qPV08SSNuT7Gou7JlkQxY9N7sIPXQjOU+cxz4OtPJbsqqDNog7QkzUPtGNGKzo5+5n+ErP906pBKhMBZteNgPImnHh/mzaQcES5c9Jotg/0TRXJl8CsybJiDV+gnb5mrudsl0H+DX2w1rYnOGuXmPRlMOPR1ExWg/zM+7Kr64AnsLOoC8U9oythY8YWdRaZthAANJ/fxDqKciNoxq/S7crbRlmT+J13Xru0oX5VKofoVaaaFGt/fRTsd8Oizt/EutZGQBl0L7BmsRuUMLJCcZHiTnlKE1m6Ou6fROAYkR7OKEu0+X+OqqDujm X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(9452136761055); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(3231311)(944501410)(52105095)(10201501046)(93006095)(93004095)(3002001)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123564045)(20161123558120)(20161123562045)(201708071742011)(7699050);SRVR:BN7PR07MB4387;BCL:0;PCL:0;RULEID:;SRVR:BN7PR07MB4387; X-Microsoft-Exchange-Diagnostics: 1;BN7PR07MB4387;4:FRcr1SyR7D2SmauMHHEuNNCFzA4+SSUfQ+bSvGKmho1ROcu5fuujJTGXNK7nKskYq1K3E2f0cL1i6EdEPmLUqqTwhJtFz5b2RRRm4FVDBXsvjk4TeUgZCOmBn4vpl+qb9R7id0xDKD3OpswRW0wYaT3Z2BedNAtfmO53AzO1pnI+nE8HpKla3uOC0yP+3dzP6NpkWznSQ2ph8vGJ8323YJeZiNwKQZZtGrx2MPPfC0sc/XLIhIffvzbsJ3AEMUjGKdAqokQsvuD8pzkeHwu4c35YqyjNkFC1upNQFR5IfoB6yhsSgr+4iXJe5uSz3FlT X-Forefront-PRVS: 0792DBEAD0 X-Microsoft-Exchange-Diagnostics: 1;BN7PR07MB4387;23:y4CFJpRoaa5f52jOvm3seh4VhLFTN9PY5gRksy2hRCzEkPXy6cXcRy06/UVyeeKY6EA0LVyJIbpSXFiASO7JkC/mCsKM4qjVhbRfMpgKCBmqm7wLEMKOfhOa+IzGKoXJCHgi2Nw0ezk+jS1UIH3v8H1Q4ZD2xC36MOlaZcnfcX//CS74pgWuQosSHkrWXF4TX5ontO6e2CtitduYFuagzDIRGXYdVLHfbjQpsRjsRau9VDa5Gs4jhSp9KraZEBK00vvd9vMLaWkDOUZLrfz/HWZZs8ihHu36wgU8ahI91MITVAjRiwBDt1khV5ZKNxrwquTEtTDicMOSVFfFD2CL2ZU2T265xFUjwvJMrV98w8RPy9XLWaWkTJw3fvvmBE1gdAmKtyxdqXYvuumxvjCYyRuUfF5WzMauWlA12TqGS/toCYHRvutYXMSHnGGr+no0sZev9pe+FTWITlRF6q1e9MvrdFuTUmUREt40VZYDPiEAgbRNOX+PWW2PEm5MLTnzjnD/8RYgeXbAgnAulStcBj9hMWdXStWNwYsBklmGQ3THd1SOuDE133L0tvhhk01+tzVaPSDSYxRUzRC+/k0i+TYcb6KZEnUu2T5tJU3P+Xr3dGz5kJ9vsF+3HIdT0NHIUBFJ7VJXV/em5YgOFdIIfPPD8I/LyofTIpin8kotRGXMMoysyr5MRh08pTKTSNVeV0lxVM6gnEJyOj43FHXk+/Kob61iedb8+7ULU5eIXdESJGBc9CEprE21JlXbypWJGLHixlfRXDNZvYFPX2BE8hZikfb/9hTFw8pthk/t9QXemzvpeTh6zguqtG24cHMLJ9eh5EEQMMWUapSUW145+YFZhaIjKNCtU08bag3Z1WJNwr6HcSJyBTMp2Oozden2NLxgPqWyEssV0MUKGFNNFn4nSbCwZJH92Tj2QVoNCH8c7w0poTqPVrF7BgiTNz+A0dJ8yB9968sji5lGOe0CE4m7kt5NAvQA58n622fl4RkxW5NeQov/Q0wJDuQ4nJ5yzHrYhpfRqb2pQzrxmlaGesTdShVgtmOYruGV1xV3AzJ22QpFghvG9MITkrrqFzN4ri6hAHGL2gGvHX7UNPMFNhEMKoFtlDUIvs0NewHjva8= X-Microsoft-Antispam-Message-Info: tTYP93WQgE37AyL06F3BGvL6O/ao0bSDaQREu/Lyd3gLG8rGRQs9mLL75m/sT5g6ghKPub9+2j7niRGf7NnmDrjyoEhsabVojZreoOUkAZLa3qdocesq3LCL7t5Jr5IjHdB/f3lgALQ3C7a73EseWlaH5P+0Ok4kLBFfmXgMMhjRLvo5lXp9ENPstS11pqFY21Gy4Jg/UPb9BEt4nO3VNrLtyy1EQaePJ947z8dt4OMeTUJiX4MpHUpCXtjULmAvRuO4UqsDo3zIx5JXzSn36NHiLNze06bMWu9U07Ker8gaTZ5StfdUQQ8vF60dN2FpD8n4/PHU/QRZRHekeM4PCUTwAUnmBIBgYbkoLLnjUE4= X-Microsoft-Exchange-Diagnostics: 1;BN7PR07MB4387;6:2ZcBZgbdxlb/UkPs6U2BH0bdLXFgdYS/AHdIab6pKLZjWSyMseps8IMyt1RPYTIdgDaVIRcKhASpvXXkYvbqnnp2qY+u0OkjVrQcnhNYB5ImHUyhQvQeQkHws4PdAYOqyqZwKI9D0RFwjPZfggnjQa7vMb5X4erx2D06BMzjKsSQkkrQqgtdPxgC4/RntQdaz2+c8moSy3oIEAa6TGdojyiiSMJeg1MpaF93d4JNBodWZeE+MQ0t4wM5Y865HV2iCGbfp1O1d2zuAu/oTbXHbjIROPRO69U2OrRmEwRdtiTrlGV74Acl/x0hetoHtnXgfV3lTgLs0Mlv3Tk/oN4mUxtbhivT74XvOnayY5X+xwKkP1bgkxNO5v07KCkiBXLyZL4y0EjnxfTzgj4M7Vl/kHTwX4MJeiwRrxZPGxsQLSVMxY/espbSK7E9tnA2EqhnJgcHJneVN5YKq2h42GR3dg==;5:/8mSa1KljM9oTKThWdeWQ7ABld9b1Jz5wFo9FJrTqBwfQbpw+3vyDr2PsLslFYFWNiVs4fWeTMSAWhECsD/Ik8jFbA5KsWlol1Tyr8Julua1JGlmO8aXBfE60MVQTx3n9JH0B06PmnznnDium9VhCmjzIIhCGr7VDiKmfnbj4H8=;7:DVGDQEk9HvOUNmNCT14JOCbs+GdUsOgkV6OymMIqugIy98T7gQElChxYmrSipHawdCrDsREH87eExSNs7vY6yBrcgpo6objxQ3SJjv0ZrATzrWQPF7ohdlMsdFBv2Bsq/bMLi+L9Wa3zLZcqNenGnzpgtYwpajqc9cvj+8bseY8bzlQIampMErkVZ58XIoEj0oNEEz2DHRxfjfDv9YfRlll9TI4e3fYreU/Aqm2DyDZntiPRevUarzxlBVMMsUNK SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Sep 2018 17:18:38.5489 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7d2e6d1a-6b52-4847-5402-08d6180a9d57 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: BN7PR07MB4387 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: Quinn Tran Task abort can take 2 paths: 1) serial/synchronous abort where the calling thread will put to sleep, wait for completion and free cmd resource. 2) async abort where the cmd free will be free by the completion thread. For path 2, driver is freeing the SRB too early. Fixes: f6145e86d21f ("scsi: qla2xxx: Fix race between switch cmd completion and timeout") Cc: stable@vger.kernel.org # 4.19 Signed-off-by: Quinn Tran Signed-off-by: Himanshu Madhani --- drivers/scsi/qla2xxx/qla_init.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c index 2e836d1427bb..0575210aa8f1 100644 --- a/drivers/scsi/qla2xxx/qla_init.c +++ b/drivers/scsi/qla2xxx/qla_init.c @@ -1850,6 +1850,8 @@ qla24xx_async_abort_cmd(srb_t *cmd_sp, bool wait) wait_for_completion(&abt_iocb->u.abt.comp); rval = abt_iocb->u.abt.comp_status == CS_COMPLETE ? QLA_SUCCESS : QLA_FUNCTION_FAILED; + } else { + goto done; } done_free_sp: From patchwork Tue Sep 11 17:18:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Madhani, Himanshu" X-Patchwork-Id: 10596001 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3135C14E5 for ; Tue, 11 Sep 2018 17:18:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 140AF29B1F for ; Tue, 11 Sep 2018 17:18:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 085A629B23; Tue, 11 Sep 2018 17:18:48 +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=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,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 80CFB29B1F for ; Tue, 11 Sep 2018 17:18:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728021AbeIKWTE (ORCPT ); Tue, 11 Sep 2018 18:19:04 -0400 Received: from mail-co1nam03on0078.outbound.protection.outlook.com ([104.47.40.78]:6120 "EHLO NAM03-CO1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726782AbeIKWTE (ORCPT ); Tue, 11 Sep 2018 18:19:04 -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:X-MS-Exchange-SenderADCheck; bh=s2tQVRADqa9NORWbSzQLQrnG5tkTUiJW2kPDy8Vq5Us=; b=YjZV8kOJuGL3eCgdKvenskqEyGS1z5qlkK6DS2G5GlUFMpnyVg/WR+cHAbX37+UnZG1wKdbxI3cQ1AeBV95si+7JSs6XdTT+0NlCxaotQ4FMIKRcR/MlHkaleyRrZ8VdyEC1v1rmIG66aBuNPwiUx6ICS5QRCYOcvl0DPK5o+rg= Received: from DM6PR07CA0004.namprd07.prod.outlook.com (2603:10b6:5:94::17) by BYAPR07MB4664.namprd07.prod.outlook.com (2603:10b6:a02:f1::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1143.13; Tue, 11 Sep 2018 17:18:41 +0000 Received: from CO1NAM05FT061.eop-nam05.prod.protection.outlook.com (2a01:111:f400:7e50::201) by DM6PR07CA0004.outlook.office365.com (2603:10b6:5:94::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1122.16 via Frontend Transport; Tue, 11 Sep 2018 17:18:40 +0000 Authentication-Results: spf=pass (sender IP is 50.232.66.26) smtp.mailfrom=cavium.com; vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=bestguesspass action=none header.from=cavium.com; Received-SPF: Pass (protection.outlook.com: domain of cavium.com designates 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 CO1NAM05FT061.mail.protection.outlook.com (10.152.96.179) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.20.1164.5 via Frontend Transport; Tue, 11 Sep 2018 17:18:40 +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, 11 Sep 2018 10:18:30 -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 w8BHITkc029087; Tue, 11 Sep 2018 10:18:29 -0700 Received: (from root@localhost) by dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id w8BHITLQ029086; Tue, 11 Sep 2018 10:18:29 -0700 From: Himanshu Madhani To: , CC: , Subject: [PATCH 09/16] qla2xxx: Fix stuck session in PLOGI state Date: Tue, 11 Sep 2018 10:18:20 -0700 Message-ID: <20180911171827.29016-10-himanshu.madhani@cavium.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20180911171827.29016-1-himanshu.madhani@cavium.com> References: <20180911171827.29016-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)(136003)(376002)(346002)(396003)(2980300002)(438002)(199004)(189003)(14444005)(126002)(44832011)(486006)(1076002)(106002)(4326008)(6666003)(305945005)(51416003)(8676002)(76176011)(110136005)(16586007)(316002)(42186006)(54906003)(2906002)(476003)(8936002)(478600001)(86362001)(575784001)(87636003)(48376002)(106466001)(72206003)(356003)(26005)(50466002)(81166006)(81156014)(5660300001)(80596001)(36756003)(69596002)(11346002)(47776003)(336012)(50226002)(446003)(2616005)(186003);DIR:OUT;SFP:1101;SCL:1;SRVR:BYAPR07MB4664;H:CAEXCH02.caveonetworks.com;FPR:;SPF:Pass;LANG:en;PTR:50-232-66-26-static.hfc.comcastbusiness.net;A:1;MX:1; X-Microsoft-Exchange-Diagnostics: 1;CO1NAM05FT061;1:QeXRIiLQc3lxPgk9NCb450MZaPADJqoL5lsmMMz4GSeJLE2g64Yaflz3vdbLbwbVgrZSRvsWLlZallrO84gPri0s19OZnHCVphEEYxI+EVgjtpnbSGZfgDAbWomqx9JX X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5d8bf789-5737-475b-1f78-08d6180a9e8a X-Microsoft-Antispam: BCL:0;PCL:0;RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(4608076)(2017052603328)(7153060);SRVR:BYAPR07MB4664; X-Microsoft-Exchange-Diagnostics: 1;BYAPR07MB4664;3:FwtecrLZ4ThOUKiQ2Dr8yitcmsKPsz2iFb7jwPmGBozfUst/ZUm8SVss+H5hM03J2kDAYh1R6SyQmqfU7s7Pkz8karuA5jPlCvEg9o47T+jkC9v9ECBwzozeEtMbRnVsPDaUrp+efqfohFkiqy+L2m5GXNdgRyu0+UAs4jBmzh6W4PEk3aJf1/9E4jqTZc3dgX7zYxJWx4x1tD7ONePO0btDX2+Z2PVss5RgK4kgtv7yUkWBE1GLWp2XzW1R6vWxgUxU0qAZCqusy/V5rLaF+IfbJMfNXffL3vctLFFJp1eSHG7emQSkIy3ZG0A6P1zwIKPDOQ+dTnAryYq8ripJEPn1mg7kMrrtmt6iR+87dZw=;25:1972l+CDVMRLyCj7L3U+JHeEa9PW3CXe44WAZGivFvzHBiW/QYsSm9lp6mmdoc4dZnVLta4f6gzl9qgpkkVpemG5rhcq6gYZ1zPzFWhs2ZiZO0/fqPdWIwYAt+eEzW5w4p62DjqrsFpQECUE1wDx9iGW7K07Ar78QXbYQg6G3g84RffvMe4jwPnu0nRx9h431uFDf1sX8aR2ArG1NupUbPTv7RXvslIIxF/Bk2OR9BoqkdrUolMCXWboE+wmQ9/JwGgI5b58oJXS+oFk5sANmmwiCWyf0hxol5xEENUhEEgouKWKQa/JBBkZtCLJ5zexMD63zR7TyH43WSlpRPP3CA== X-MS-TrafficTypeDiagnostic: BYAPR07MB4664: X-Microsoft-Exchange-Diagnostics: 1;BYAPR07MB4664;31:s2kBlL0XSW6J0BR4SJnwNSYY5sG4J5pCHvmqaF8H7TzIhNdoKFFJguY//uydRrB6A714932PSkHxjLXhNkupm+8gn5xJPJigAkvApPiiAKve6J11Cm5lbbbiTeuMlqQNRmggoBKEp9CvuJt2yZpE9UCf4EE6ZnrB+DE8B30BGnq1mzCvprDTwK2InK6pqsh2pYU14nMiwGkr1kAWVj/6W/zf9OwyDEULLNgxsOAe5f4=;20:1YxBwfJScRtgmxxjsxXv2GfldP630sxPPVZB/C+00saCRTLe/CUSPacXZoHTProh7v41fQcXtDUVmiP77M5nU2R0TC1LZSyfZsxvEJX8dz3d7kGUvg0UJ23eGuOWRwVi/rEU5KMMErApBSEovosGQgT+j3aYB9+zY/FUj8+bP2ehoHWMReFbr5KqcKoEW27bj8pDMbBUgHTfOzkDkOnlUIec778D8FhqVxrmi34yd4eEW7iLXEbIkVIqW4j8qrcjMfhQn3b1JraAG4rDk0kQhfIQstfGeaAiCsrl0vhjKyqd4J7O5o76lj1S6yxIiCJIjv7QiZ/PTspFX0+0KYfdXgP7cGXoWs0YIYMbG7koP7aCqFyK1Lh8541+w+LqcqwHeJjbeck1UTrO3CvMCLCMyYOljbmPtlBWpjoquTCzfoJmaHIDLsuqBOVOJU3gzpWQVe9pggSjoLkhKoJFcam/T4uKpXbP39pER/cIkx08XarFQ8QAY00BCoz9RbFVR3gL X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3231311)(944501410)(52105095)(10201501046)(3002001)(93006095)(93004095)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123564045)(20161123558120)(20161123562045)(201708071742011)(7699050);SRVR:BYAPR07MB4664;BCL:0;PCL:0;RULEID:;SRVR:BYAPR07MB4664; X-Microsoft-Exchange-Diagnostics: 1;BYAPR07MB4664;4:fbqa1af635dTELlgYGWJ8uXJYo9OIJVwLw8Zl+5ytrtbDMUgdCesrivqyr96tyzIZ72cDcPs8QKTSus7pHbixo5EVL9NC8tYeRI5+cF0GjHfR2slupQPFLRYk7dLuGgbCXy++GG8HKqpPlIkouKkpz+A4J6RL+Y/jZIw+DL9DHV5aCYR83+9VwBNx/vjKvbsMTjMtk04asJq2pw6nxjGy+0hKQtTS8kXg5uKCIG0LGWaH+WAQLRYEu5i5Eid2/+JEGXKdjvArDmuyeI5mwCGGw== X-Forefront-PRVS: 0792DBEAD0 X-Microsoft-Exchange-Diagnostics: 1;BYAPR07MB4664;23:ugaCyCWAsBh/tIR6ZlhgdKn9V2GcjK6RMcz6iTEIi7wsaU8AIBJYOnx+N2PMe+zWK2xTJc3JuztJyvrCeHTE2eC0gXFrI4aFgb4KfYk5mw0ZPYICwB3OmucTllyRGrjG1MqzJSiRjRR/WwwX7ArHB58CHgUTZS7DfZaTeCUS4GsFdDnVK16uwCHhXv/29ag0sJLWeqbe7N8d1MaYDoy61Sy6uuTUkuJKIzJG/9zCQe8tbtYrFSXlS6W7h96zRorA6n+gabXu8zaRqL9VN1Y3WCKBtcWgSF7hJpLFuUuvZEkhcHNWno4P1wgbPqShqikoa7Ybn5JGtJfocNO9MLsXoEyG57Whn20/SnDm/7pHkKt2dsY1ARgPCF/nCbudbPZb/N5OTre3XWFoL3DwrvL7OYVq/P4lfxytd1FR3yLWxQnnBA8rUb8K12q6h+v3s3vnuEu4SOpaGqbnFGlQh+heSBkFCcDW1EDRb9GlxisexA6rqRLTxsfYdwZpS/lHO/8Gj41TXovi0c2u1p3HY4ym8tBQIOPDxKMNwwBLKzMevXDynRKFl5Xs03ibqFi4qUBk87SDNBTjmoiMAu9b08JQO41ooeYd5VwVwyYlAYuRi/m4smDaWvh1lKMmq6gHaphg1Bvu7Pr2kQDlbrmVKkRfdwzkikZuqeSW9lYBOn/h39Lq+upogB+esJ9eV4Fevwq2tFXoRMX/zUn6hWr3pSwcxTsMJ7J6I0K/9AuCsbJomD6z6j/iwrd34UJugzQvGELT4Iix6cjG3rYO01SthC1kuDyzGgGFk1VO1nAdZNn0ZZMjFMlxtrHrEbRYIyxtePW16kjmd3K3w4RSx/0QqKqLu3V3ltjSgkojO9JTmfPjHO6tHtsLHcN0GsJbL5QwdUWnUcKJ0c58U5VBgxaBeK0Q7wE7koPqNLanIU3gi5PcgitUWmcRuDTQwKJt8Iw+PA0MSS5opj6jg7ejpHhZtvZ12KYrtKwwqbJo5YopByaXtd1c0yM8rq2WGPiyyUP476iutEdcAbgOp6SXFesx4rkUWKroA9lKcyAbNCkxK9P+gJmQ3WOMdJdtR8hTMUOYYw3tPfEybk630ZCg98leImO5weYrynwVDs6a6IQYuZZDssVF8ZVD5wliJ/ubA7Fpv+EiB//GxcKVNmG0Npw9woDnhA== X-Microsoft-Antispam-Message-Info: g0hZf0idyQTGwpJ3dNjrOIZAO9CynYyczf6b4eywaTU8RtFMvN96Xx+Qs25yoP7Ld+syaWJ+EVxqzFCgOO/lM98nWJtTWbYcClqvRYIRz3m9px2QyEmmbDPPA3am+0MmaxJHu7Kqxrd9KQ2cLZowW/7XpPx+KQmZrWDFYzvZqr8xd6xyhOTHc5V848NP3lHgXI03mvCocSA3uzG9JUihs+s+vFSwlo2eVSTylFP0lTdMKrsFRQ6bFHbFqOlDB2uJLC5HXtabWlLhTz7VNqLIq6yCTMIJG4ffzFQpswYaiLuXbCu6DtcwQAWHV5TYA7eHeedebQwPxVz+BTM3aUKq/IAIQWCIqDeXaGfKPC9a3FU= X-Microsoft-Exchange-Diagnostics: 1;BYAPR07MB4664;6:QKRWDDAh9I9PIWFRE9pY3L+dTs+wo2H7/42VlVRrfxx8gjByborAG//y+aawRjwWuFR12CKgfacb0tRQYEIW0bjrkyh8T/skTtebQZYYMgh5s95jt17mTlZwVdQ0qH77OXhmwA3M6PAHp6/Te91QpVuwEvZP9teNOKOprtCXSFAupUp04KmEln++aypCR5UVtcjYhcPqKFZKoye0A8BErPapaVm0Bong0H6A2YKnVU5rOd1uphpwaq6F+URyScXMNVscMTyq/MC3Caw7uK/4mgpvwRwS7a9fBSm7eKg2qu2WEg5sYtAEAjNMkPgpThYDJS8gKDUh15ittlxk4mperzMqA4bBOJXF/RY65CY0koeJ0GqY1WNhC+ij2Q6eS3lnsM4p+aQq0b+3a9bO2mWrqeAnIXEU8fVzZ3Pi/Z+3c5x4ZLHZJvM1z2OJUDJESWPW8SzptD5H3l9sHi4bfFV3fA==;5:hwfyxXI/AFJTHooOQPnaOUi1S/hDk5/HGdawrvgFqUWAvCC4yL8+I1hPB1OBsvKcKWg31ZjwoYJ3w3QHdEjbV6MwD4d6dC/oKEyHFIR0LtI6xGGkqM/Gy0By/XxSJe5F3vzKRKupdqGfYhI6m3wFupu+DTvZg0zKkCO/6Tbw5Ro=;7:s9/KB/4A4/26CVtbmwbzLkglhGAxYLPyGj934ggraRVayG7ejJSvTqQCVtFPNqDjzmHxHu+ZpQwwHGTouAAlSb35fVHMPX+tOmGFhqZEUftZutwpWV9QCsRWiKKEfOs6Q1ZsFkm8EZ1vQarWQ4kqP6YEH3KHCV2ep3EgGdfSP1Q+plEfjxVguaKto7YXCb3PKUndX7jOjwnlAC2xPRVnianYGCeA+2jR3LHTgJ4Bxihdef/FiQ5KGUYt+YB+YyVy SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Sep 2018 17:18:40.5439 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5d8bf789-5737-475b-1f78-08d6180a9e8a 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: BYAPR07MB4664 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: Quinn Tran On PLOGI complete + RSCN received, driver tries to handle RSCN but failed to reset the session back to the beginning to restart the login process. Instead the session was left in the Plogi complete without moving forward. This patch will push the session state back to the delete state and restart the connection. Signed-off-by: Quinn Tran Signed-off-by: Himanshu Madhani --- drivers/scsi/qla2xxx/qla_init.c | 13 +++++++++---- drivers/scsi/qla2xxx/qla_target.c | 4 ---- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c index 0575210aa8f1..bd1afa3063ee 100644 --- a/drivers/scsi/qla2xxx/qla_init.c +++ b/drivers/scsi/qla2xxx/qla_init.c @@ -414,6 +414,7 @@ void qla24xx_handle_adisc_event(scsi_qla_host_t *vha, struct event_arg *ea) return; } else if (ea->sp->gen1 != ea->fcport->rscn_gen) { qla_rscn_replay(fcport); + qlt_schedule_sess_for_deletion(fcport); return; } @@ -538,6 +539,7 @@ static void qla24xx_handle_gnl_done_event(scsi_qla_host_t *vha, if (fcport->last_rscn_gen != fcport->rscn_gen) { qla_rscn_replay(fcport); + qlt_schedule_sess_for_deletion(fcport); return; } else if (fcport->last_login_gen != fcport->login_gen) { ql_dbg(ql_dbg_disc, vha, 0x20e0, @@ -1229,6 +1231,7 @@ void qla24xx_handle_gpdb_event(scsi_qla_host_t *vha, struct event_arg *ea) return; } else if (ea->sp->gen1 != fcport->rscn_gen) { qla_rscn_replay(fcport); + qlt_schedule_sess_for_deletion(fcport); return; } @@ -1699,9 +1702,7 @@ void qla_rscn_replay(fc_port_t *fcport) #else qla24xx_post_gpnid_work(fcport->vha, &ea.id); #endif - } else { - qla24xx_post_gnl_work(fcport->vha, fcport); - } + } } static void @@ -1938,7 +1939,7 @@ qla24xx_handle_plogi_done_event(struct scsi_qla_host *vha, struct event_arg *ea) "%s %8phC DS %d LS %d rc %d login %d|%d rscn %d|%d data %x|%x iop %x|%x\n", __func__, fcport->port_name, fcport->disc_state, fcport->fw_login_state, ea->rc, ea->sp->gen2, fcport->login_gen, - ea->sp->gen2, fcport->rscn_gen|ea->sp->gen1, + ea->sp->gen1, fcport->rscn_gen, ea->data[0], ea->data[1], ea->iop[0], ea->iop[1]); if ((fcport->fw_login_state == DSC_LS_PLOGI_PEND) || @@ -1960,7 +1961,11 @@ qla24xx_handle_plogi_done_event(struct scsi_qla_host *vha, struct event_arg *ea) set_bit(RELOGIN_NEEDED, &vha->dpc_flags); return; } else if (ea->sp->gen1 != fcport->rscn_gen) { + ql_dbg(ql_dbg_disc, vha, 0x20d3, + "%s %8phC RSCN generation changed\n", + __func__, fcport->port_name); qla_rscn_replay(fcport); + qlt_schedule_sess_for_deletion(fcport); return; } diff --git a/drivers/scsi/qla2xxx/qla_target.c b/drivers/scsi/qla2xxx/qla_target.c index c0b9e0d079c0..666146a86d10 100644 --- a/drivers/scsi/qla2xxx/qla_target.c +++ b/drivers/scsi/qla2xxx/qla_target.c @@ -1260,9 +1260,6 @@ void qlt_schedule_sess_for_deletion(struct fc_port *sess) break; } - if (sess->deleted == QLA_SESS_DELETED) - sess->logout_on_delete = 0; - spin_lock_irqsave(&sess->vha->work_lock, flags); if (sess->deleted == QLA_SESS_DELETION_IN_PROGRESS) { spin_unlock_irqrestore(&sess->vha->work_lock, flags); @@ -4080,7 +4077,6 @@ static void qlt_do_ctio_completion(struct scsi_qla_host *vha, * Session is already logged out, but we need * to notify initiator, who's not aware of this */ - cmd->sess->logout_on_delete = 0; cmd->sess->send_els_logo = 1; ql_dbg(ql_dbg_disc, vha, 0x20f8, "%s %d %8phC post del sess\n", From patchwork Tue Sep 11 17:18:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Madhani, Himanshu" X-Patchwork-Id: 10596015 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B501D920 for ; Tue, 11 Sep 2018 17:19:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 987F629B23 for ; Tue, 11 Sep 2018 17:19:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8CAE629B28; Tue, 11 Sep 2018 17:19:18 +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=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,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 2C38C29B23 for ; Tue, 11 Sep 2018 17:19:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727709AbeIKWTf (ORCPT ); Tue, 11 Sep 2018 18:19:35 -0400 Received: from mail-by2nam03on0052.outbound.protection.outlook.com ([104.47.42.52]:58239 "EHLO NAM03-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727419AbeIKWTe (ORCPT ); Tue, 11 Sep 2018 18:19:34 -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:X-MS-Exchange-SenderADCheck; bh=JI5ngl50plOGoJdpdlPzTIW1ZHE8dlmNw03xShtdvhE=; b=kLHhGwIxI+t5vpe3hR0WXS8CH92zB2gRVEkX98i5Cbke9UQQsTNwAGDVljxU/T5B6Sn9TUEu4w9SSJtIhDhvVE/B0p9dq8EN+6g6iYrtFgzMd74zNPFctwXEZZb9XKhA6jq2TM0W7QdJcJ2jwxPxQcmSjbuIUTqsm3aCZ2dYCnk= Received: from SN4PR0701CA0016.namprd07.prod.outlook.com (2603:10b6:803:28::26) by BN7PR07MB4387.namprd07.prod.outlook.com (2603:10b6:406:b6::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1122.17; Tue, 11 Sep 2018 17:18:42 +0000 Received: from CO1NAM05FT054.eop-nam05.prod.protection.outlook.com (2a01:111:f400:7e50::203) by SN4PR0701CA0016.outlook.office365.com (2603:10b6:803:28::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1122.17 via Frontend Transport; Tue, 11 Sep 2018 17:18:42 +0000 Authentication-Results: spf=pass (sender IP is 50.232.66.26) smtp.mailfrom=cavium.com; vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=bestguesspass action=none header.from=cavium.com; Received-SPF: Pass (protection.outlook.com: domain of cavium.com designates 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 CO1NAM05FT054.mail.protection.outlook.com (10.152.96.170) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.20.1164.5 via Frontend Transport; Tue, 11 Sep 2018 17:18:41 +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, 11 Sep 2018 10:18:30 -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 w8BHITKe029091; Tue, 11 Sep 2018 10:18:29 -0700 Received: (from root@localhost) by dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id w8BHITh2029090; Tue, 11 Sep 2018 10:18:29 -0700 From: Himanshu Madhani To: , CC: , Subject: [PATCH 10/16] qla2xxx: shutdown chip if reset fail Date: Tue, 11 Sep 2018 10:18:21 -0700 Message-ID: <20180911171827.29016-11-himanshu.madhani@cavium.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20180911171827.29016-1-himanshu.madhani@cavium.com> References: <20180911171827.29016-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)(136003)(39860400002)(396003)(376002)(346002)(2980300002)(438002)(189003)(199004)(51416003)(8676002)(72206003)(8936002)(50226002)(81156014)(1076002)(81166006)(76176011)(36756003)(4326008)(87636003)(305945005)(106466001)(478600001)(48376002)(44832011)(50466002)(26005)(356003)(80596001)(476003)(186003)(42186006)(16586007)(106002)(126002)(47776003)(69596002)(110136005)(86362001)(336012)(54906003)(2906002)(446003)(11346002)(486006)(2616005)(6666003)(5660300001)(316002)(14444005);DIR:OUT;SFP:1101;SCL:1;SRVR:BN7PR07MB4387;H:CAEXCH02.caveonetworks.com;FPR:;SPF:Pass;LANG:en;PTR:50-232-66-26-static.hfc.comcastbusiness.net;MX:1;A:1; X-Microsoft-Exchange-Diagnostics: 1;CO1NAM05FT054;1:62qyF8GplZaY1kpsWnTfBf3aInBO0IjxlFBG06GwfkZV4kfMYwaqAnBmM5Gk9HwZQ1pC/0fCPsbeYW7tAy1u6bfjhVIk0LoVWzWNrGvhvOBijcIWjkGJGxQBGIsjJ8OB X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 06d495b5-a072-4892-182c-08d6180a9f5f X-Microsoft-Antispam: BCL:0;PCL:0;RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(4608076)(2017052603328)(7153060);SRVR:BN7PR07MB4387; X-Microsoft-Exchange-Diagnostics: 1;BN7PR07MB4387;3:urN21NJFFkvSvwk1/RrPGSWgNOfj4SqP+6RHffCU/HvExMZBnrS3i0T2h6xums8BkyZ9DCsEkGdxE/YC/I5KfTW9y1V2CiRRY+LGcIVCdYaoaiksumFWPVTDJk7rtxTIyF8yT909xc6HwrfCGF6sGOC7M6Md/SmZyy8EtkHRw1stUb3MmejnxDIcghIoh2vQFlTZAI6SXR5ebUSBslKHrpoh1FW14SK0FrI6aQOuB3Jy17c9je6uthZJUqAocPjXh2CaHZ9/PSdyF739ISEcapWBIDYFEkLI2YFUnK4bkE8QojCgdp1Pey4SAXi9j1hAfnsWhRfNoUS2dMaz40tP/xuzwKHyjS8s3Y4BJNKMvgo=;25:QKqxY6fSN8zSFkubH7IW3ozrl/9IsX74+WbqmnZO+ZALxLcT3h52bs5fuwDSxfKYP2nctenm97BJ9zDhkkfdWO9UNEblRhduU6hjKRH+gyoYVVZ654DDY/iBwZfRLCF9gM0cuHcJOgi8r7PfGbXPiJpcYRh9N7f6oiRkUYf2fi2M8DYdUZQvRSbtII4gQrugLp3ooCzKnVovDmKjUkxYtS2NnYfbfzi8+PEBNAkZwrAicCcHzSp0Nmkk2A79RSKygQvCHax1VrStoSjYCRRh76faFmOeeKJX6tQ+Ik9U3sdIItPl2UigaxR3R6sKWgiwb4Fpu+2z4hvuo0UD+qfK+A== X-MS-TrafficTypeDiagnostic: BN7PR07MB4387: X-Microsoft-Exchange-Diagnostics: 1;BN7PR07MB4387;31:S/PqljbcPy04hj+VqaQdA46AwSTpg0eHYj9oST3SPlmpkE8x8eFT64+JFcUilCiOr4pLD+DAxSlYYSLTUffmCv+3ONnJ2L7Y4/cwOkYKFGNug7SFGHFe//fiVLo26xv1SiGXj+lABXmn3EOICb6y1W/zBMoOC6RKIBu1oRCuYKEWpPN/8xHcDNPbHGwbz2vB1uV9iYezFE6U07nzcF3cCr7rh/jJQCIQK83LAfj7A3I=;20:+0Vu/zUeAEPJ7hhVKhOm+SvOiX92sbR5AATp88TY7Xwypc0CRJoa0kJbQMXNMIlWWnlKN097gEAxDpU6bdzJtcAWK6CgvsT/Wq9ULTYMbGrbcegsUvBJIebpAaW0cwGRrmjYtXSRB4L6rOb5NVFqgjRv/w9XB28ka+0fsY0fDXK2uOTv1+9LqJr3jhtqTLln2a2s8qACWSTF5Yl39spEu9SvIvkkdhQLazocppGXT2G5qIx5AGZkh8NkvwnWn6ezk18uMcjx5/WJnJAnGSHsCvdwn6ZI7SeG4OccHmHQSBSszVxuEqsbgYqfDoymgR8mVObG5e1MkygGQNpH1IODJbZrNUSMLC96vdWaeturugJjFvbbtIGJ9JTJnjh5luuu0McvYPIoFpG8TUpJte1dzR0/ydw8XG7KJpB9ZTR+y7q5rUTEOm4GyEi44OnTYfGkBw336xXJpTSekJ/DIBQ21rQYBvd4ksiv06ywd2QC+Zkk7RjD63949oAL1dCFMWV5 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(209352067349851)(9452136761055); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(3231311)(944501410)(52105095)(10201501046)(93006095)(93004095)(3002001)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123564045)(20161123558120)(20161123562045)(201708071742011)(7699050);SRVR:BN7PR07MB4387;BCL:0;PCL:0;RULEID:;SRVR:BN7PR07MB4387; X-Microsoft-Exchange-Diagnostics: 1;BN7PR07MB4387;4:lHJQQlQ0XQ4ubHc0wXVmWrvEdYAM4a+YuMKxeceQ1Q9r2R9DwjrmjDgfjE7csdmrBSjYfWRLtWbToa79gizwNoEzouGvnrl6Jf5ceiu4DvRJ6ab0BZ8qkF2/VHV/2mpe0Xr8w4RGcJ1SabQFftLZRq2uYjlpZqtmA0xQJcUzWRDIq0Kf0SMg7WVF7nQhZ1a4x65DCArGYaju2WTLsUowjw1XgrjtWy7kNEAWicHA5Ljqp2aAk7Xxx82K/HyzXy80TtdZP536Rv6D6BiqqoH70XXE/xtyoXdoFGzmWeHazvH7DlNj2rMi6SzRcwZ2QBx2GtC2bcLqkDZ+Nn2DezaclJZVgeP27YaZlvhF6fc4Oy8= X-Forefront-PRVS: 0792DBEAD0 X-Microsoft-Exchange-Diagnostics: 1;BN7PR07MB4387;23:Y7geesSTWqLxiQSCelTgl8SyhWUi/Uxi5XDB7oxL29xLmj0lMteCZ7IJjK6HBAtTgE768x6D0/oyowhwK8qYnxZiv89DASkB4+agE6Z3GLCxIyBisaicOr0sB7aKswrlO2PK1q6M66PgUYC6OIpr8umcZN4P2fuS7dGKeDeLdHG285488LdRz29c571oEFXzc7sit+vXeGe5LGlPs5zLiXIfqVB+xSrtrS4Pt34BJW84MJHGN4jWyIWKezSnSe7sm0o7dtnjbDYn6hQ4y4CwDSdsa62/b40Ij6tyZTysJB+JzXywkii61IdWX1X4fczW/m2zaOM5S3mKyMsIfdq7HpGSLaXI9rNVFdiI02YcAtBHL9Wp8YXAooraWIbadFILPKmSuDhgH/+ym9QUhZEASvI5lZbqEWx0DmINwRnQ57EHEmePx03H+aZzR7rNFxdYEjkwShjpuTdwI6ardhMj5If3UUlnDHqmOOXetZnZuSF7ttnck6poJrxRVQNVuikfig8r9RTkRpUBoxpsUy+7eOwawpFrRBDjxlGTYKAlk/2QDgFS/tUDScl+/t22AOO6lYM1+zt2l0j/xIQNlYEwW3/xjurmx0v9eszCC6BQBCsBGL/IvrK8xIibkQBJ4L4BwjdAzRK3JbLZCFD1WaN90x/aBmDc8Ch7Tt8Jh44qACLfqIVuCe0PS5+GMnaZwBxzZQHblacpWr3hRaIGpu9Wwu33PC4D8Nb0agkzkacHJjTxoXfoWd6wfhT83rjiUd4aVUG/md0SOjkBrvNXw+yIh2KNFXAHqniNgprwXIyeHs91LY7o3W3gRCP/jrv/V/x5njtbenTNfvWuKhdbSQURxEln55NvcABwGihxyuZ2+eOc0iv22fMWaxnkO8lvVrlObtFl2azygrINAxSm6PYwW8qOM8EUtGYYJN7w3m+6EKRMuc2k1up+bdUEGG2+j3QdW9g4EMTLLKkxn9JdqI3nEItXqrHSPPWGnUwT9D4z0cJSpHTFjjImqGXet+AgFZVg1D+qLpOG4e/x3HGCrI9eMZlJRnmLmFhfcL77CjD9/SHWZryDUQseqJ8WDD+2gAcs8IWaHGLXD4Vjapve5i61vQCk8Lyo6NP/wkIDpzuX1c9AAlQwU2ohs9Dk509RVxG1 X-Microsoft-Antispam-Message-Info: xbb0zQxNcrKmqRwyqayTP9fIbVRTNWCdwOlI8xowU0WEHsCvZF8u6THLgacgtW0Zt+tIb36k2xFTZnqybvMGfuXYJHpcPDk04zoUkxw9JBktiIddYpR5fJuL78vEYNZp59qrI4S2D1nEPA8CQ4qTSOiZfw5MS7MmCxQl5xc0b/kyOt5tMuhLrrVOWcUljFMSWYeub7m9b3j2nhzyIVPjBJ9iZLXCzPvR38qc1dIBBnthDifpEMKBIQo5ZQG61ow0K/bYRm97k9WIG4JgpXs2P9hDRxt0UeSsSPadiZUOABx1rXE1rlLDx0CX6VWKLGHCCZ2eTCAAZcjkZ8CPKddL6IlzUwsdDpZEkj/2Km5mBeo= X-Microsoft-Exchange-Diagnostics: 1;BN7PR07MB4387;6:BQm7UxTFGZhEHTquqPCUegOco/rO/JWOI1jPtFzg6xVwH0aIQa7Ilo0KU1N1+jiStjxugixfluyJMgt1RNXRL/23l5NLeBoMx/2GsMkXi2x9uEjB8CckPYX32IX3rvzX7sCv1S5FMKE4RkjLZ5CJKPXKRoAiPoBQY8iTSdp4DpQ5lDbMe5ak/pmLx+7+sXPu5QrQFiMoFBX5ry4GNT9IabpCcAeH0JmYdukSifAZFdrmJ3HbQVslbxeWSNLT3FoYKy14WI3UtFLoxAMqeNjU5TpA3iUoxzo0higYn8uS6LEMvtqBnxZkh55qja3ZZx5FLv/x5UfyrQx59wU38rOo1a/HGTMXHZFAdu9t1MT/GTnK2AYlUjnyoz2EYVccFZ/3LIUSlCVFAB49MtPlXCPbUM3LA17nFN1tb8iic/OQurGpxJlA4+qLEDOnKhqC0TLK0fGT1ihrYq7Z2jY45uMu4A==;5:kb2fj4lW3eHcREADxGU4H7Tz4LneMraXpjEgWcmSWdhmCVvyvWkx8uUDWMa6PHFr33lFKUFhvjeiphCHDO/CIWqWQqK+fsbjGLxs6P7u+Bbt1KLZm2uHOQrNHOuweDjaZsfmpTK2cSILb7NOrRyEiRg8TvO28F8JUJaJsEtnjPg=;7:70MNt2qCSdwmxpQJH+be9CQp0JR4BMfvfChNJthtmlFn0KlXvANFwl/tHQZGeJHY3MM9U6G3kXzYmh6sAGdHJ1SdYRBu1rJsSYjOfu8F03RiBKIdG9TYMVLkK2YpQC9FrA7EpRwDQi0TSr1kaBqfvzLkIIGQ/Sij1RPcUPOY6UAX+tuOeISIpR29GSYm1JNdA61Mj8J6MOsdgZODeLAuOzeh4rfMjP+H0cj1baxoOrsezNj0NfruQrV6GS4c6nPC SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Sep 2018 17:18:41.9396 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 06d495b5-a072-4892-182c-08d6180a9f5f 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: BN7PR07MB4387 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: Quinn Tran if chip unable to fully initialize, use full shutdown sequence to clear out any stale FW state. Fixes: e315cd28b9ef ("[SCSI] qla2xxx: Code changes for qla data structure refactoring") Cc: stable@vger.kernel.org #4.10 Signed-off-by: Quinn Tran Signed-off-by: Himanshu Madhani --- drivers/scsi/qla2xxx/qla_init.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c index bd1afa3063ee..41e5358d3739 100644 --- a/drivers/scsi/qla2xxx/qla_init.c +++ b/drivers/scsi/qla2xxx/qla_init.c @@ -6784,7 +6784,7 @@ qla2x00_abort_isp(scsi_qla_host_t *vha) * The next call disables the board * completely. */ - ha->isp_ops->reset_adapter(vha); + qla2x00_abort_isp_cleanup(vha); vha->flags.online = 0; clear_bit(ISP_ABORT_RETRY, &vha->dpc_flags); From patchwork Tue Sep 11 17:18:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Madhani, Himanshu" X-Patchwork-Id: 10596003 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B644D14F9 for ; Tue, 11 Sep 2018 17:18:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 981DD29B1F for ; Tue, 11 Sep 2018 17:18:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8C64F29B23; Tue, 11 Sep 2018 17:18:48 +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=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,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 3040729B1F for ; Tue, 11 Sep 2018 17:18:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728071AbeIKWTE (ORCPT ); Tue, 11 Sep 2018 18:19:04 -0400 Received: from mail-eopbgr720089.outbound.protection.outlook.com ([40.107.72.89]:8463 "EHLO NAM05-CO1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728010AbeIKWTE (ORCPT ); Tue, 11 Sep 2018 18:19:04 -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:X-MS-Exchange-SenderADCheck; bh=QM1qL/NFJkzmlGlZVi6IdSbbjcMbchfP0vf9qdje6sI=; b=U4CSMB0ZxzZWkgbDnWDCyxoIhcconamrnnGKgBKd2/Z8GE+9R3bUA271jctymYrSv2bQ+z1WG2BdaXisDDL+2eK3y8H44XEwtykgU1pPV1PvYEOuEIgDclhQb3fLOWGUrcdrjQ5K8kfmflEqkFeRr6eCYCd77d/Wljp0cmb4KRM= Received: from DM6PR07CA0004.namprd07.prod.outlook.com (2603:10b6:5:94::17) by SN6PR07MB4399.namprd07.prod.outlook.com (2603:10b6:805:58::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1122.18; Tue, 11 Sep 2018 17:18:44 +0000 Received: from CO1NAM05FT061.eop-nam05.prod.protection.outlook.com (2a01:111:f400:7e50::201) by DM6PR07CA0004.outlook.office365.com (2603:10b6:5:94::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1122.16 via Frontend Transport; Tue, 11 Sep 2018 17:18:44 +0000 Authentication-Results: spf=pass (sender IP is 50.232.66.26) smtp.mailfrom=cavium.com; vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=bestguesspass action=none header.from=cavium.com; Received-SPF: Pass (protection.outlook.com: domain of cavium.com designates 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 CO1NAM05FT061.mail.protection.outlook.com (10.152.96.179) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.20.1164.5 via Frontend Transport; Tue, 11 Sep 2018 17:18:43 +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, 11 Sep 2018 10:18:30 -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 w8BHIT85029095; Tue, 11 Sep 2018 10:18:29 -0700 Received: (from root@localhost) by dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id w8BHITBh029094; Tue, 11 Sep 2018 10:18:29 -0700 From: Himanshu Madhani To: , CC: , Subject: [PATCH 11/16] qla2xxx: Reject bsg request if chip is down. Date: Tue, 11 Sep 2018 10:18:22 -0700 Message-ID: <20180911171827.29016-12-himanshu.madhani@cavium.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20180911171827.29016-1-himanshu.madhani@cavium.com> References: <20180911171827.29016-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)(396003)(346002)(39860400002)(376002)(136003)(2980300002)(438002)(199004)(189003)(26005)(8676002)(76176011)(36756003)(72206003)(51416003)(186003)(478600001)(42186006)(106466001)(69596002)(5660300001)(16586007)(356003)(50226002)(1076002)(316002)(14444005)(54906003)(87636003)(6666003)(110136005)(80596001)(50466002)(48376002)(11346002)(106002)(446003)(2616005)(81156014)(336012)(486006)(47776003)(2906002)(44832011)(4326008)(8936002)(305945005)(81166006)(126002)(86362001)(476003);DIR:OUT;SFP:1101;SCL:1;SRVR:SN6PR07MB4399;H:CAEXCH02.caveonetworks.com;FPR:;SPF:Pass;LANG:en;PTR:50-232-66-26-static.hfc.comcastbusiness.net;A:1;MX:1; X-Microsoft-Exchange-Diagnostics: 1;CO1NAM05FT061;1:6+ONMVZKE2wNoTpd7Mzc3bFwaUPO0sDE7gVn/5GROCADy25lFwFXJN764TFy72bUCULUewPwfst8pvC3aAjk3MDVAwEn3zLF0XS+PjLWXd9ejAxMqY4RtVOzHy3SWy6q X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2da5d393-97e2-4690-56e0-08d6180aa069 X-Microsoft-Antispam: BCL:0;PCL:0;RULEID:(7020095)(4652040)(8989137)(5600074)(711020)(4608076)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(2017052603328)(7153060);SRVR:SN6PR07MB4399; X-Microsoft-Exchange-Diagnostics: 1;SN6PR07MB4399;3:sIuR+RSxmK/uCY0NM96qEedWXuqddFV+lm99icXzuFaOnmK8GGDLaxmfrIp5mwa4en5+25pN0Uy8eywrUeEtULIKIpxuFLjA2oPyV1pkm8apFVurTSAocCuKQrW/rz+ZR4pvvsA+fauXeBU/o4ioSmXfLnLBWBl4BYPAzaIcFl2nCwmwqVrHvsB09oGwAq/7guApMM6xPcvVdudYFwvvp6XvI2RTb24plAR+LdjrcywfMBNpEuhc+lBhYylFta5lsFBq1RSRFWW2GFeENWqg/XEKBsWaszw+i6sRdy8IbqV1rW9LJ9HWYU91b96h5EVZkHMSYirB5fxOO9hGco7UOmA5+FWc742Zv49dlnieXbY=;25:0IPkC/PhSNvvuUjCqhGjWJiP1Dvl3tnBC2ezyoJr+Q1wta5Q5VOzbhwRTQs+W7BSCOqSqIEABDtqUwRJMHhdKJ507Mv7IFrHUkP+/zgosbCR2vnbSRWt4+OL2CDPY4W2cd+J+/r5GXEmm3dMd03eXbDdq9ur1om9EhOETl1xwjdCE9Mfcw3lb/fPJxc7GDK/K+WWdWmBcDVtptKndhhMUxfmNBD8vSDr2yhhaQSwFg3lFYQ/IWVu0TqDmu5g3oo0O1qfiXkVlNqogGcs7R0T85bAGV9iTH5Cb86KGqoq9RffQ+dgObSrdmI+Cv0KLdP5G90Cq6WR2fTQj4ZF1nxxuw== X-MS-TrafficTypeDiagnostic: SN6PR07MB4399: X-Microsoft-Exchange-Diagnostics: 1;SN6PR07MB4399;31:UmMwQt8zwWT1w+b0PIMAgL9+D6bMrQy9+SsIByCKcMkVlahA9nIhvXqbsBxHXmeSEwautA/7y/tC0dfSw0oHShq0bTn3oAH9SvfpwT8DzOjIFvTL3Fvt7exTkU5rXj+Z/YwpKusbji6jxHn4e6s/DldmKqW/kTD8MKoE9xJ/5ntOAMoBfYM9vIibdkQlS+r6GUoRi6paIouQ4RACji1zfKMegCGERVts9FCzIEp1c0k=;20:lbPXtVflEcfZYT8DMMevpIJ0EzbmbcrY4y8hXeJtxjwFiwPPKBE/1IkOYSed6UiCv8PbHkb+xO/0xwqj26+GtHBNiS/+Ft6FdWkX3huSKRpTS5aoEh7LJQahRqZ0ADOiE6P7nHBAJAgUtrZSW0G9l6LT1Eysh+W7DQicwe+h7gTSqiZFmujIrDoRnIwvXVJXOW5KMktCusD1QPfID1OXxn3SqxBX96uUe1rYYvfvE9fdvXhEBWIVpEogywRE2uwNYhxt8bJkv3mlNi7kLFAMosAhdwLvkE3V18z5Np0WzK9s7ltNVGHzuhjWWZusobHc3eHzqDPiRCY9TzhUWuFGkxZo+LXLrUwE3N9fDq0iw6B0UFJjAwXFZe/SWDIhG5hU+getTu7EnM2pRbj9783HAPgIUT++7EN89gR5F/A6lDDBDaMB9jIWmRq8T5Goag15WWcN+smEFmYxMkFZciZUuJOQJC8tmEpXJsF+4+o6j7j7enQ9bgL/Z9RF5KJC4ABx X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(9452136761055); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(3231311)(944501410)(52105095)(3002001)(10201501046)(93006095)(93004095)(149027)(150027)(6041310)(20161123560045)(20161123564045)(20161123562045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(201708071742011)(7699050);SRVR:SN6PR07MB4399;BCL:0;PCL:0;RULEID:;SRVR:SN6PR07MB4399; X-Microsoft-Exchange-Diagnostics: 1;SN6PR07MB4399;4:VKJsWvKMUnjhZ7MSbIc2BGt30S6/MmONOsVKPQ5TuMqbj8k925HdabeZTqh/j5HCtZ3vYj/R0Tyi++Ta3bbUVx1EmxYRe2+xPVKh1ViPMKyrsO4hXXhzDsqBbJUJm+VapQFTEgWWLnvY3zXDfZM/G71B6qexzACfogMTjXhCWvqolS8Oupty3V8QwdReY4q7k0dR9d/c3C6fz3NiLqdWFMdObyr9KQxU0DLHOPwOMJCrDntm9mYkcoSk9Im1jzEwFnVQBVIUiTNJoJvUmk7gpmdiAK80Cn3a6r2oR6fjUfl+tFp37Fz7Kf2eRDfvCMDx X-Forefront-PRVS: 0792DBEAD0 X-Microsoft-Exchange-Diagnostics: 1;SN6PR07MB4399;23:B1kA3pi1A7NIJhxM9XxJcTUmi7o0H3+qqfb34NGVGqajLccjhM+ZWC3g80fotngoFZqPM8Wk8HRGBvDyz6sLbnditgb0XuSySvt3ZCn/PETwXjxjERrqlRijr8ngKXDMT0LLws6G0/FeVegR9SSqUZjaoLQAvNmAY62Ty+f/ihAYeRQU+ciyFT8+b09Ai9AR2EPK6YA00+93htBJRJRtmwFZ5uH8LhqUtgx8h6C7xWe3HZSjcb+QEMIW2QMa1UWdhWB3c6oV1piHu6s2g9SB8PvQQuqfBILyciZrOu/vue8zNHC2ctbKZRNyIbCD2nb212uJ6SqCpORNRyvS7jAljdLQqKZ+q8ylUrXPX7rtgJNfu/OLk13LFnBMQ0mGDMzWO1WKbqwH4vuEIVU/F+IPg0EBwqnhjivRWXrfEfhSADrx5cFpcuFe62r3a3u45oglQdIJVSps+HGY4iMwGGTvxHnBxVkuozi2O9I0rlhmND1E+HS6YapXAI6svpPVOjszaZJahdWkklZckXEpPoZkHeZL3J8b2Z+5kqTbTYn/zrcTCtoPy4XpYiRPKrFGsplkoshxZUEjYRkvU/sPDY3kCn/W7rBMIYnTUQ3DhBrTKZKfgkXB2yTTdu/Ql8z9twdFl+u0BL4MjUtaxIo3w40xtIMNMF4WWTB0kaa6itm+2NwlpLPccauAXG6PtFHwuyx38z+3f0WNBvocgsEAh+mK7QlsBRCiVJ7GAgLzAWmjWJLN8Ah2gaGMTC3hKzN8shSdkKyLno8ro/AhsMOpmhQe1aV2bBp4Jkr3zHNCvzztXBnYQ7ykP4xYQFA12nTKL/1PWWyn7UqrOo3F7qkCSUx8vvJ3wgT5H2LzIgeoTO1p7d44n4DPrcjgFI5MIaeBGrGTs7CbBynEeyqwSsRB45O9idfCL/pKidSnf0DMYlEaZDipwD5aEAKaMRjlvi/Uu4ZBCFy6+liQkLqHRXijSnr2zf82xBGet6FMQM1+j+f7Y8kx5f4wLKzY68nZahgJIfa1aAVpTOrRZ5PmmNDE/G3KF4O4/wWemkIKsZ+PVNWbFETrGPzrKEDdkq4zywqCtKA0FGviIB5/c/mQEVIFAzdUQDHhEA8nuEtGG96px4P473B8x45UVc63M/HcPpoMzmLb X-Microsoft-Antispam-Message-Info: 35TXDS/fxfBDr05K2WIos5DITCIKNdqp59xG+sID1QMyJ+Yeo4kSHtAyYNvL5Yo9lT+h1TpO0SSUsH9dV4P7NnhmaaHbcU978gw6G+NwPG9BNJ7Qd+0pRXtE1g5fD29PyhCCLUVeo1M0kRwkAW0mQoh/jQMtsYc+vTM4pW91erFVBhpLWbiBaCASFGyxoMFipRian/fXybNPuoJN8taTuDRFKyp61Mffocu7PwVCwClOApX+MelVo6YygsrHyjdQffbjU8N+dcbUMlZU4yYw0RwspqqJCz3t9H3gFGu36z40vQc6n5yKFPL2Wm06yLu3c8LV+HMmtMe4Syk2YUhLp3d48W+wx57/tTvR4LndqRs= X-Microsoft-Exchange-Diagnostics: 1;SN6PR07MB4399;6:gkY33c0j3K521OZqcaEnPhCq3sh1fqYHkGALnBytCbqmS5WA+LZn0sZ7ahY67t1SBT+aZKIA1QH02G2Xg0XZgwfxlWR4Co1wmlj+wnE0Vgmzho8TGsIQjsclu2YL06qQJnUeAw0HA6S+D4TlTH4Z+q+4uWO17AKKx9ErJaxxbJJeJh4tD5vD1GuYrrA8sFRgk0lBF6L+LdF72HX/WRNQ35wRoCDptT+dU+DUS7mqnNWoUbs+msbtESaOtatyoZyM87hSmt9xAl9BZocA5M2t7Oa4vXHBAqfo38AXsfhAkIEDDdsR8rglkn0lcGyGuWDoAog4PSeFRpVDFuynnCo12Uu7ZNaXfilPzixSEQvga1LsZeJlYCvjHoPfNFWx57H+vMVri4YYSPkijxiAlLyJ/NkJgFVgx8Jt/Xb+iBzo2JDdawinO/z50HjdT4mFFYqNSB/b/m4KahHRUoEqwIa4hQ==;5:tpNcCf/uME6eU0L3chnJn2ddDmLOIBIxVJV1eRxJSb1H+YSQ++3llYM/gp3aGO4k+3C+sWO+R25jwrI6Do7755JiBA4RuM83EOTcoG7SH8nGwDQqbBjXcPEzQqDUmNl2fg2oVyR89yi71ZuM+7rXATOq4wHJF2Y4RaexJHPBWgc=;7:T3k2tFuZYo4+9h6c+xq0WA5dWmuvO3kzPIoCOA8d0z0pPQfYQCVf4q+qvE47gDcemdEHoe/9KODSfb5oLvo4wL6JxENOg+9qEVDziCUpP2MO+53uoH5qkCIF94AViMZhGdCp6y5hSbaY9y7fijlzYO4JnI9I9dq+gTP2GhvyWOVz66XIH9DgWoJRBD56rkyuklJQTrYkxxMytrpWT4zm4kDakfAN3O7kp9QL9bLikFMvLRpksr3u/hyu5OXP2lGn SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Sep 2018 17:18:43.6845 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2da5d393-97e2-4690-56e0-08d6180aa069 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: SN6PR07MB4399 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: Quinn Tran Reject bsg request if chip is down. This prevent erroneous timeout. Fixes: d051a5aa1c23 ("[SCSI] qla2xxx: Add an "is reset active" helper.") Cc: stable@vger.kernel.org # 4.10 Signed-off-by: Quinn Tran Signed-off-by: Himanshu Madhani --- drivers/scsi/qla2xxx/qla_bsg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/scsi/qla2xxx/qla_bsg.c b/drivers/scsi/qla2xxx/qla_bsg.c index c11a89be292c..4a9fd8d944d6 100644 --- a/drivers/scsi/qla2xxx/qla_bsg.c +++ b/drivers/scsi/qla2xxx/qla_bsg.c @@ -2487,7 +2487,7 @@ qla24xx_bsg_request(struct bsg_job *bsg_job) vha = shost_priv(host); } - if (qla2x00_reset_active(vha)) { + if (qla2x00_chip_is_down(vha)) { ql_dbg(ql_dbg_user, vha, 0x709f, "BSG: ISP abort active/needed -- cmd=%d.\n", bsg_request->msgcode); From patchwork Tue Sep 11 17:18:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Madhani, Himanshu" X-Patchwork-Id: 10596005 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 38CCE920 for ; Tue, 11 Sep 2018 17:18:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1BD7C29B1F for ; Tue, 11 Sep 2018 17:18:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0FE3829B23; Tue, 11 Sep 2018 17:18:50 +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=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,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 7AF8F29B1F for ; Tue, 11 Sep 2018 17:18:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728127AbeIKWTG (ORCPT ); Tue, 11 Sep 2018 18:19:06 -0400 Received: from mail-bl2nam02on0051.outbound.protection.outlook.com ([104.47.38.51]:34336 "EHLO NAM02-BL2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728010AbeIKWTF (ORCPT ); Tue, 11 Sep 2018 18:19:05 -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:X-MS-Exchange-SenderADCheck; bh=pyA6XakyqvfMV9DpRqFABpQKjSypQgJd01c+GralKEI=; b=EZK/B1YoEV8sQpwwwiAD9tPkYiW2vfI3myGDRPF2vlbDEaSuE7S2N1k0Ll3K8IJijW9XYjNAhSw4vB9yCMsEVCSLqFVGT2f5JALC/LJAF3DSXaD4CsBfbmkT7atOAimBB0R+1X3aJGo9vfkmKebtpSzkOu8d47j+5m63Ma4z0fE= Received: from DM6PR07CA0011.namprd07.prod.outlook.com (2603:10b6:5:94::24) by DM6PR07MB5498.namprd07.prod.outlook.com (2603:10b6:5:30::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1101.16; Tue, 11 Sep 2018 17:18:46 +0000 Received: from CO1NAM05FT061.eop-nam05.prod.protection.outlook.com (2a01:111:f400:7e50::202) by DM6PR07CA0011.outlook.office365.com (2603:10b6:5:94::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1122.15 via Frontend Transport; Tue, 11 Sep 2018 17:18:46 +0000 Authentication-Results: spf=pass (sender IP is 50.232.66.26) smtp.mailfrom=cavium.com; vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=bestguesspass action=none header.from=cavium.com; Received-SPF: Pass (protection.outlook.com: domain of cavium.com designates 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 CO1NAM05FT061.mail.protection.outlook.com (10.152.96.179) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.20.1164.5 via Frontend Transport; Tue, 11 Sep 2018 17:18:45 +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, 11 Sep 2018 10:18:31 -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 w8BHITT8029099; Tue, 11 Sep 2018 10:18:29 -0700 Received: (from root@localhost) by dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id w8BHITao029098; Tue, 11 Sep 2018 10:18:29 -0700 From: Himanshu Madhani To: , CC: , Subject: [PATCH 12/16] qla2xxx: Fix premature command free Date: Tue, 11 Sep 2018 10:18:23 -0700 Message-ID: <20180911171827.29016-13-himanshu.madhani@cavium.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20180911171827.29016-1-himanshu.madhani@cavium.com> References: <20180911171827.29016-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)(136003)(396003)(346002)(39860400002)(376002)(2980300002)(438002)(189003)(199004)(51416003)(76176011)(81156014)(8676002)(4326008)(81166006)(47776003)(6666003)(2906002)(69596002)(50226002)(316002)(110136005)(54906003)(305945005)(14444005)(8936002)(356003)(50466002)(106466001)(36756003)(48376002)(476003)(44832011)(446003)(486006)(86362001)(11346002)(80596001)(87636003)(2616005)(126002)(106002)(16586007)(5660300001)(42186006)(26005)(1076002)(336012)(478600001)(186003)(72206003);DIR:OUT;SFP:1101;SCL:1;SRVR:DM6PR07MB5498;H:CAEXCH02.caveonetworks.com;FPR:;SPF:Pass;LANG:en;PTR:50-232-66-26-static.hfc.comcastbusiness.net;MX:1;A:1; X-Microsoft-Exchange-Diagnostics: 1;CO1NAM05FT061;1:cSmatDChGBxfaPeegAWaAY3t78m6ecKbkGWC9NMlPjNKrYn4kOglGHDR+OPS/IlwKpbVeRQawPul96RqbM28LtqGKwywMOFgFEe8zxsh66ZR3rL+mTWRicGB30Khjf+I X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7fbb3a7d-d49a-414e-33c9-08d6180aa1ab X-Microsoft-Antispam: BCL:0;PCL:0;RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(4608076)(2017052603328)(7153060);SRVR:DM6PR07MB5498; X-Microsoft-Exchange-Diagnostics: 1;DM6PR07MB5498;3:Q9HId7VUhEZiaxZlM+Twamm0L0jZIg0JuLokIjYqzvqML4Q6zoAO47IJxi77gtvi6dlBSoQLgIQsbR5cJz5mKHPovQtA0700Ir1Vtx4qBRx+AvYnUzRa6MgMLbUU4GTVwz0Jqj6XNECVkGuHm/GeSTTXBD+K5eKE+gos6G+zRO+OYTKuaceQnUk66NTCqM8PKgXOZoTcC+1i5oS1+T7dwgon96R/j5Wbnr+KBLGZpuQedk/o3LvuM+cQad5j7Z/XnjmnwOhcpdzmMTmTC8R7LlayiQUMj47OUUQuXgtY1yK7M77CFHdOE0kFkSHtZtIb5aM39YjMUv5+sNXObQ6S26r2K5cIjHvQMHxtXWwjKvg=;25:2HuohjGeMclE8x+fVoMCEQXSCVWpjCV8DDRpDk7Sk/5g0/0pnZHW83y8mWPAMQxHIf1bEVIPXYLvVDRBQO/JXla7QwSqPuArPtQx38A2avZ58Rv8FjkBrNKmM9SN+IPWi7w+IsTPA+Lbt0N+5YshjGFLpZr44HCZGjV1zmLbdNKLstvPsmhu50SqL+J2sCbMNiST4LGgvXX71cUdyGB20bO2tug3H6RVqFllUVvEntzHUJ3nU9X1kku4VFhlD1Q4sNIXvLYKKs7tJqHAjuybSvEw3B62QFntxXY9odFE0olgv8DrQqeSIb6w1wObycuDdg5krNuschFqfk/oevXEtA== X-MS-TrafficTypeDiagnostic: DM6PR07MB5498: X-Microsoft-Exchange-Diagnostics: 1;DM6PR07MB5498;31:9TdB8TbJRhlUyTAGlnaUJ07XytQskJaeadm10Pvh3qWtkE7oygYOXtjrRhT1fgJloExA22bvsl+O7GYTw6TgnmrFmnTUlKQ2JafSsyKnx4Q4/TnF8evB64F1p+wv8AIqHlof/UGPcHDdWeTD1tsDQSsSxMNJIbzYc2yesPrVmyAt8/9OxvIioppuX47DPG0RwXC/hCcYDjd284qwLC/6oyKsAMvATdA6gMVI2e+vmZQ=;20:xdDnAbRCEedqyKGFCwckPV5mcYydN2ast8DyTe+sfGicVv4ci5R1NyKHdcPSGBgIlrTC6qVJZK3F/m9xyv2mzYSdauygjRZsbGoHHg3X3gm9o1nkmj+Hun8o0xAarypKqjqOFS7MNp4T1xdHUeWhtMT+6obauq1l5NObTE5Cdr7wjK5eHkbrc+t7E9M5ItVycjZVc+GMZ88zDL+0tR/HxmNIJSx/eSRgQfU8dkB1BhAC5IB+NMugzXKKcR+mQ+xK5WrCVJWfHRd1PIu+Oh17sFtzlk37aRDdNxbfa4kSP7mAsc3AeqmEMR9LXHILLvGhCrdYeZkF3Qf/XbkDfS7k6oI3HGHGMSVV0GvExHu7vzpQ2S5NNZuarf6Yj+GBTJSDKn+17G7uFZFQJBZfCkBN2PzuJVZSSeMlOSox9QV3jYSholXVvobcln1pPZKUswXYM4ETA4wJvIlOkAcCyeKSiamO2UtY9CmCUp7icWTZRPcwuLEFIY6T+nPCxWP4WGcC X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3231311)(944501410)(52105095)(3002001)(93006095)(93004095)(10201501046)(149027)(150027)(6041310)(20161123564045)(20161123558120)(20161123562045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(201708071742011)(7699050);SRVR:DM6PR07MB5498;BCL:0;PCL:0;RULEID:;SRVR:DM6PR07MB5498; X-Microsoft-Exchange-Diagnostics: 1;DM6PR07MB5498;4:ZOyAu5O1EfBkvUIxIMnS+uF8/Ga7lhd0W/5HkmtiXlpdT1f56OOMr2KXX5fGYns2KkymKcRMwIIz/2sCymIS+jc4v+sHwimushlAr8tSvKZOMgMTPuZwB6OKH9Ot4wn0tLaeju7K2YsweTtOgeGC8MHQTPm1sRaL0weGMcrmIA6usRDG56ntx9ou3LaR4GA9zXxSx0moj23cRIgjp0CLQYS/B+81ar1J5XOvG+iHhUJaH/mToF1h3LmAkVVws9fvsf8llgqwU7dBhz5S544lJw== X-Forefront-PRVS: 0792DBEAD0 X-Microsoft-Exchange-Diagnostics: 1;DM6PR07MB5498;23:P8yDoduyeUEDio98iL9zTBbTTYqsIJlxfOySpmaB7ymDEVFf68X2VVa2bKdLDVPwKqioH8RQSSrkfiD3AtgW0H8M1/0QwDc6lF2helGliisK3V31DvwiVkNKvJ2il8if5DMsz2VfT9zE6BRIDkGDb9oH6XJfrmtpLQbkoInuUdCN7l+X17wx/PZwKvM+Yu9172lBC9K7a3aIh8ypzpFrF2IwxpFXOAMYqDbTIQaOQwZrhFw4Do0D+zzVXK08vsu2tUpa21EYwGUTrIRI+/6a/7n+i+tjmp30pKS4XtQOqZQazGAK1ehNVpQGMOOdVksTdqrRsijqoNznE9j6bsKcK66mXqvPk8/T2i5o3ANpqfkA0PX6Q4eawekNm9EESpXkeAjxKfAJhlTvaM5wunCMWom3uA4fqyMCURCJEVC0Z2xfmMyttcpUCVF/SWWbsStWFoQ/jBlLy3zzIHexfAAOtUwREE7qUkWNuPqbWysKVoawtYU2Hmk69+YdVEcCKPScKkvg+f7j54ROf2AFwUTksZ0kyJGX0jc1zMP/ixVB0s3ti3f3+lkP2d8XUJZUg+S7htWbN4klpxjBRt53MHJw5/8nihu7/v2JMmqr2NGQWbKRCOtNlrSmdGDBXEJQ+ZWGHc6lWiTau5uf3jkBxLSZZEUGLPW1k5ge361ZZ5zNVvJr+cdI9eoPhdQ/3VRM+ozYfOjN5n0IbhBadR3ynlCEwMq/l7rIRz4oLjm8Pxbk6qF/fJ+dkJMsoO5l7SW5T0n/OhRWLrfbaf2vIsxh0B37fgighHsPHX3LOh4nMFbfISLnOPvoxj2fusVw+6FZVRnBVKr7/1UWE8IT8UuqypDjS8A5NeqpaTv0eKTVnhzLCxtZt+KhU34kFaSfupDmvxrcXdpG9x920f6H+ozdvNF+AIyatngRJ1nKDNLzz/b86YuAdNPA7gH3MawBOUwXgLugSkFYFZsu8WBTsWl3rXJEHxkYCeg1VYhrlq1jwgkktiJsxidoumAF/sPKPEazE6hzzhqsG3dzkFBtEK/DklwziWPCNIpgigl/u87+dyAtZlHLza71osfVJ5zjJtYxZAXCpRQviMdTCAtwHrhjOmuDHfk4Bw/bmw9/6GjanmoG+GlYPJJAUUn8Cd2AKoOPmvfH X-Microsoft-Antispam-Message-Info: Ytb6tjfH1sAfDMcV7qYbjdVtZlN3Oy2rqAJJmZ2ONJpb3XLCiOsEz0ZRS6jKi5mbtVCGUDp9wnPLpr6a5y8Ed7sSlN9kCuF5MN74GObUgef/x+nuhl6jMNpEmeQ5QbRFBIUIO7Yv4Ecd08kuMuBRBMkRbgF8WBYukLbZA4weHWylW3ncLRkPDUntEE4/wpr3rN0+LPQBf8pFPFtff63NUDOC8PctPmO0E199cJ8tjqmJPB5tTKD7gQsFZIOqP/GnGjNQdyQNIac387nF6HwO4VEGL2vU+/GmTzojPa5ncapBwF6ZTVnqeC5PpreyLGhJJZfr1smmGOEmKV+5R0RZBSsanhZJw69HGjeKYTGPECQ= X-Microsoft-Exchange-Diagnostics: 1;DM6PR07MB5498;6:oAJabic4wwiIAju8Ewob/RnpZPe6Puw5gKek4vxcKxCPqevCS4I3W9ODwOuZDdEffXe0lnWZvQkbHAjKnRITstcCg/p+LMQ+1TnUodkCJwimluaPTyrSqTduDu1uJJXeyayPUa9g7hTuXwhk8528iOYwB1VrhuPX88G0jgTfoSZ6hv8Oplq9iPMItxKVJzTIwQDJbuAJSdmcuPotm6xVgqBkUAbJRfzGRgf018x5niRcsj+HzBNnBGfGlIOPsUDVAjL6MYQ7BOybflnXK1Z7T0fFFL52Pbm95eErTuC0j6w3h06m8xPyyNRMRzd2KS3sbX4ODVlzNcaWj0DRhouek2TmoWrHIexw8zwDyIjyR+m4vfXZ18N500kEEG4ZsJei2MIv3esETikHrQL4xlSeIS4GmymbtAb0DZ9ZcGJWc0rvS8CiCfIMl7E7fY3dPRz6DRQPS9VbdKAgg6JVYHXLpA==;5:eY64A/3dpigbHeDbyVzashVpO9DUXE1HM3xF9PYJOGti2UGNpbKz+wfXzzX7Fh8omFx9bh9kjFcqyG1NReJgASoMG4aPN0t/ddlKR7m/F4ezo7XuDE+XhjvLudliSdVbnZ8mADcxz0dI6B7ua92nwp26qE3r0du7senzwV4I1XI=;7:9kUVrTKFHxo6OjtGL85zn3KQ21i0gmf7fnHTIu3pZ03erIGh34vbAXko2YWllUPDg+n8Y5HCRPEs6JWdbSu+diuYYIoR04nlk/Eu+NXJI80xq0637codniCQ4o3CV8UpaZC34FGrZOVSSVrnpHwzE15CD6D/1luhBfBt7ofA39igDI70idZNwS+zPnOMsQP+M90vioYZNoEu/I4Y4LdqKEx+hUt1o7DeD/9x27ZdnjXFR6dRDgipfuoSsC2+5Kv0 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Sep 2018 17:18:45.2470 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7fbb3a7d-d49a-414e-33c9-08d6180aa1ab 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: DM6PR07MB5498 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: Quinn Tran When qla2xxx and Target Core gets out of sync, during command cleanup, qla2xxx will not free command until it is out of firmware's hand and Target Core has called the release on the command. This patch adds synchronization using cmd_lock and release flag. if the release flag is set then qla2xxx will free up the command using qlt_free_cmd() otherwise transport_generic_free_cmd() will be responsible for relase of the command. Signed-off-by: Quinn Tran Signed-off-by: Himanshu Madhani --- drivers/scsi/qla2xxx/qla_target.c | 4 ++++ drivers/scsi/qla2xxx/qla_target.h | 1 + drivers/scsi/qla2xxx/tcm_qla2xxx.c | 45 +++++++++++++++++++++++++++++++++++--- 3 files changed, 47 insertions(+), 3 deletions(-) diff --git a/drivers/scsi/qla2xxx/qla_target.c b/drivers/scsi/qla2xxx/qla_target.c index 666146a86d10..a69ec4519d81 100644 --- a/drivers/scsi/qla2xxx/qla_target.c +++ b/drivers/scsi/qla2xxx/qla_target.c @@ -3383,7 +3383,9 @@ int qlt_xmit_response(struct qla_tgt_cmd *cmd, int xmit_type, cmd->state = QLA_TGT_STATE_PROCESSED; /* Mid-level is done processing */ + spin_lock(&cmd->cmd_lock); cmd->cmd_sent_to_fw = 1; + spin_unlock(&cmd->cmd_lock); cmd->ctio_flags = le16_to_cpu(pkt->u.status0.flags); /* Memory Barrier */ @@ -3462,7 +3464,9 @@ int qlt_rdy_to_xfer(struct qla_tgt_cmd *cmd) qlt_load_data_segments(&prm); cmd->state = QLA_TGT_STATE_NEED_DATA; + spin_lock(&cmd->cmd_lock); cmd->cmd_sent_to_fw = 1; + spin_unlock(&cmd->cmd_lock); cmd->ctio_flags = le16_to_cpu(pkt->u.status0.flags); /* Memory Barrier */ diff --git a/drivers/scsi/qla2xxx/qla_target.h b/drivers/scsi/qla2xxx/qla_target.h index 6a59c99a63da..91403269b204 100644 --- a/drivers/scsi/qla2xxx/qla_target.h +++ b/drivers/scsi/qla2xxx/qla_target.h @@ -900,6 +900,7 @@ struct qla_tgt_cmd { unsigned int aborted:1; unsigned int data_work:1; unsigned int data_work_free:1; + unsigned int released:1; struct scatterlist *sg; /* cmd data buffer SG vector */ int sg_cnt; /* SG segments count */ diff --git a/drivers/scsi/qla2xxx/tcm_qla2xxx.c b/drivers/scsi/qla2xxx/tcm_qla2xxx.c index e03d12a5f986..7d3d4a82fe96 100644 --- a/drivers/scsi/qla2xxx/tcm_qla2xxx.c +++ b/drivers/scsi/qla2xxx/tcm_qla2xxx.c @@ -277,14 +277,25 @@ static void tcm_qla2xxx_free_mcmd(struct qla_tgt_mgmt_cmd *mcmd) static void tcm_qla2xxx_complete_free(struct work_struct *work) { struct qla_tgt_cmd *cmd = container_of(work, struct qla_tgt_cmd, work); + bool released = false; + unsigned long flags; cmd->cmd_in_wq = 0; WARN_ON(cmd->trc_flags & TRC_CMD_FREE); + spin_lock_irqsave(&cmd->cmd_lock, flags); cmd->qpair->tgt_counters.qla_core_ret_sta_ctio++; cmd->trc_flags |= TRC_CMD_FREE; - transport_generic_free_cmd(&cmd->se_cmd, 0); + cmd->cmd_sent_to_fw = 0; + if (cmd->released) + released = true; + spin_unlock_irqrestore(&cmd->cmd_lock, flags); + + if (released) + qlt_free_cmd(cmd); + else + transport_generic_free_cmd(&cmd->se_cmd, 0); } /* @@ -325,6 +336,7 @@ static int tcm_qla2xxx_check_stop_free(struct se_cmd *se_cmd) static void tcm_qla2xxx_release_cmd(struct se_cmd *se_cmd) { struct qla_tgt_cmd *cmd; + unsigned long flags; if (se_cmd->se_cmd_flags & SCF_SCSI_TMR_CDB) { struct qla_tgt_mgmt_cmd *mcmd = container_of(se_cmd, @@ -332,9 +344,16 @@ static void tcm_qla2xxx_release_cmd(struct se_cmd *se_cmd) qlt_free_mcmd(mcmd); return; } - cmd = container_of(se_cmd, struct qla_tgt_cmd, se_cmd); - qlt_free_cmd(cmd); + + spin_lock_irqsave(&cmd->cmd_lock, flags); + if (cmd->cmd_sent_to_fw) { + cmd->released = 1; + spin_unlock_irqrestore(&cmd->cmd_lock, flags); + } else { + spin_unlock_irqrestore(&cmd->cmd_lock, flags); + qlt_free_cmd(cmd); + } } static void tcm_qla2xxx_release_session(struct kref *kref) @@ -499,6 +518,7 @@ static int tcm_qla2xxx_handle_cmd(scsi_qla_host_t *vha, struct qla_tgt_cmd *cmd, static void tcm_qla2xxx_handle_data_work(struct work_struct *work) { struct qla_tgt_cmd *cmd = container_of(work, struct qla_tgt_cmd, work); + unsigned long flags; /* * Ensure that the complete FCP WRITE payload has been received. @@ -506,6 +526,25 @@ static void tcm_qla2xxx_handle_data_work(struct work_struct *work) */ cmd->cmd_in_wq = 0; + spin_lock_irqsave(&cmd->cmd_lock, flags); + cmd->cmd_sent_to_fw = 0; + + if (cmd->released) { + spin_unlock_irqrestore(&cmd->cmd_lock, flags); + qlt_free_cmd(cmd); + return; + } + + cmd->data_work = 1; + if (cmd->aborted) { + cmd->data_work_free = 1; + spin_unlock_irqrestore(&cmd->cmd_lock, flags); + + tcm_qla2xxx_free_cmd(cmd); + return; + } + spin_unlock_irqrestore(&cmd->cmd_lock, flags); + cmd->qpair->tgt_counters.qla_core_ret_ctio++; if (!cmd->write_data_transferred) { /* From patchwork Tue Sep 11 17:18:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Madhani, Himanshu" X-Patchwork-Id: 10596019 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 36F3114E5 for ; Tue, 11 Sep 2018 17:21:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1C89A29B57 for ; Tue, 11 Sep 2018 17:21:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1020329B77; Tue, 11 Sep 2018 17:21:49 +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=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,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 9B3AE29B75 for ; Tue, 11 Sep 2018 17:21:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727419AbeIKWWF (ORCPT ); Tue, 11 Sep 2018 18:22:05 -0400 Received: from mail-sn1nam01on0066.outbound.protection.outlook.com ([104.47.32.66]:34842 "EHLO NAM01-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726800AbeIKWWF (ORCPT ); Tue, 11 Sep 2018 18:22:05 -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:X-MS-Exchange-SenderADCheck; bh=vMdXStD0wdXi17HFr11P4t+eRl22vMuobFK5ZtJJLlY=; b=Mc3t/3AHRCu8EZWYT9RN95Ejtdnc/pAVUoKf0Lvxn4UG8q09sTXhG/eyQhrbQyWU3UoZ7Lpo+k73Lv77vTFu43N+s1ds50pWtW3QnLnoTg8p0E6UIPOeGQrAU37OVtE+1nRfBZvk67vPeOXC/Y8pod2+2ap40ecrgjYKpS37FOU= Received: from DM6PR07CA0007.namprd07.prod.outlook.com (2603:10b6:5:94::20) by DM2PR07MB1452.namprd07.prod.outlook.com (2a01:111:e400:50c3::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1122.16; Tue, 11 Sep 2018 17:18:45 +0000 Received: from CO1NAM05FT061.eop-nam05.prod.protection.outlook.com (2a01:111:f400:7e50::205) by DM6PR07CA0007.outlook.office365.com (2603:10b6:5:94::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1122.17 via Frontend Transport; Tue, 11 Sep 2018 17:18:44 +0000 Authentication-Results: spf=pass (sender IP is 50.232.66.26) smtp.mailfrom=cavium.com; vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=bestguesspass action=none header.from=cavium.com; Received-SPF: Pass (protection.outlook.com: domain of cavium.com designates 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 CO1NAM05FT061.mail.protection.outlook.com (10.152.96.179) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.20.1164.5 via Frontend Transport; Tue, 11 Sep 2018 17:18:44 +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, 11 Sep 2018 10:18:31 -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 w8BHIUHK029103; Tue, 11 Sep 2018 10:18:30 -0700 Received: (from root@localhost) by dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id w8BHIUXh029102; Tue, 11 Sep 2018 10:18:30 -0700 From: Himanshu Madhani To: , CC: , Subject: [PATCH 13/16] qla2xxx: Remove stale debug trace message from tcm_qla2xxx Date: Tue, 11 Sep 2018 10:18:24 -0700 Message-ID: <20180911171827.29016-14-himanshu.madhani@cavium.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20180911171827.29016-1-himanshu.madhani@cavium.com> References: <20180911171827.29016-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)(376002)(396003)(39860400002)(346002)(136003)(2980300002)(438002)(189003)(199004)(87636003)(86362001)(42186006)(476003)(16586007)(76176011)(11346002)(51416003)(72206003)(478600001)(2616005)(336012)(1076002)(316002)(47776003)(54906003)(446003)(36756003)(110136005)(126002)(356003)(186003)(8676002)(5660300001)(48376002)(2906002)(81156014)(106466001)(69596002)(106002)(81166006)(4326008)(486006)(50466002)(305945005)(6666003)(50226002)(80596001)(44832011)(8936002)(26005);DIR:OUT;SFP:1101;SCL:1;SRVR:DM2PR07MB1452;H:CAEXCH02.caveonetworks.com;FPR:;SPF:Pass;LANG:en;PTR:50-232-66-26-static.hfc.comcastbusiness.net;MX:1;A:1; X-Microsoft-Exchange-Diagnostics: 1;CO1NAM05FT061;1:Wje8jB05dwMa/6ilttyTQli9/yGaTGoZAOXwmisp7PxcVEMjza8IqU3So8dWfQsQqV7/ua7PhLx/xrckqYsydHr1Z3u9XtydwZpn1JdXMY6/WU97SxvO/cDpln4GmFM5 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 17a9f5b6-2a0c-4ef4-50de-08d6180aa0e5 X-Microsoft-Antispam: BCL:0;PCL:0;RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(4608076)(2017052603328)(7153060);SRVR:DM2PR07MB1452; X-Microsoft-Exchange-Diagnostics: 1;DM2PR07MB1452;3:B1kP+5zqUos3U3SieEI9vsC/yCdTA3GFO11SOpbo9A3LVFPVdKGDPH1wyWxuA5fK4pKlnmmTvzaw2xwUyP2uU8I26mmnehD4y4LWOB8qncjyDBERGPLKPIsOECRhzi5hnzwFdSQnyt1m2T+SiXbIMXNFFyjnv3SN4YyIAM1MbB6oQ3Ouhst2BINzqlh8tOcZX6STmQwMc0Zv9JalypzyxtLhiGJNkXt2rXRCIdOr3eZ6XPkp20oWvai+x3FWASeRO6fxo9jJxDRFQXzQHkQ+c9XEvvFR8pQ8ULB5iwdTFZMUENSq3UYY5Q0y118GBZ1zukmgW7mAmK0/8FYWqY4aLNqBV4cslIB9oEZFVRpmshc=;25:nZb6VML1g0XM70T2rQEzjPMp0NfrG0iM9/XZ2FnDH3/npJqeUiTbHKktZTFo6DswNubfQG1cHY8HxxLrk1zpxBXwFKF1tGssG4h/0oZ+A0vX932IvLlCk4zvLx54XgXkn1hXwkeSa1++PPJ1gohHiOlqdyBNg8XTuwdsunS7vcU6hxU8SM9EOVyMSff8bS27uSyPCG9/kV6qPOedaoJrlF11zhsL9KoxKpc5opqqfx++TXzK+8tiKBf/lmuA7BbxEV45QFoWXGlZoyA3ksX9FecDwHm1D/hA+MdTwLRhBrHE/CxokSxPJT+P83AncytY3T83rQ4wDpgc4B/962rbvA== X-MS-TrafficTypeDiagnostic: DM2PR07MB1452: X-Microsoft-Exchange-Diagnostics: 1;DM2PR07MB1452;31:2Tx4d91woTVsQ8ZM8QUNpkpEW0Q35meL+9IyWiqiTf9EWTxP04tPLUPMx/7bURCY3WqfjfK75xiGUyvPRgBWHri75Frt1dDTjqrv8wS9HPjSVJXE+vnGBeAJ1GcL7uXT+nStuvFpyEBEBAZMQc93WtRh5xm1EzE9EU3xrtUyHh2CfpMmInG/jIvOHbGcmeJV/a6oKXNZypQl/SRXSH+S1h2zJ+OK+thJSsQ5W2Ji83M=;20:E+niiQRrcZbi9T6tXmuWlv0eOPO2VVAjUtjly2/AqYbRVdJKoiDbPWt6P0v8gu6LLJ1u70V7Hveghotu27oLYxfL1Mvdk85T38O7qPreX4J3Ome8v+iX9TUyxZlTCShF+A6qwc2hslarJfBFlCjvzLdAZu94yeytugUotWf5E9EE8Bd6T34l1OQaISCZAR8m3cyEa/600+BhTxwX+YW1Oc2zIMf2E5Vmb5aqL+p27UPPA7MggEOwQxjvacoruf5MnfmfjC+ptUM/LPbq8gRmVnuPppfbsgxkHBXjAVtY5BUD0wGJgEP+r0Vo3bsPfoKNC50KCe3eDoJzPxw67hmg67333o10+6Jf1THE/8S6Y4MSaLfCL6KVfPxJpGP5t0ljJOD41G4jQgHSNxxK0gV3+H0scITrKDo1+ASqtWH+/8AFZm3DQ6begKi9BnFyx5QkfUEprn0XJU4CnAlV9y2Ur/OkZKRG2PJETzrNElmYYr8UwuJsO7AFxuOCx8PZ0Eud X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(9452136761055); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(3002001)(93006095)(93004095)(3231311)(944501410)(52105095)(10201501046)(149027)(150027)(6041310)(20161123564045)(20161123562045)(20161123558120)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(201708071742011)(7699050);SRVR:DM2PR07MB1452;BCL:0;PCL:0;RULEID:;SRVR:DM2PR07MB1452; X-Microsoft-Exchange-Diagnostics: 1;DM2PR07MB1452;4:AHf9aydujsLMYgZQy9sQqibxoLTDLn6KFt39utoIg6bYYftzOfdDUg73/gSUpJe985UjGzi1v+yZkEx4BjXh9jHdxVICdsTI7pzurG1L6COIUvRz2cjdVq1UZOyCe0jcGsjtg5Bn+aS+u5H0QdwssfYVN5KiAXV7pt9Ywc6nXqerT9uRH+ptKGzKFOIPTn5GOYJYpv6jqHoXGK624y0c8VZEBOX4SC6tDtBsMcgcB/BH/0VQvIF7mrQcoSmC/pLOoeIkAwStpz0woexpMBZXAZYWpcRQ/wBfli84pCt+Zf7H+AkyaUVR9BlbNvQuXWeP X-Forefront-PRVS: 0792DBEAD0 X-Microsoft-Exchange-Diagnostics: 1;DM2PR07MB1452;23:0ISil6KnyHPNkK9b9d1Sl9IdymrzBfIO6Fe4pzylVN8Ym4teqMnZjeVIQHB/nAkgAjyyv3e/UOR6kmGIwgM3xgH08apmmjNd0ragD6vr22nrkitCQr7r9LddNR9kZhzwe1CdFaiNviMV3frjQEYrc2BTSsJtbJ+t2Kgt0o2D2vOi7ocNJDOWqJizWCr+eHDH+UW0qTPWSHAoujOBvEOF2qRxxlam8tRVOHlKpffEDupLtk9PLT50UsyG1fU5kefUMWp0sci9ixOB6V6GY0Z/qi90l/8UViJ0Obz+f+MfwjLmq8upNgBpJciPn6+GDLEhbCM2kQe+3J/xE9i6YAT55eyiUWzc5HSlGcxPLnozZzput3RYJZOA0+sEyF1aXJQT86trBK2ClMgrtA/czHeD+izuNlDOOIML6DdixLLnT4KZuBh4wk7D/pF5stV8varRnU14HklLGuJYZCuK/fJCW29ffrMMDd7uaNtk1QU/oCIpLX/dIA+llbwuzRkhEBeNC3UV7qenkj9hdwl/gBDrhtQhFxmYUPegt+mY78aZ9RUio8hCeDJljCiHTAOC7XvV0hF44hcQQsRqStMKafRWX7+vh7zfLgBkAHl97GVQvcLVmq0PgaDKXEQthM+oWoS9DhUghMNoBhpQ1z4ighaHK//LB9tUGnbWgxFNI811dwp2K7GBJ0ks7qMXvfaA+Wf0T3w3znSc3kn07560JB2HB+e8MSSuuSwDBOdyTV1Z7o/b9xTgKpxUlORYfBgEXN3s4jZ0Bi1I6UvCFxeF78iyxg8zhxwM4DKIph7aewv8VCnmc2WKKCFD6tHjsy0cYBVngBCaMdAVeTCMlbkGo2uBbSqIvWEBJJ2M6KdbFrDkkeFt4CpwpvgDEpNR4JHinuKIfzHrQRYE7VnstrRHjqvCyXmaEppL+ulYWc+pjZQJkx9dXvRrq4+WtHzURz6bCway/2xTnma5HiWNOvEKz+1vuWAcvi8skaN7B0Hek0dQtCA8tWBJm8THOQVy2hesbU1JM/JmAkqx56s4bsiMZabB3y+zUAnAiS7AaXaOOjlA7FGZQdNRoB5K+8tOKhzekZiUuvQlbilMlV6aZonApZzkP/zW50QuvQM54PyuZjqqCVQ= X-Microsoft-Antispam-Message-Info: z5OaS83XL7lwIGvQVkDq9zdnwNI7KEKrVCvh/Oa5xqJQaPfUQCfoJO4kM6Wiq5SFjDpAuTlAVpTYvUXY1m7QNiZkZo6Pj4Ga++uDLJpX/AtjSUDbxI4Lg4soSMPTnMDyWcCGE1na1B89gjvtEYlOBHmDmy3ttmfsmI99hvtOtRwy1+MTpzU3nzOAICK9vgcS56/O90fOvWff9ngzRNptcxO180YyssHVtdrJc2RX49l+N2PtmJqG2o4holj5iMgM8jdWY9IU2Y3n4/zCp4RdGS33QWXtdm2gvzET3rdCMAIf0Oso5s10KJUmdLCbxjGQZG6rVNBdwwKsL3sqO19rhmNKaMjBGPlyxmaM2jgtrS0= X-Microsoft-Exchange-Diagnostics: 1;DM2PR07MB1452;6:w6Qsnpb5gOwv76tiw9c5NpA+vYTAxaMj/gPkkldallepZ+rHLYw6Vh1pT9iRc6mlPvmPw0xm4wCsD+cxhhmFzEvbU4g9YfrOjqscKaQlV316Lk4E45BhyEfrHz6bRBL2x7I0FRI8E8vbzoBNMwMWgvYSmhZpZCd9LthlWsH6TjD/BfyD3xL6mkXQ7SZW1R3sL2eLF40UStU/NrtES7CEdovN96UaPckgFxrHeZdYq+XjJL8yH+Z2O5vyRnzuFzvQtsmTX5bIyPfC3h/SG9VQFwuV9obAjnPnd/gd9D1gV3o/aiC31kQmBcKeW/Eq+xQhl/nqBRFTpp7czZKSiA5EQcx5nCfcKR4i5f20EwfutTPF9FrsRb4Q6DcpPcV/Pa8xp7CyjC7ZFAPpU2mhaxK4JfpZBor298uX/xeC5/VI04fwpBQLZej4ANo+3bwphHABPjYM8SqBVkHTQPgyowvc+A==;5:9mq8sv0PWqPYDOf9fcAQiQuJLXtAY3CZe8SQ5riAWmYGiazOWT3+T1oxla9EYbBpQGqZCYc9fqtjVjCJRoi+2rrgq1Z3NxRDmTZU5yTTyGtDcjFl8gWWw9QkeDL9dLm9Pg3CYO+tbFR3Xa1iQOYtMSQpEc6+j03Wg7EZLazVrUo=;7:4wYBVmnS3IlW6nYdt1LVSOsFPf42zoN41SK5ipw3Uzmj9QTtRBtkfq6Ag1ssPzxcA+mnLTtZLeev/A0AhukRjzlAa3yA6CENTtdjT8MI5Rd9YXSakBzyq/eJS0J0aU9T5dSS9LPRsOQ5awUMAaW9fRBP48yl9YBPdks6+7NE8AnGj+G6rrRSKS1/R6FOxqEhEnVUNb6ILRdmbAep+cgmnoJU38QO/HAK8xKQymPk6Mwi3ErwCoYH0F3NlBvvhOh/ SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Sep 2018 17:18:44.5126 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 17a9f5b6-2a0c-4ef4-50de-08d6180aa0e5 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: DM2PR07MB1452 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: Quinn Tran remove stale debug trace. Fixes: 1eb42f965ced ("qla2xxx: Make trace flags more readable") Cc: stable@vger.kernel.org #4.10 Signed-off-by: Quinn Tran Signed-off-by: Himanshu Madhani --- drivers/scsi/qla2xxx/tcm_qla2xxx.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/drivers/scsi/qla2xxx/tcm_qla2xxx.c b/drivers/scsi/qla2xxx/tcm_qla2xxx.c index 7d3d4a82fe96..731a094d2386 100644 --- a/drivers/scsi/qla2xxx/tcm_qla2xxx.c +++ b/drivers/scsi/qla2xxx/tcm_qla2xxx.c @@ -757,10 +757,6 @@ static int tcm_qla2xxx_queue_status(struct se_cmd *se_cmd) cmd->sg_cnt = 0; cmd->offset = 0; cmd->dma_data_direction = target_reverse_dma_direction(se_cmd); - if (cmd->trc_flags & TRC_XMIT_STATUS) { - pr_crit("Multiple calls for status = %p.\n", cmd); - dump_stack(); - } cmd->trc_flags |= TRC_XMIT_STATUS; if (se_cmd->data_direction == DMA_FROM_DEVICE) { From patchwork Tue Sep 11 17:18:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Madhani, Himanshu" X-Patchwork-Id: 10596007 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8090114E5 for ; Tue, 11 Sep 2018 17:18:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 626A029B1F for ; Tue, 11 Sep 2018 17:18:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 56B9B29B23; Tue, 11 Sep 2018 17:18:51 +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=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,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 DB9B129B1F for ; Tue, 11 Sep 2018 17:18:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728136AbeIKWTH (ORCPT ); Tue, 11 Sep 2018 18:19:07 -0400 Received: from mail-eopbgr730048.outbound.protection.outlook.com ([40.107.73.48]:8288 "EHLO NAM05-DM3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728078AbeIKWTH (ORCPT ); Tue, 11 Sep 2018 18:19:07 -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:X-MS-Exchange-SenderADCheck; bh=Ph7mc10vha75FVmXwQqfZh2b5CwCRJqh/w4vReAxLl4=; b=jBevYxHVdMCPiS9ym5C7BYfDQuwqTYgHjk38Jzsu76qbfMkjRHcjmrTMmKd81nJVYBrunSCZKwgRpgZZrFfGYUn7lUMsqAABQOfHQJ33d3kTSvSI/VJxdpa/Mdf0Gb/qZNUdysgh4z+iKEiPhtAAqt+pQ1tq1epcKG6SavUcvjc= Received: from DM6PR07CA0011.namprd07.prod.outlook.com (2603:10b6:5:94::24) by SN6PR07MB4672.namprd07.prod.outlook.com (2603:10b6:805:3b::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1122.18; Tue, 11 Sep 2018 17:18:47 +0000 Received: from CO1NAM05FT061.eop-nam05.prod.protection.outlook.com (2a01:111:f400:7e50::202) by DM6PR07CA0011.outlook.office365.com (2603:10b6:5:94::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1122.15 via Frontend Transport; Tue, 11 Sep 2018 17:18:46 +0000 Authentication-Results: spf=pass (sender IP is 50.232.66.26) smtp.mailfrom=cavium.com; vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=bestguesspass action=none header.from=cavium.com; Received-SPF: Pass (protection.outlook.com: domain of cavium.com designates 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 CO1NAM05FT061.mail.protection.outlook.com (10.152.96.179) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.20.1164.5 via Frontend Transport; Tue, 11 Sep 2018 17:18:46 +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, 11 Sep 2018 10:18:31 -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 w8BHIUms029107; Tue, 11 Sep 2018 10:18:30 -0700 Received: (from root@localhost) by dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id w8BHIUrA029106; Tue, 11 Sep 2018 10:18:30 -0700 From: Himanshu Madhani To: , CC: , Subject: [PATCH 14/16] qla2xxx: Fix duplicate switch's Nport ID entries Date: Tue, 11 Sep 2018 10:18:25 -0700 Message-ID: <20180911171827.29016-15-himanshu.madhani@cavium.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20180911171827.29016-1-himanshu.madhani@cavium.com> References: <20180911171827.29016-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)(346002)(136003)(396003)(39860400002)(376002)(2980300002)(438002)(189003)(199004)(446003)(14444005)(336012)(2906002)(80596001)(356003)(305945005)(69596002)(36756003)(86362001)(1076002)(5660300001)(47776003)(8936002)(81166006)(478600001)(87636003)(6666003)(76176011)(16586007)(54906003)(110136005)(72206003)(50226002)(106002)(106466001)(81156014)(42186006)(8676002)(4326008)(476003)(126002)(44832011)(486006)(2616005)(11346002)(186003)(51416003)(50466002)(316002)(26005)(48376002);DIR:OUT;SFP:1101;SCL:1;SRVR:SN6PR07MB4672;H:CAEXCH02.caveonetworks.com;FPR:;SPF:Pass;LANG:en;PTR:50-232-66-26-static.hfc.comcastbusiness.net;MX:1;A:1; X-Microsoft-Exchange-Diagnostics: 1;CO1NAM05FT061;1:whxCaHb9xK+cfDUBEX702S/XhBeOEIPLguxoPBBvyx4W69Q/IJ/HLzoPwhPnJ3gPbNQz1jD6lVeEfXTW4JCUKZAlOdroiFDa+mhMQ3NjuBv5dBJKARJSB+4uFXEOc64w X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e787f257-4f1c-4cb5-7d35-08d6180aa216 X-Microsoft-Antispam: BCL:0;PCL:0;RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(4608076)(2017052603328)(7153060);SRVR:SN6PR07MB4672; X-Microsoft-Exchange-Diagnostics: 1;SN6PR07MB4672;3:oz8B33nx4Fu19xo+YFp+nlkhecggCNLDwPo7zU7OCREv39lXvn7vExFlZMNnbv3Cm4PHiO+0nKyV6Rr/1FY1vlU/GQS5w4vPSc7PTXDc5FekAzu5O6qori3RkVNWEqTDFZqhjpOwtTTGvk+t1vCtFQBF9vxXQeVvKxhZeS0AuapbpKeLPyfBTg83a33B+GetSOeqhNU1uKbubbOBMnOljFT0eJ6qALgJQHJ00xXRVg0pggj7xro912zY6DMoYEN7nPbA3FGrJxJ0g5THZoKDxYjDXw0zG5OOWZdwdU2NfHqNoO9jb5QAw+0nt2anX6KoJM2TOt8JiTanlNIhhsvBP7PKqpSo7MQtX0fJDAg93M0=;25:yGStIwQu5aNOHsJvXxkvL5a2Ol9A4pDQhUNq/7MpXDc+BiPJOzE4Eu3wP/RPPZQolsXkXHR/n3+3gQBoisB7+YW6rzd6fBVXiddN0ZRfolgL+kHfpTjlt2y2SvD34lRytnWS0ndmay1n6cdiCrkjn0G3f5Vw/bGy4mhAhKietEB13yH4EZX28Zs3ubNWxeP4IvWvd+pEzejqY4yfVjjUSyttizrXyjltzI8b+mv3bfCcrrRYuzef8iC2GOmDhewCfzolMdJVJKmY2UbSoPX78PYReDxmoyBXxBlE+S2qfhVlOXGmpXmEnhTvSdIQ2ihW6Wz9hwqTM6Kp184yEmM2qw== X-MS-TrafficTypeDiagnostic: SN6PR07MB4672: X-Microsoft-Exchange-Diagnostics: 1;SN6PR07MB4672;31:dyL+4bSB1zLBBNJwCgZnUoWOClkIF+W2z5EIspKKoUMiqurVA4u6aUMh/B9h0SBYbXGMWrAcXcQBqkQkzC7GhJpBjAzNWKVEa7/GlzF5dxLHbhHR2Gpfakgx4WIS1AayRbX8093CAl824zVAeYQ18PPruh7Ui6KiC9vOMB+FNsfM5JyRFv2x/CClUnXCSMZhR3zrZvwnF4rWqpMJv1isowON59XFf7Lj9x5a3w43ZZw=;20:a7AjuTrUTIa/+9k93jMNRDxswADG02LSDDG3XCfusqTshRnPpU7s/p5FUHRmqdVTvbFQJw8tOSBcuPzuQIpZ10mOxc6Jw3TiEslwng+Q+wENI+7DtN4Mdwu9rVzMho1RIio/377b3b5u1rMS20xhfqrHXeVEPH7JH1BkffYkjbxdy7hGpSPrZpTW+GMNEaUE0o3cx8s3XF+zBEOPStnBb7/zmaQpKSJm8IP++kYVmjkjGxs7ffwYq+Oiz3m1Rw8984TToZZxTji9Wy7TiKIpVTDr/+lsswqmsenHB/GK8q74mxQJz/cgx1sQZw24FiP35rHTnHREQIGnFOvQnKMvVb3ljJxPQxYR5h6ECUGoMaFZyAxGJm7xsyj1RjK4NDg3didGSplzw1JMl+AXPg4XnY56XsSALJ1cVoaHDLBAYT38aPeU7z4YNs3WXKq497tSZO94qg3H1VNfFA3jdGk+C0WThXP9O0RZdC6/O0CEYrdmOk3rYVR4gGXaGCQXWYDT X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(93006095)(93004095)(3231311)(944501410)(52105095)(3002001)(10201501046)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123558120)(20161123564045)(20161123562045)(201708071742011)(7699050);SRVR:SN6PR07MB4672;BCL:0;PCL:0;RULEID:;SRVR:SN6PR07MB4672; X-Microsoft-Exchange-Diagnostics: 1;SN6PR07MB4672;4:aEUzACYUz4rRF8Qgvrva7Pu4WBNH44kQ71f7GHXCeC+mi1Ifk7eLYpXyZSC3HG/mVoogBkeer+O9gMQLCjurBWyylSib+83EPKz3PGSTDV9kwlf1UbXyiFGt/QLkWGqlLfI9FcTWwwGgTOnMHE0JDuMl0g3ogOtkMiLIegqyIAB4dw5rPqNwHtNPjc2U+nTZY/crhnLGIWfgWXaSA+tGD/obF1Cq0rSY1aG47vUgjxEHhWrmICAKgLU4TfWE3/QuLamgQOTOGlxvMqh+U05C1w== X-Forefront-PRVS: 0792DBEAD0 X-Microsoft-Exchange-Diagnostics: 1;SN6PR07MB4672;23:TWVq5FQRXF/Oher7tzSms4p0092I7FB+jA6LuO/+l9kAzQBMJb5QKi4uN+m/Pkr+zyjvYJJ57hs/orEu9LPg+q2gwFpiLfF/tFsg9UXDhHv480XwdTRBGQ0AE/Bzeqrgh5N3x2EOkqahXjt6V+3sjhhgKpgT+/EOutQDtEYt2dETwUAdNV/7Mc/2seE1aC8oXt6hC8vl281GXq7XWRMY0l6bdbPXwwMNiH9iWpgLYKMSmXXUFtIIfGduv36Hqzub1jYMDiMhmwddtpHjryaexAwCTo8n0KjRZVB5m2anfKAN9oZhD0Jwz4V5lUSQ8PU8F3gDP59/+QxGoqW5qxu43maIzryhFiq2gnJxnGN8XSxRyr8jyJczc0BwphxFJZk2E/yd0Ecc6LZ0umLKBiv7ulpgElDyfRpuFoI3ZfEyhDLB/Q+zs49usvMZZhGvdn06u38/py+YgtDus9Vvl08lMK6oUam8F7JfbdMYASeEsknItvqzCPj2y7MQBoHfBzE1LKyXuJVW1YGv7Nvnni7EhDpIXalN8vvv3tHjkIeeL6MBfeZy32LInocJDsqHBY1qvY468mOEq0iHk7+6/L2QldR1jwXMxRpExFtAdg1EIFHHJUtIS0kb2D0IExIAgEE91HLBGh4uYehQur8I7X1qsB4MGKrSar768PXxxoARMLSvBNMOMtRvzw/G9K6DBq3VPdayEYxpbQX/0u2gcMRfcAy4RY6vD7tPgUmucb/7VCBYby2lfWo5oVt4o5Md3SAkj1iPxNQf4ZcfSEcFn4vFRtzSH2X9G9HBpxYYmEGpGAQEO5wF/aGixPnF2HfbXuDd5Q77ZZ68lRCvesVehUPKSCk7h5t+q4bDn2crqINgdU4OIiQHTC8bxf36ciGQwrRlmKfuMSaa8llWc6pL8EPa4czm0w0DXVxCQ2Zy2Ykl6PK5cpIMIU/hZxw6IFfdhp75V2DOSd22nCe9Eu1WuOWFzWZDZVucTMqyeJShg+DtcFLuHJBajmXeruAzk+rIN2+/uorSVZtH5C63y2KsNBweDCBIA2qbwubM2bQjJ0DF49SrrNEH93LQgRToOdY2T8TUv0dhTaRw/z9H1F3qo2XVF4mQvYHuQAOJnGtnVsCp3sLQPEF2bR0Md4a/lj/RzhG8 X-Microsoft-Antispam-Message-Info: +9Se0IVZ7RBCeaQ6qLn6SDoFdYmHdNXyejdr+8n63tNK2GVWxW2E/oaI7sc+GNW7WGmXlyMBhT5TM9bVTpEDUdgR/qa2mLjiXXVYH91Tk+Sjk2eNp6I39q1CEbm2CTx3QcOuOv6DR5wt2PjU5rOcmy2FHYZAwMV7cTl7OcuDbD3lFwxj3O9zoET7RnIdWYWKpAI8WOKVgNuykuSxHPMYxgX6y9KcaKWzf7cZ8/95syQOu/YdBY+OJoQE5CFa+TRP+pmWso6KrI3ngGKNDkIL4QZMOyAJAJuz0rFRb4zQepWuPXfUhmj13Mh6kXDwW9wmvEOj9myxfLOD5eU803JFaK09u88sTweHu4A5Pv0tMPs= X-Microsoft-Exchange-Diagnostics: 1;SN6PR07MB4672;6:Pl6qjRgbK/HxBU8ih3P00hYCOoXhyJKJmhByaMsHyrGF+ASeem1CjKH1zAYiht7b9T8aFeQiSHV/Pv6lZ3pEvIXCVEOjWclVxlY21lKA+TVw+dztu7jCQ/HIaoqjfZI+dl4bOI0vwcM+3VB40jJxqO1ShuGt2tCUPmJarimRqvzp/wLQ2NBXmwVnUgygPII8W3/uLPElvjaGMpqttfRCNLguS5UiQEai8q9Ni4sqUABhzIwOM6AZvG6tkmZOxVokegmH6cgGwiJyZp2Q5+lBhMP2Kz4IcfgwAN7kM0OXWS0rndF46WXC41HpyTnaT45PMOdxj7+A4hEJ+aVLtSJWNbieYpypNWEcpvNiO4FB8Whh4Eq1OCYv3Yg6AgF4qrlQqOx8H8wI6LWQwaXISQJnQRb3LfgDyDU58cGOOhM+JXBPYd8WA+5xPpjEtmfwJH1QzRyxTvZBCD07NH85Gu8+cw==;5:FtEYMnHmoLstHqT8zpNwsMxSwObbnjaAhVSeV8HkEwH2KDhl2HGD7cWbJpEqPeSlRcw6ocBdXs5JkiCAGMjXQQBISL4cqrf2ycQ45dWIzZ4LXLd0QLQZZpKh9upEdVB7UeBOKGIttpahKT/T4etpQLHcl2w1M04fYrmR82NyFm8=;7:KCWBQZNySmsM95pt0JUVV1PDCFkdOAbmlG/dx4THOdNXsXz4BOge9zVNy8MSFRqnDzckoIpkzPyFjjTLUH2Ls/iHMevGG0QSxWzG+koVFZ3uvxalOCX/EUuYt5FtqkXONZqpMR+yMLiiINhhUEkgvFF5f3UIKuUjhkzLiPdfhRTDuUjZnPudFuWaD1CE69d5GQy+wd9v8Tui17UFJZumdbhCZ1Zra9uSJA4aRLb+TGww8t0r9s8+7Zb5HoJP2C+7 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Sep 2018 17:18:46.5126 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e787f257-4f1c-4cb5-7d35-08d6180aa216 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: SN6PR07MB4672 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: Quinn Tran Current code relies on switch to provide a unique combination of WWPN + NPORTID to tract an FC port. This patch tries to detect a case where switch data base can get corrupted where multiple WWPNs can have the same Nport ID. The 1st Nport ID on the list will be kept while the duplicate Nport ID will be discard. Signed-off-by: Quinn Tran Signed-off-by: Himanshu Madhani --- drivers/scsi/qla2xxx/qla_gs.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/drivers/scsi/qla2xxx/qla_gs.c b/drivers/scsi/qla2xxx/qla_gs.c index 56a80c6e50e3..84e234c1f302 100644 --- a/drivers/scsi/qla2xxx/qla_gs.c +++ b/drivers/scsi/qla2xxx/qla_gs.c @@ -3619,9 +3619,10 @@ void qla24xx_async_gnnft_done(scsi_qla_host_t *vha, srb_t *sp) fc_port_t *fcport; u32 i, rc; bool found; - struct fab_scan_rp *rp; + struct fab_scan_rp *rp, *trp; unsigned long flags; u8 recheck = 0; + u16 dup = 0, dup_cnt = 0; ql_dbg(ql_dbg_disc, vha, 0xffff, "%s enter\n", __func__); @@ -3652,6 +3653,7 @@ void qla24xx_async_gnnft_done(scsi_qla_host_t *vha, srb_t *sp) for (i = 0; i < vha->hw->max_fibre_devices; i++) { u64 wwn; + int k; rp = &vha->scan.l[i]; found = false; @@ -3660,6 +3662,20 @@ void qla24xx_async_gnnft_done(scsi_qla_host_t *vha, srb_t *sp) if (wwn == 0) continue; + /* Remove duplicate NPORT ID entries from switch data base */ + for (k = i + 1; k < vha->hw->max_fibre_devices; k++) { + trp = &vha->scan.l[k]; + if (rp->id.b24 == trp->id.b24) { + dup = 1; + dup_cnt++; + ql_dbg(ql_dbg_disc + ql_dbg_verbose, + vha, 0xffff, + "Detected duplicate NPORT ID from switch data base: ID %06x WWN %8phN WWN %8phN\n", + rp->id.b24, rp->port_name, trp->port_name); + memset(trp, 0, sizeof(*trp)); + } + } + if (!memcmp(rp->port_name, vha->port_name, WWN_SIZE)) continue; @@ -3699,6 +3715,12 @@ void qla24xx_async_gnnft_done(scsi_qla_host_t *vha, srb_t *sp) } } + if (dup) { + ql_log(ql_log_warn, vha, 0xffff, + "Detected %d duplicate NPORT ID(s) from switch data base\n", + dup_cnt); + } + /* * Logout all previous fabric dev marked lost, except FCP2 devices. */ From patchwork Tue Sep 11 17:18:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Madhani, Himanshu" X-Patchwork-Id: 10596009 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B33D914E5 for ; Tue, 11 Sep 2018 17:18:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 96CCA29B1F for ; Tue, 11 Sep 2018 17:18:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8AB7329B26; Tue, 11 Sep 2018 17:18:52 +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=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,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 1343D29B1F for ; Tue, 11 Sep 2018 17:18:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728138AbeIKWTI (ORCPT ); Tue, 11 Sep 2018 18:19:08 -0400 Received: from mail-eopbgr690065.outbound.protection.outlook.com ([40.107.69.65]:42688 "EHLO NAM04-CO1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728010AbeIKWTI (ORCPT ); Tue, 11 Sep 2018 18:19:08 -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:X-MS-Exchange-SenderADCheck; bh=HQAUwp1yClEIe509egb4zvjTaVi4cqYIAyoz8x+szQs=; b=UT7HIkOQdoPb7pnoDb6y/CnBEFZCIZHiyR1bs1B8YyqqepJz7Zc6KRtFFzHzFGMZ6pTBiAt3dGnpp5VR3rCYyUOgwxK5ROWuVuBso9GwV3d83dE4BYnX3AgMR2uplBCkyKDQk7B9QUmm9ZHr15phR2t2Sru2+Ah8CEmHMQd03B4= Received: from DM6PR07CA0007.namprd07.prod.outlook.com (2603:10b6:5:94::20) by CY1PR07MB1445.namprd07.prod.outlook.com (2a01:111:e400:50eb::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1101.15; Tue, 11 Sep 2018 17:18:48 +0000 Received: from CO1NAM05FT061.eop-nam05.prod.protection.outlook.com (2a01:111:f400:7e50::205) by DM6PR07CA0007.outlook.office365.com (2603:10b6:5:94::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1122.17 via Frontend Transport; Tue, 11 Sep 2018 17:18:48 +0000 Authentication-Results: spf=pass (sender IP is 50.232.66.26) smtp.mailfrom=cavium.com; vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=bestguesspass action=none header.from=cavium.com; Received-SPF: Pass (protection.outlook.com: domain of cavium.com designates 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 CO1NAM05FT061.mail.protection.outlook.com (10.152.96.179) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.20.1164.5 via Frontend Transport; Tue, 11 Sep 2018 17:18:48 +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, 11 Sep 2018 10:18:31 -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 w8BHIUEg029111; Tue, 11 Sep 2018 10:18:30 -0700 Received: (from root@localhost) by dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id w8BHIU82029110; Tue, 11 Sep 2018 10:18:30 -0700 From: Himanshu Madhani To: , CC: , Subject: [PATCH 15/16] qla2xxx: Fix double increment of switch scan retry count Date: Tue, 11 Sep 2018 10:18:26 -0700 Message-ID: <20180911171827.29016-16-himanshu.madhani@cavium.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20180911171827.29016-1-himanshu.madhani@cavium.com> References: <20180911171827.29016-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)(396003)(39860400002)(136003)(346002)(376002)(2980300002)(438002)(199004)(189003)(2616005)(476003)(486006)(110136005)(80596001)(42186006)(126002)(186003)(54906003)(81156014)(81166006)(106002)(8676002)(69596002)(316002)(50466002)(16586007)(48376002)(26005)(8936002)(11346002)(50226002)(44832011)(76176011)(51416003)(446003)(47776003)(2906002)(4326008)(1076002)(5660300001)(36756003)(87636003)(106466001)(356003)(14444005)(6666003)(478600001)(336012)(305945005)(72206003)(86362001);DIR:OUT;SFP:1101;SCL:1;SRVR:CY1PR07MB1445;H:CAEXCH02.caveonetworks.com;FPR:;SPF:Pass;LANG:en;PTR:50-232-66-26-static.hfc.comcastbusiness.net;A:1;MX:1; X-Microsoft-Exchange-Diagnostics: 1;CO1NAM05FT061;1:eMJaelWBlHZEHrGZARmxq7v6Xnhk9RER+IdLtEQxrKT7l9sOe09nDoruZRKGFXelFz0MKBh33loBEsDXIztKBxWTcWuV3ZRMjwwswkQq8EpZhHcHcR8IX25RaVXGBDXd X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8e0c1b83-444d-44e9-e7be-08d6180aa304 X-Microsoft-Antispam: BCL:0;PCL:0;RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(4608076)(2017052603328)(7153060);SRVR:CY1PR07MB1445; X-Microsoft-Exchange-Diagnostics: 1;CY1PR07MB1445;3:jsLh2vNM/O/uljHOlE7VMWAAe7YCDCVwuwiGNbBkT+9JA5LovoO9P/j2+j5+ACqkcEqVoxEtEwPGnRBRZaY2OWmDqzOXJZK+rW0P+rJBch0z9vL5n8WfJDE6johCIEjqddDDwj6wtl+KuXG+vDFKKtQwcK9PJ+eFtgEEJ96GYmVcYSpZmhs4IwIV4fHwEHsWGNv4tnjymtHN2XICtUOlJxqJ5JrAKzksFPTGhhVqwiW/8GVqCoMQP+Gv3ovXir7j5bIkRQoJJ5GRzFU7VfrcrhsjCqsLs91lvhKVvMUfF+ZixRrXVKUE1gsUHc1+WuSrQtiJvDl224afU3vqOuSMRO/rpQO28G8JYkUa4IRJfCw=;25:rQUas3qD77t03wsogESg3jtst42dXD5dLt3tef/JENQZsAv+lSDZHULz0YQr+PxyHA/34uI0ut6iGYvqxJkuIxlQPLF2l//L88mRUJq6KPZ6IrhAaMJVPNUMAOZzm40VmXADMHVjAIlVpSzBWgjUeC0QzrKtoI9m3Ycsg2FO6SWeyVQusDoP9Fq2w/JS5q2tgo8w8tM7ij0L3REpxlnCJPkCcxd8g0Zi31Wo3uOwETUtpwwGsrKFs0Hcg8ehv86Cgc/UNgbHBZffCg3zvtFMhFWJ6weLbZHD9bgCfKsMwILJVvR0l8wDEusaUhvs+MtRT2elh2wJVhfao+R5Jg/b3A== X-MS-TrafficTypeDiagnostic: CY1PR07MB1445: X-Microsoft-Exchange-Diagnostics: 1;CY1PR07MB1445;31:N702sbsd8Mb5nXRuUCdAPu09CwBVzT4GKuy/kOnyi4eSBzG0ftZnp5YA9aFzh/nIeflVkCCRe7L2Recn33o/opIIjJEymi57uoNUmx7cneMgRg4BwbRl9taRAoPlWxCVeW441K+qKOwN/0jvqDRgF3Qna416vvc4QjqfVGZnRqXsTTKha+5EcMEUEBdDV2KAhs2rfl19dXkgnQP3NvCEBvH6XiNg8vlNOQ5vvZunfjs=;20:/gGLQCRNdYifHvMIKNTezswKvUfmeZDJ7sW3tB6ys1bqM2qCmHnE3BRmxHgHkGvDbJTIrrCZl4U2m6cMHYsYBczbYGFf2STgaAh87vhz/RGPoqcZkmOpoaY/p1R+rEhXk2S9qNvkh35llQUnc6Obd8Aa+S5o5WqtbaX2pIlSLC7iblvAWgGsCuohqyEWYxuRpVODZ+fElrEfUtI6J4fWSUx2+2LiEu26f0iiWZxDWJzT5ScNEB+hdYa0AAqZ+ih/A9H9b5MSLasz36NTailGdUqzq2HwJBueurG/pQx1/ur2IowgbQVCRzkv/e6TDJqd6uvYqqbtbwbevHRFhRAx69VsksTGJG7UsPZeLZ7Zo34xrUW2hvEWbfqIL0vs3yoyl9zrTRM+RJqJI8X5CTMjs0jZ+IkAt1aK5YZlCtSgxnyT+5etncW+nrK135jpm0apGyvN7dleFKOy9NVM3b1lRW4gmEQEqmXYNIP97MT9QFgwXqR98m5vQaxBDv/FRFp/ X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(163750095850); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(10201501046)(3002001)(3231311)(944501410)(52105095)(93006095)(93004095)(149027)(150027)(6041310)(20161123558120)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123560045)(201708071742011)(7699050);SRVR:CY1PR07MB1445;BCL:0;PCL:0;RULEID:;SRVR:CY1PR07MB1445; X-Microsoft-Exchange-Diagnostics: 1;CY1PR07MB1445;4:iMgCjdSLnkXAcsV33ycvij6KfbblrZYmQlzY7IyXXNoQAis7D1Vwj7206hS8BJrDucgIps7VPGJC62B3CtT8nhFGVBUs8lWMLEQyAou8olYzYrWo3QbueZAObtMPV0oA8v9cb34TlOy4b288yKOEDApfK88RwMgGBeOxCUuS4o+Q/rXoOOlSsjE9nrQMSWgwZqYJbKGn4xSujpL8yMwDq8xhwVDljbBmmY/RrA5+gj+OoGfmSVsE2B/VES9DaZSVsEGJNPtDxNqNrO5OCsbADrflLM/oiqondLz594y1Z5RmK3Gnte2Epbw44ZLRmKuN X-Forefront-PRVS: 0792DBEAD0 X-Microsoft-Exchange-Diagnostics: 1;CY1PR07MB1445;23:HAXRNdtKL53D+HDkCHE8wEQc/9dY09bW15GMPfwzEg85eAZnTPyAbzZWVKbZoHZIS3YAOHqCCKTnf50SAWo2QFeCZFRZEVDe3A3Moafn2P6Nolk0gjz8Cog3c/CUeYGzjM5aCMMllB4okv3BGTK8RCdo+zmftJpCFnnv5VNoXorpckbOkjqNMaew0/PabKaUCoz7h9JEG4Wo2Eg3OpSkCwH8U4n7QK2adx/HQ8YnH+e8j6kQpNocwSAq/zDjdHAS9ZjzBvv7t/TKCC1ZiHIyaO1ar1aCLpUAPp9NvGcxjezXciaxoykPG9Or2GWj2FF8amppv58lkGUJNolmBp5NmmTRGMfwgYAo4inEAsjGsZPi94om+iBBOziHVRi5BYPvGVCFuKi3yL/PaqJ8inV9AyBahUQ6uvsDtu0uNdLCEIA0SXQmzmoFbhlmcsGFXzp+dLdf21TngMgN6sJCwzcwF3UFqjVId00kSEEfNszih6obqvLwHIt+ahHKMrOv3+02UFNkho1eqcloDjpqIoBGT4FLNF0ijuytfvLHhezpz2u3hN5HxCRlwcYHZ1vDl8cHHzU+MMmtlGUBN/czVraJ5zsCba4IBG+K7YFxYcNMp18YqWoFnTOEXozghFgx2RRpuyNgKeW96h0aaD7N9vjZ2x6miZcjVUaa6oYzewe3HXO/VN3FCrUoZCV6uCwjVJ6Z+ovEkFDn9a8Z5u/BA1axjxrJmcP1ZBk5bsoPsQyIM9qBn8dlDggsTk8yKY6gsZEJw3z+Vdlk5SeLQ4ZAmvSWOrUGZ5Z1xpJMf/x9H36vJ0QYcvowy00/pphRn8jaw9sQr1SbwHbIraU+5OKJ0ZO7lY79UQ88Boqa97/ZKCXXDuqEcR/OhAINTGM0B+CSvEUJEUWGM6COjb4yHdu6rwYYUjGGALBT2fB++qmPArCYHShkDeZOQ7VsjN+xi5AtABRzptXlrdAjMlgiKKR6CJjWFRaXwHR3HIDWCD/rXnW2FeN6lh37xVeYjCGMxgxGiYzvjVLdYRg56HGmlnF6s3noa1Al2BttQ1CbBbTFQfQHRi1q4zpQcBYPuVBRp6Dl4QuK2ZpE+mI8D4GS1eOS96CKtYJt7gaqOkYf1QbnLok79fa97o6XO8xJQFzXyp8l5p08 X-Microsoft-Antispam-Message-Info: PqWZ+5VhzXTphSUOOg5JUAp/l2PGQ0WblrQj0hIxGXevU4L3Y6G7S+kGLJQQRgr3SUFsntDvKY369VZl9s6kmsx4UriglwkSrE6ps8aAzEQmD+fIxfXvvw8/U19MPbj0yLTpMWUnKqUwIg7Cq9bsbukPPYlZR1800+zw9MD1KtIJCnY78mmzCgn4Z6+7cZWstW1eMM6Segqs7eZS0icD+tz+MAkZTcX+MkRGtHdUFd28283WKDyKqBKSlcEMEBZ9qlEJAvAirGKl2ihXyblnXx84+AWPFx85QKRRq1tyabGuF6Hp72ldHr05GC3x7HZeD0F3rIbuHaUmyxClZZq07lN02KzmZmeSUT7TzB/4px4= X-Microsoft-Exchange-Diagnostics: 1;CY1PR07MB1445;6:YRoHvalfc6QTvlvWzBcZi3C7whEMfiNZy9rgWr/plVz6IozsnK067u8UhYOwovBfNeEjWyEbmvypO4qi4UuoxKqApwHh/pOm30MrVlOrHTrJG56MERzhLeNK8aD3YR17Bfco2PTZP6Q01LX7G4TnVptePziyoyEQrNhJx8Gz1MJgogqgJiQlG4rGQPnynM28PdmrZzqhWeDE1j4DKoz6TJlOOHBXXXzRS07tJdm95vpxcpnill1OTiulRyCeqjUaCW+tQjJ6dQnrcF84umDvbFPttJG12Z6gDHigoYEW/KdfABRq/xYQRhCJtvKGAs5Pe4QqtQ0uNdFSWnM4bLLgknBMAYCP6C6kxpnEh5YDaNgAL5msamTiSw2GJfRIxU7Y1kDZrJtIafjQKPrSoS7jgX3doy7IDEX/WouwK1usr80MaoupNAij8MSt4iNGMnNEJN+LBru/GeDdN78PZHYoNA==;5:Zpz6TaYQLqv4Jbzw+Ri8j8iMOAuFWTbrPqUFbBdDmPHSl9gZLhSI4yYzRIcxbHak2V3O0KzeyAbutYwNyBy2RZOXH5317lO8Qku0WFgfWSjOpnspbqzyOeS96vwBsAER/yfYAET0578xSUeZI5N3+8BTpJIiQbPyWSPLT5BokJE=;7:HVA5WmKyyuFiS93DpcTHrltGMcG3j4HSb0JuutoThabeousLYKViG42UYgBG4dE3w7kpxPUMYI5tZNFo3GxS68fcypDR5nwYj12XDgYorfZllwTrU5HZPKmQ/OD3xPXo6Ict82/VGDdnm0n1BMUXDUYtfvbx+fnZ98vPQ59jbUwnNG8f24pKBV5zDX17KSPvU0SG5c63/uRSw2hQ8qF5/c6fqv+25QpAprfPhR22vDpvlxztHQu8Bqc/QdIvNf0m SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Sep 2018 17:18:48.0751 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8e0c1b83-444d-44e9-e7be-08d6180aa304 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: CY1PR07MB1445 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: Quinn Tran This patch fixes issue when switch command fails, current code increments retry count twice. This results into less number of retries. Signed-off-by: Quinn Tran Signed-off-by: Himanshu Madhani --- drivers/scsi/qla2xxx/qla_gs.c | 37 +++++++++++++++++-------------------- 1 file changed, 17 insertions(+), 20 deletions(-) diff --git a/drivers/scsi/qla2xxx/qla_gs.c b/drivers/scsi/qla2xxx/qla_gs.c index 84e234c1f302..64ebd790b922 100644 --- a/drivers/scsi/qla2xxx/qla_gs.c +++ b/drivers/scsi/qla2xxx/qla_gs.c @@ -3800,7 +3800,7 @@ static int qla2x00_post_gnnft_gpnft_done_work(struct scsi_qla_host *vha, return qla2x00_post_work(vha, e); } -static int qla2x00_post_nvme_gpnft_done_work(struct scsi_qla_host *vha, +static int qla2x00_post_nvme_gpnft_work(struct scsi_qla_host *vha, srb_t *sp, int cmd) { struct qla_work_evt *e; @@ -3930,6 +3930,7 @@ static void qla2x00_async_gpnft_gnnft_sp_done(void *s, int res) "Async done-%s res %x FC4Type %x\n", sp->name, res, sp->gen2); + del_timer(&sp->u.iocb_cmd.timer); sp->rc = res; if (res) { unsigned long flags; @@ -3945,48 +3946,44 @@ static void qla2x00_async_gpnft_gnnft_sp_done(void *s, int res) if (rc) { /* Cleanup here to prevent memory leak */ qla24xx_sp_unmap(vha, sp); - } - spin_lock_irqsave(&vha->work_lock, flags); - vha->scan.scan_flags &= ~SF_SCANNING; - vha->scan.scan_retry++; - spin_unlock_irqrestore(&vha->work_lock, flags); + spin_lock_irqsave(&vha->work_lock, flags); + vha->scan.scan_flags &= ~SF_SCANNING; + vha->scan.scan_retry++; + spin_unlock_irqrestore(&vha->work_lock, flags); - if (vha->scan.scan_retry < MAX_SCAN_RETRIES) { - set_bit(LOCAL_LOOP_UPDATE, &vha->dpc_flags); - set_bit(LOOP_RESYNC_NEEDED, &vha->dpc_flags); - qla2xxx_wake_dpc(vha); - } else { - ql_dbg(ql_dbg_disc, vha, 0xffff, - "Async done-%s rescan failed on all retries.\n", - name); + if (vha->scan.scan_retry < MAX_SCAN_RETRIES) { + set_bit(LOCAL_LOOP_UPDATE, &vha->dpc_flags); + set_bit(LOOP_RESYNC_NEEDED, &vha->dpc_flags); + qla2xxx_wake_dpc(vha); + } else { + ql_dbg(ql_dbg_disc, vha, 0xffff, + "Async done-%s rescan failed on all retries.\n", + name); + } } return; } - if (!res) - qla2x00_find_free_fcp_nvme_slot(vha, sp); + qla2x00_find_free_fcp_nvme_slot(vha, sp); if ((fc4_type == FC4_TYPE_FCP_SCSI) && vha->flags.nvme_enabled && cmd == GNN_FT_CMD) { - del_timer(&sp->u.iocb_cmd.timer); spin_lock_irqsave(&vha->work_lock, flags); vha->scan.scan_flags &= ~SF_SCANNING; spin_unlock_irqrestore(&vha->work_lock, flags); sp->rc = res; - rc = qla2x00_post_nvme_gpnft_done_work(vha, sp, QLA_EVT_GPNFT); + rc = qla2x00_post_nvme_gpnft_work(vha, sp, QLA_EVT_GPNFT); if (rc) { qla24xx_sp_unmap(vha, sp); set_bit(LOCAL_LOOP_UPDATE, &vha->dpc_flags); set_bit(LOOP_RESYNC_NEEDED, &vha->dpc_flags); - return; } return; } if (cmd == GPN_FT_CMD) { - del_timer(&sp->u.iocb_cmd.timer); rc = qla2x00_post_gnnft_gpnft_done_work(vha, sp, QLA_EVT_GPNFT_DONE); } else { From patchwork Tue Sep 11 17:18:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Madhani, Himanshu" X-Patchwork-Id: 10596011 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 02822920 for ; Tue, 11 Sep 2018 17:18:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DB05E29B1F for ; Tue, 11 Sep 2018 17:18:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CF4ED29B23; Tue, 11 Sep 2018 17:18:53 +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=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,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 4123629B20 for ; Tue, 11 Sep 2018 17:18:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728139AbeIKWTI (ORCPT ); Tue, 11 Sep 2018 18:19:08 -0400 Received: from mail-dm3nam03on0061.outbound.protection.outlook.com ([104.47.41.61]:55640 "EHLO NAM03-DM3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728106AbeIKWTI (ORCPT ); Tue, 11 Sep 2018 18:19:08 -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:X-MS-Exchange-SenderADCheck; bh=l/3/KSVN+kL/ZGu0ak/LAfeQkM1IfhCw9sWzvPBZzYk=; b=K1lzKeDsHfQzGprvs/XASnXtoQeyNKax4qNi82Tj3bF+WMFf+//O32b0gmx9PhiccziNBN3ORjb2cafBC+7u53dcd/b3VMSek/x9w+fK15yuXV2n+TZXDbXKl+Iy5NPtHSauv7jGiLvjn9kZs6qk8EhdzINpDfpdbZ5w4obPi34= Received: from DM6PR07CA0011.namprd07.prod.outlook.com (2603:10b6:5:94::24) by DM6PR07MB4666.namprd07.prod.outlook.com (2603:10b6:5:a0::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1122.17; Tue, 11 Sep 2018 17:18:47 +0000 Received: from CO1NAM05FT061.eop-nam05.prod.protection.outlook.com (2a01:111:f400:7e50::202) by DM6PR07CA0011.outlook.office365.com (2603:10b6:5:94::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1122.15 via Frontend Transport; Tue, 11 Sep 2018 17:18:47 +0000 Authentication-Results: spf=pass (sender IP is 50.232.66.26) smtp.mailfrom=cavium.com; vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=bestguesspass action=none header.from=cavium.com; Received-SPF: Pass (protection.outlook.com: domain of cavium.com designates 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 CO1NAM05FT061.mail.protection.outlook.com (10.152.96.179) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.20.1164.5 via Frontend Transport; Tue, 11 Sep 2018 17:18:47 +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, 11 Sep 2018 10:18:31 -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 w8BHIUjC029115; Tue, 11 Sep 2018 10:18:30 -0700 Received: (from root@localhost) by dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id w8BHIU3c029114; Tue, 11 Sep 2018 10:18:30 -0700 From: Himanshu Madhani To: , CC: , Subject: [PATCH 16/16] qla2xxx: Update driver version to 10.00.00.11-k Date: Tue, 11 Sep 2018 10:18:27 -0700 Message-ID: <20180911171827.29016-17-himanshu.madhani@cavium.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20180911171827.29016-1-himanshu.madhani@cavium.com> References: <20180911171827.29016-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)(396003)(39860400002)(376002)(136003)(346002)(2980300002)(438002)(189003)(199004)(86362001)(87636003)(26005)(6666003)(8676002)(478600001)(69596002)(80596001)(36756003)(14444005)(47776003)(356003)(5660300001)(305945005)(1076002)(2616005)(126002)(476003)(48376002)(106002)(8936002)(486006)(50466002)(81166006)(81156014)(44832011)(72206003)(336012)(11346002)(186003)(50226002)(446003)(51416003)(106466001)(54906003)(16586007)(110136005)(316002)(42186006)(76176011)(2906002)(4326008);DIR:OUT;SFP:1101;SCL:1;SRVR:DM6PR07MB4666;H:CAEXCH02.caveonetworks.com;FPR:;SPF:Pass;LANG:en;PTR:50-232-66-26-static.hfc.comcastbusiness.net;MX:1;A:1; X-Microsoft-Exchange-Diagnostics: 1;CO1NAM05FT061;1:o5N8w3ML2IIszyUYrjdBiCyjIKHZa8UTyXPZ2iz0EGZ5STFNq+u7C6TRYjbXXgEnfBc41V2vmqdvsYuSBCGloxW2PlpgLrquRI5zZOsW5rRntcAKYfH/+9GD6Z/c4Bq3 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e8bd4dbd-5bd2-4061-3bdc-08d6180aa297 X-Microsoft-Antispam: BCL:0;PCL:0;RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(4608076)(2017052603328)(7153060);SRVR:DM6PR07MB4666; X-Microsoft-Exchange-Diagnostics: 1;DM6PR07MB4666;3:z68naGlPWaAOeQVjVY374JSq9Wc6YzSGso3CO5L3cuh4WZEAxgu9qvcL4zzp95YUI43VD36n66CEMWdEVAHZ6vsC8iDbnZTqyhjL2wC0NlORR9vzwkWiKSK5JdcBSCAyN9m4gKjwrn22AG1PwN+NxxLK+XZqBk28vSe9KNRJtG2vJFOpy+WDnjqC8HeoGTGuvn7oiZccY9v/qswKjscHrWSMUzEkY9kYRMSBDSPpn0+gzrnH3LGYT3xbV5CIDjgXE6NAp44FqPctQV0tQjwTqgFsnMODEFahAwqylCVn/x6ZaJM9EUPkqLVQjdrLSYiJAXFTqacX1YEyh27nx6kTx2k+pRbt9I0Jt/RUi76EgCM=;25:dN8AIS9dn3ei4Fz5U/y+pxfWwzLOxL+hFB/25b2geZgq1YMxKwbn2G6KJRo7UimSfYiEY+SlAw7vi6Z/4qeGTsl/zotLEiLVJQ67PtOD2EjVswx71UF4lFhxEPFSgBv+r3Gq/u5QxG5i8yducfcDIMIk7Ts/8CV+/5ifI0qJcGGtm+HRU8A3n68hmrAnKwsTD/tL+zyx82pxMuyHfePH0077TEWC5v39RtGRBgickTm4HnyP6dbitgawnhIjC2HJZP1VoTDcpKvY363AgWMr1NVqB9nwPPp8XjXB2voQHlgIcHYfqlGBtEdluDDtrQyHpCZ1DaYt8X2zORaDwgs6jg== X-MS-TrafficTypeDiagnostic: DM6PR07MB4666: X-Microsoft-Exchange-Diagnostics: 1;DM6PR07MB4666;31:bDEl5+dY+2DiYY7TcCy9SxT27B/sn1QjjPSi7ltpxv4Ztc64VzBM8h4aL9ErFfxOqV8+92Ut1u9zlDcorfPrSiyqsK93ByFIzGK7nvnGU4tXiS083imr7s8zC4KW+Y60dIAAaNecwUO/yjkZlSF30+bIIqGDQTjTiO5dDblDl11XyKAnITNtX+jzp2HanJUCV7yAeAEWEt/SipHiZPHgM0UC1Wzg4GyHBcrlpx9I7dg=;20:QziOPPbMCOin1YWv62YFNpPlxWD/zAssFjefPEggKo56GOFdwLq63E3Ye0tK0OxV7aSU6Mza5MjtHtE2V7zgvohywDhIHjhRSEi6toOixPMziQqn7m+XthSMI7lO7atpHVscrQPABYq6clpXBEqVxbr7p9jPJ1Wj/hZu37eljVsoNNWEttNTz/CCoHW8YE3wiTaa9bo1iMfghYucxpyDW4Rk29WUc8x7l0IgRfMqgWtquvLMgH0qha0AZvc7M5RvZZSC5yD3BLbqsTOglFoIbKcyh7GqW9o5sEZJdPDkeiP60yl6a5np7FjIQ3S0KwZlw2okJY5L3Az+cIAXZ1bE6p345fQJmhXjExY3GzuJxsaCR5GkcBX0LcE1zBANBO65s0vrWtGXnESZtCAT40f4gVbwAc8j5I9tV0vAb//4u/VsSvRT705w1DACvtQViKknLxILfOHvApxX5/rEUEmo9N7mObHyG+fe3oCWpAtw7s9g1VDrvAW06DCHYAr5ldEw X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(3231311)(944501410)(52105095)(10201501046)(3002001)(93006095)(93004095)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123564045)(20161123558120)(20161123562045)(201708071742011)(7699050);SRVR:DM6PR07MB4666;BCL:0;PCL:0;RULEID:;SRVR:DM6PR07MB4666; X-Microsoft-Exchange-Diagnostics: 1;DM6PR07MB4666;4:3aDKX1IWN+eNKC49ocsoX4Bfe/XYH4zya5yjJwAu8vz8KagqPDHl0UQ70brPDgV09p5fpljZ2ZXhyqjQ1uVi6JfB8FA6IBRhIz1cqXSnwoEKck0oUS23mIvcS72+eUSR+wkXKDT2q6Bb5fEo2iarz4BP9g4xCBxmp1q0vvUtVdluaV1iCwDo8OMx4TDn1ak1JXqnInQzJ3TI7WyG9j7kkfLlLsYHw4GM3l+uJomgSHSR5Lnv0m144H4saw0en4EKcmDs/IAdDDU4+3lwaelH4w== X-Forefront-PRVS: 0792DBEAD0 X-Microsoft-Exchange-Diagnostics: 1;DM6PR07MB4666;23:m0MS1HUBXXyHz1NLSMkZIAibr6VYsZ5eaZLK04pxN+a9uYf/qHTevEmE8RMEmsKUsk5QrRZD3FiawxrXwl259HTjMtLgfJZ2GbU4uCEWbiSmz+ADtwexTOqCs9U4xkHpIBty9iopXbaKt3KMAqswyXaKIyODK4IXZMo/qvH+KR+pd5th0MYiLTJDtAeRGg/eoeRYvGfXpBBFbMKNtMnBMCimVf07BCU8foCvgukchb5I6DwUd8fxhQCGawzQOrxCCh9O2iq05cYxvQrqTOp0lML0yw5c0db9hkeZQN20FzxxhrwvRtDM0/JJt6PTRZ6dUFd4JLCey3HWqSNzYEC9fzzf8At15jiJtl8wKWGRDvXo6BbC24RIfbopdQ59Zcf1hkdrV3DBhfPX/hd1FexLTWpoVTUqwjx+Ay/tQ+t8z2UNDPILXOYFaIWTDlWkp6g55mglO9UGecnOSy0cAPm2xOf1E30uvTaHINqgx9oZf/ecNve+Q6h8lgyJ6yb5Pum88NQJs0yv9N259jmp8grbRNKejMp3fTNVfRE2QdTWpDZrILCu67uaLN03v25KcWOhRUI/8amtDc/UlXBE3/jRmiGjCDRsys9ipsD/M10SybX1vqSqypgLbic1N9QnAa6Y1aQgBpmpRJNw7plvBVdsAnv08A5Am92gqFe+jgorsSsjHSj1/9gbNGDwTSxk+4uuNz1n4RmS3TGCUfF6CjtSUf0Mrwc0vpIi9ZqfbjO2zh5p2YQpy2Z8pas85owyFtL0GXpLVYmdUISG16Ek9SsVuX/FLpEA1APiVp1aEKb+Mjy5ppri6Q+UUnHb1Oe6zq6oTRBSo5/LJo+Oh3TGbXsXb5oq9Qz5TTAPk7raBaMF7nqOlZdYoPJ2FDjNQj4RN0N1eIUhBCvzVdi2jeka4y2jZ87m7uNuduxs+NdW1eEQQnfTxnAad1cK6GVrgfl65VRdpFDQ4YGaRyTdd93/GULKvCDXLdl/Fk6/6R7VgR+Q6HoAjGQznqLIW4aaL9937fFMV3XFcB5pawY/UfhCVhNOdzVGXxZOcLG6RiVMzvyhRRs2k//jvSxFv/MHiZuGjuk8tAjgeUIOyOWjZ/2qxVQNe7xmNwFJ0tp2zpLmNb7eM+xbyJ0vWNsWIR82Fri6FojB X-Microsoft-Antispam-Message-Info: sqSQs5EOUDuyQ/BOljlDjMetouOacarVQ9r8kceR6QCcpWA3FCTIG8DOeswOluw76xBXyRAcaPmLY2n5KN79cNCISBqPZ0azLvp4ZJLopvjkOSvocGQ5H8hMRehKyJcD7URneljjs2hFMHxlpzkmzNaJnP8lWiL0eKJBHbTsUGExhkMfm7O9qPDFqIIh1KBCLcIfyeTmwXBZ7JcITgn2wMxQQ+2e80zeEeNF+hBKTd+2AtpZminY2eMV6/7XdBTgqWwEXB++1OjvIpvjaTVm0uZmOBBUXbdmgCeFpGesKMWM1Nhi1V875v+EGAf90fwtBp9QEaIME4okJS6ZbJwTxTlTvyffoQdtjEcHe0/ql7E= X-Microsoft-Exchange-Diagnostics: 1;DM6PR07MB4666;6:3OxSvTThfNPvFVKR+zkcjmW1yNMO8udD+liEtH0YEt8IOqhlP4/+lpdfLvisz6XHZhDIiT0/uQ3lNW13amgzdULHkBA2RqOcgOgxnwH9MadK8PYyOC5flyY6ofX0c0Ze8z/8fLul0KfgoeIiRrpjslLmNPzZ+RDY17j8rgHA/+LJ/EpmA7weRdmBBeqD6fUnxFrfqhKC1Vd2+Ki6pl+SyunPTNU0eby4Du9G/k8httcaHQOWKZgXER4gcxU274fXAnWYTPkTbeZjrcYwnx3Vi4UeOAEeFeU+m25qNGbR7ErO1suBh5abB+8deN62Fow2OrwOlIsTVlq+EnssXgv1qj8cfEUBrrlY25r4xWK6JFtZt3HwolYiV9SALasRc/GDt9TH5fblU/a8/Y5VBjmUWNRvHO5wpv96ZSa4r3v2Xco9onyeoDSe4AH6OQ/tK4uqixYF11vS33wgIPp1c+m3nQ==;5:f7bsFpyLkh68IYHkwc0RAPeKD9gtDwLhx8uxAUk+d2sbK4/k4FRhCTIrP160WdJfGzsY6Xcaz20uNM6fyf5IztjMD3U8Xwum2mdVXIras5LMui+VlTTDJnHmYcOsjyrP6tYsA/7btiPmZwiq3BvvhU78+4yYPlB8keP6n2qjYLA=;7:cYfpESMaWdo/n32kS+5XQvhJPP9fnf1UER1WcAN6YDwyIFPjSDeA+5J2FMSKsY7XIgkSzVRTCQU2qcc8aJ7OYnFYRd5x128rC2knbYQ7KSa83dC/mLHsAogIBQnl7vjjko8OMyZ/VOqRV3pDt+oIhaU5rqrmftOrlBOA2k2gx4rGY3MaUB0q/c88xRFS6D9Xk25+wgkb9cHLemlqoyvGVxrbPw+z6VTdrudFTcsy0Ud3CcmiTycghOxlYJ6g3y/r SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Sep 2018 17:18:47.3563 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e8bd4dbd-5bd2-4061-3bdc-08d6180aa297 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: DM6PR07MB4666 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 Signed-off-by: Himanshu Madhani --- drivers/scsi/qla2xxx/qla_version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/scsi/qla2xxx/qla_version.h b/drivers/scsi/qla2xxx/qla_version.h index 9559f1836170..12bafff71a1a 100644 --- a/drivers/scsi/qla2xxx/qla_version.h +++ b/drivers/scsi/qla2xxx/qla_version.h @@ -7,7 +7,7 @@ /* * Driver version */ -#define QLA2XXX_VERSION "10.00.00.10-k" +#define QLA2XXX_VERSION "10.00.00.11-k" #define QLA_DRIVER_MAJOR_VER 10 #define QLA_DRIVER_MINOR_VER 0