From patchwork Tue Nov 28 19:34:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Madhani, Himanshu" X-Patchwork-Id: 10080949 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 7ED25602DC for ; Tue, 28 Nov 2017 19:35:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 72D3629638 for ; Tue, 28 Nov 2017 19:35:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 679342964F; Tue, 28 Nov 2017 19:35: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=-6.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F26DB29638 for ; Tue, 28 Nov 2017 19:35:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932166AbdK1Tfd (ORCPT ); Tue, 28 Nov 2017 14:35:33 -0500 Received: from mail-bl2nam02on0041.outbound.protection.outlook.com ([104.47.38.41]:61440 "EHLO NAM02-BL2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754148AbdK1TfZ (ORCPT ); Tue, 28 Nov 2017 14:35:25 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=CAVIUMNETWORKS.onmicrosoft.com; s=selector1-cavium-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=rrKaEH2vt/w2sijPAoUvNt3xlYsGGto/cEuKqytDWFg=; b=A6glrbvbVXinBw97EedFNwqDaMr/loNAZJZ+2rrcf9Jvst/Ouba+K6jczi3vXJcqwfgfiUdOLq2v8SWc7PmATIKgTnKcjQTk0uyKRKEKoNlm9YrVGc/vQqCqD7kYFmnjm4WOMjX/1U5mNdJQdTAoUd/NtC9fWFuq2a0FYbgPzOw= Received: from CO2PR07CA0084.namprd07.prod.outlook.com (2603:10b6:100::52) by DM5PR0701MB3816.namprd07.prod.outlook.com (2603:10b6:4:7f::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.260.4; Tue, 28 Nov 2017 19:35:23 +0000 Received: from BY2FFO11FD017.protection.gbl (2a01:111:f400:7c0c::136) by CO2PR07CA0084.outlook.office365.com (2603:10b6:100::52) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.282.5 via Frontend Transport; Tue, 28 Nov 2017 19:35:23 +0000 Authentication-Results: spf=none (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=none action=none header.from=cavium.com; Received-SPF: None (protection.outlook.com: cavium.com does not designate permitted sender hosts) Received: from CAEXCH02.caveonetworks.com (50.232.66.26) by BY2FFO11FD017.mail.protection.outlook.com (10.1.14.105) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.20.218.12 via Frontend Transport; Tue, 28 Nov 2017 19:35:23 +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, 28 Nov 2017 11:35:06 -0800 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 vASJZ6JS013786; Tue, 28 Nov 2017 11:35:06 -0800 Received: (from root@localhost) by dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id vASJZ6af013785; Tue, 28 Nov 2017 11:35:06 -0800 From: Himanshu Madhani To: , CC: , Subject: [PATCH 14/22] qla2xxx: Fix nested spinlock Date: Tue, 28 Nov 2017 11:34:55 -0800 Message-ID: <20171128193503.13695-15-himanshu.madhani@cavium.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20171128193503.13695-1-himanshu.madhani@cavium.com> References: <20171128193503.13695-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)(6009001)(376002)(346002)(2980300002)(428002)(189002)(199003)(42186006)(4326008)(110136005)(6666003)(50986999)(51416003)(50466002)(54906003)(316002)(87636003)(86362001)(106466001)(81166006)(81156014)(48376002)(16586007)(76176999)(33646002)(478600001)(105586002)(72206003)(1076002)(5660300001)(50226002)(2906002)(36756003)(101416001)(305945005)(8936002)(8676002)(189998001)(47776003)(69596002)(2950100002)(356003)(80596001); DIR:OUT; SFP:1101; SCL:1; SRVR:DM5PR0701MB3816; H:CAEXCH02.caveonetworks.com; FPR:; SPF:None; PTR:50-232-66-26-static.hfc.comcastbusiness.net; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11FD017; 1:8Qrzd3o+jQlQ4JlP/+kzo/G+Qp4b4LqZJBpCGuDCWhopKMQ9QIf5pRu6t+PPdSN0aU8W+LFivkvDRWOziqI+zjOs/ARS1HUS09y8IWftVmYSFYwZc6awClirihpBQqAF X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4f9c0227-7fbc-463f-38bc-08d536972b4a X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(5600026)(4604075)(2017052603199); SRVR:DM5PR0701MB3816; X-Microsoft-Exchange-Diagnostics: 1; DM5PR0701MB3816; 3:ObiAggcFrP5mWwiAZt+9CKFPr7HpdUTRV5UwFmayEpUndqR87Z7n/Mq/ZcTmga+/FkSp/1r82jtp5VtVUIQRZR0F9t386hD8ZqkpB+1MjIusJrXIp9XiIR7vSBpgFPNuDD5QBoPAmMKUxuV0xra4/Fr6oNNlGDprzhB7332aukTzTa426G9ZXh24v+/1CYyF4qyR8hKHEE59ALeTBimJtiRAZpygNkx4tNFmeQnBo7IjMfJ901BMP6lMEFy3mAlsv4ek78s8QV6V38/pt3baXj5ZqKcTaf5h+EM/o70M/2kueiypU7rjLDWBePEgtHAZ1sbVbCC+pRmvk7e9fotspaI7WWEVs0OL4BapG9R0aBU=; 25:OYj4VKhasaFxI4yava7GFQJ8U+00n6hB7L6FZm0xvv/TqtZMN5ofq9lX/r+YF65HJlq4I/ZkdikOk/diKdrotySB3ouiYw+KYmfVZv87EVBfSjuEm5Zf+EiniObQLTjgV4oHMOlkW68SDDLhkECF2Nk6JZ9vDmrHThg6z5pmGUFkgU39j4DARzjSucJM9PEmK5+4hNpEwoOBrQJruAt9yUwNiM5RZg4cewfyWpNvkgWzv3rJGP0GtaPf2KI5Fow6bUgq5HHp3VZWxlzL8v2zeQIeSJuai+shXB14Tg5guNej1Cp1O0z4xU1K9z9Ck7R6u6aATXzlezvw/JkPkdAncQ== X-MS-TrafficTypeDiagnostic: DM5PR0701MB3816: X-Microsoft-Exchange-Diagnostics: 1; DM5PR0701MB3816; 31:tjzsQ7SMTwz74pUedOvNyf7aQvYIvf6cyg9BtWxKi6vJnphg3rE4AJ39lY+/XDLev+noWJKoV+Hew7MvKnwmwiE3gEqzgY6DPS00cLAc5u7g7yBiTDACF3R51mq2BRT69tzE+offdRCgQ7DMHa/E50ZMcMAhVpfWse5eUHuI4YGF55isUoIv0aGE4aJ/MMLxw1U2NoL1bZt3UfczbdvFH8P8DtdoBRBszt757maJDxA=; 20:/D16f/Np2R1v4qJn+NjXKLgLzHpaRO+xS2gcDMvoVc9zuPiQzhoVGqEVLdg4O5eZ9kDZHdkKVwpOWpgdg/Nyea5nUzbNkuUTr6rPao9kAcDEuC2Rqhw04U0slGv6RS5JXA2ov5fysWd0mB9jB2XtvTfhOrNGub6QGAOsPEjC/ZH+PuZyBBpoZfvTasub7LQn1j9ES+gWKqCOZkJdLUGEC/IzqEoGwoLy8xl94RP/F8m6xozUCdzbEj8mcoZkzL0YZWgZ8xiNvfEVdWiAH3UZvXkM3O9tf5WZ6lRAq7zA83pBKQt9uzT98kPmtQTYyK4grKyGPM9xuNaZqNM9eQbmJdD86Fi0Y0i6wApJiqqFrhNxidWwujRHqbXpSygVfghJgtux32slNBM98xw4xAD9PTpULP9qvWtGPBOTerP3L3saDm3uVCcVegxPGCilL+cBiMnSwGuoHAkzPGVNxLQ+oESkIWJsgv7zKR2eA+mqf8K8lXQN5DoocczV5SzBaHa5 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(9452136761055); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040450)(2401047)(8121501046)(5005006)(10201501046)(93006095)(93001095)(3002001)(3231022)(6041248)(20161123562025)(20161123558100)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123564025)(20161123560025)(20161123555025)(6072148)(201708071742011); SRVR:DM5PR0701MB3816; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:DM5PR0701MB3816; X-Microsoft-Exchange-Diagnostics: 1; DM5PR0701MB3816; 4:9k8P6dpos4uyfMA0SE0K3ZDtBg3ql8y5OY2ymCGibFJTFPxdgyXrXNymbIYAow26doTxQHekSfkG3fg0vZzJiSDvVTKi1pIv1N9yWT+Qbukh723f15lzz+jf4j/vKxt6+TWj0Hpz7Xk2KVqt3eqDYe8cYTL3DcWaVgLoCfIG6CbSCpW4MVGDL3kDdhpx3JSYRrZ96Pi6/0tOGOtR2/LWXgooC6LaGgyL5fIxVU4VvxcOsAzEU7hONtdrm6lWWOA/6IIcdxtd5bA5vKAR0Idg0nSQtzLMNNUFR+cKjDDgP4N8wWCIQNaJUAGM0109OluJ X-Forefront-PRVS: 0505147DDB X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM5PR0701MB3816; 23:rIRgpIAG/Vdu6ecHRTgdNhe3+FiuW53l9uSSAzR?= =?us-ascii?Q?AeV874hGHWrafJ7z8c11oQzT8eXi6d8OvdINerIsItpDODtxWVeJUdkBqV00?= =?us-ascii?Q?Xh0uvBv7KB24YoXmOyWtIw+8d17cEZoVj5c/zAg+4g1rxhD2qKkY1J1XslKT?= =?us-ascii?Q?arSyJ7lECTRiK7oixkmrkzqD7XaKIRrv1BvH4T3IDbMtrWorsOvzTeocs50c?= =?us-ascii?Q?ICIMJmi95+B2PPSMHtn3N71Nxx1o7uI9819W9IggNLvMMEz4JM3oQFY4jTRM?= =?us-ascii?Q?0RQy7QGPA59dxaZPQLOw+aS415Ar51dNcmWPYI5kztWF0+FaCaltBQh4ON0w?= =?us-ascii?Q?YhlSj9UdR/99QMMD6Xxe0dtm8j7C3MsPXB3V6tpi7zojqBeWJBQ+ZOGznZjB?= =?us-ascii?Q?HBWRQNrxAIfisbxqViJGV142+aBmOxIXwfFILKOEZJ/0Eu6aeYfOr31WDhHq?= =?us-ascii?Q?kaMuOgue8gkC8gdgbhQPMjY2lOH3ZF3xmwXDBYTGefroRCiErp0eBZ0gWa9d?= =?us-ascii?Q?wuYsNfu7TaGomOEs3UrR0pk/3QAcIJDlG8dQ1MgQuOlDhhciVf7RGJ6ChayZ?= =?us-ascii?Q?KgyKDH0vIsto6KTvOjtdkA33pLUs4QsS8W0ZvcN1hP8JPvJYodALs7JyYoFq?= =?us-ascii?Q?KsgbV3NnlbxGoCCO7c2QnWQAthG2MgD2xsbj5HFyLMBcWfU10+U+jEwlbWyU?= =?us-ascii?Q?XQssTZjedp+L1fA2WEiaauAH6LPCwF+JabwflSqSCXZZuoFtDB6mdFnM5veS?= =?us-ascii?Q?oNzBk7Pxl8MvKIdX8pqWZqdJR+CfF3yRF5BZ2JxS6XiCaFpcItOdx+Gw1P+m?= =?us-ascii?Q?evCOErTTIBlHQjiaHg8VJObg/mIv35DOTKqcMkMNdJCNWksvAjl4FOB744fS?= =?us-ascii?Q?ahqXjQnpgsYooJKo4nVrzCj2S+wSYbMBMwkLv3EUg2mFsPUCU2NDY404Qcp7?= =?us-ascii?Q?1GaZ3/ZuCjQYZpIikn+UjyrttCwTl5DLOiP+vdpecWo6VGvs70vu09bISN4P?= =?us-ascii?Q?vB39E6+/8ywsJBmL8ZlC20bPR?= X-Microsoft-Exchange-Diagnostics: 1; DM5PR0701MB3816; 6:WdbtrMhi2myikgBxJUaJY8ab9rqLJFNQnrMGWhAHId3Ug1DeFMQug6ChfLPbaPQBQVLPl7cX8l5dIaA4CesqcoY9Aw1ClgHv7FbLNYdFfKaoGohGk8PsN2smHNQSIOD0yf6S1CaLKrj3LrBfej7dQxlOQU8dDLOGpVAY31KcnbGKOvdHZXohzSw571wjj7aCGB/SWqx2+xCUoRZB4KhwA9KJW77DQz2rEBPXw6o4U5eyB4dzRaF+ELLq3cpVy4/whdE6VRJNYqexjBiLlV24kIMz9AXbx/DSXt63FII5eqvRVLnVi26HfPM4U4fcfgOiTSMiqcyDYHBjiIkJLzee1jAg1VHJYpuaBSRWYkZ+7bc=; 5:4HYrxYdJ2zA0Z/A+MpGgehpwMj8wTjGvIwIxfaS68SThsNM/agSR2xz3gikgmNcDExI48u6YodH8NGNWVCmJjbafLoW3ZpKGARyawXPK2Tl/8SBqEmz/VILPB2qOnLagooVYLSG1jlEZGdoQCl8jMJa9fha8MwpcHnafHLEkDnk=; 24:k9ZUXjHoctSg8DKWt2kpGtzcAZ1pxlXANgEYVINSBhvMhhVYByemZjvkx4NpJp1CppjlYGVrLbv5nzW/1XbCVNPlEFd2dRXxBgU02U9tsuc=; 7:nAz0N3WH5X7R/9f0AXfyVZ10VhwrLfP5kYt4m4IWVj/PtQAwwqg98Zl/nlLOkN43hu9io93nYbhOW/rvM8O90KZ6osw9G3d3Hwq+Nu+fIZh/zZBm9EVpfC9uXFwdDDo698sUZFzIcFe3g2pSZC0Y3HGAhZ6lj7A9Hx9q9f4MmGytVgr0Fttgm3iL8LTpN8AqJuQQeKr0Plvg+A87uBJ0q6YdAUVSuVtxS3Akibjn5mPEqj45P0dpEviM7HinF30J SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Nov 2017 19:35:23.4855 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4f9c0227-7fbc-463f-38bc-08d536972b4a 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: DM5PR0701MB3816 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 Fixes: 6eb54715b54bb ("qla2xxx: Added interface to send explicit LOGO.") Cc: # 4.10+ Signed-off-by: Quinn Tran Signed-off-by: Himanshu Madhani --- drivers/scsi/qla2xxx/qla_iocb.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/scsi/qla2xxx/qla_iocb.c b/drivers/scsi/qla2xxx/qla_iocb.c index d810a447cb4a..106f4ac4f733 100644 --- a/drivers/scsi/qla2xxx/qla_iocb.c +++ b/drivers/scsi/qla2xxx/qla_iocb.c @@ -2394,7 +2394,6 @@ qla2x00_els_dcmd_iocb_timeout(void *data) struct scsi_qla_host *vha = sp->vha; struct qla_hw_data *ha = vha->hw; struct srb_iocb *lio = &sp->u.iocb_cmd; - unsigned long flags = 0; ql_dbg(ql_dbg_io, vha, 0x3069, "%s Timeout, hdl=%x, portid=%02x%02x%02x\n", @@ -2402,7 +2401,6 @@ qla2x00_els_dcmd_iocb_timeout(void *data) fcport->d_id.b.al_pa); /* Abort the exchange */ - spin_lock_irqsave(&ha->hardware_lock, flags); if (ha->isp_ops->abort_command(sp)) { ql_dbg(ql_dbg_io, vha, 0x3070, "mbx abort_command failed.\n"); @@ -2410,7 +2408,6 @@ qla2x00_els_dcmd_iocb_timeout(void *data) ql_dbg(ql_dbg_io, vha, 0x3071, "mbx abort_command success.\n"); } - spin_unlock_irqrestore(&ha->hardware_lock, flags); complete(&lio->u.els_logo.comp); }