From patchwork Fri May 19 21:53:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Madhani, Himanshu" X-Patchwork-Id: 9738277 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 C18EB6034C for ; Fri, 19 May 2017 21:54:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AF45228562 for ; Fri, 19 May 2017 21:54:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A439F28573; Fri, 19 May 2017 21:54: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=-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 3419A28562 for ; Fri, 19 May 2017 21:54:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756731AbdESVyi (ORCPT ); Fri, 19 May 2017 17:54:38 -0400 Received: from mail-sn1nam02on0042.outbound.protection.outlook.com ([104.47.36.42]:61100 "EHLO NAM02-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1756855AbdESVyb (ORCPT ); Fri, 19 May 2017 17:54:31 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=CAVIUMNETWORKS.onmicrosoft.com; s=selector1-cavium-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=aEKN4zaYuUVFjBSUJp2z9imt+tVYEfTMlKlWz2f5p4Q=; b=UNOCYSTr4jwrOh0tdcna420MRBCxVXHmK0oPhFnLDWBnCDCOwRslp0vSBJcggsUvfzuLveBoLrXB+vEURHisSYIrceOC01dFI8n8rzVTbgUQWFqy06dKojDHmoHfXiLGhgvAi/nIPH7eQAN2tZfPFHY/JcLem/NnTSMxARlnB0E= Received: from SN1PR07CA0042.namprd07.prod.outlook.com (10.162.170.180) by SN2PR0701MB1021.namprd07.prod.outlook.com (10.160.57.147) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1101.14; Fri, 19 May 2017 21:54:29 +0000 Received: from BY2FFO11FD010.protection.gbl (2a01:111:f400:7c0c::118) by SN1PR07CA0042.outlook.office365.com (2a01:111:e400:3000::52) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1101.14 via Frontend Transport; Fri, 19 May 2017 21:54:29 +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 BY2FFO11FD010.mail.protection.outlook.com (10.1.14.74) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.1.1075.5 via Frontend Transport; Fri, 19 May 2017 21:54:28 +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; Fri, 19 May 2017 14:53:54 -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 v4JLrsCn002295; Fri, 19 May 2017 14:53:54 -0700 Received: (from root@localhost) by dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id v4JLrsAi002294; Fri, 19 May 2017 14:53:54 -0700 From: Himanshu Madhani To: , CC: , Subject: [PATCH 21/25] qla2xxx: Remove redundant wait when target is stopped. Date: Fri, 19 May 2017 14:53:40 -0700 Message-ID: <20170519215344.2168-22-himanshu.madhani@cavium.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170519215344.2168-1-himanshu.madhani@cavium.com> References: <20170519215344.2168-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)(39840400002)(39450400003)(39850400002)(39410400002)(39400400002)(2980300002)(428002)(189002)(199003)(9170700003)(305945005)(48376002)(33646002)(478600001)(80596001)(87636003)(8936002)(50226002)(6666003)(5003940100001)(2906002)(54906002)(42186005)(5660300001)(38730400002)(101416001)(72206003)(81166006)(50986999)(106466001)(4326008)(105586002)(76176999)(8676002)(2950100002)(47776003)(1076002)(86362001)(356003)(50466002)(36756003)(189998001); DIR:OUT; SFP:1101; SCL:1; SRVR:SN2PR0701MB1021; H:CAEXCH02.caveonetworks.com; FPR:; SPF:None; MLV:sfv; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11FD010; 1:pT7TAu8VkFiE9K486q1niOxlMuqtFICvGkT9xD2czrS38qmoBuRCZ2SggQVaBsI9dCH9aWtIXFAYbqNNhcifbB8Yn52dFA1ANx2Xkc7ku7PO3g0FWhT7zmM00IFVQwFzK6JZ8pFZ3SLExM9uAkak6EySbf5HKqS4qMy8rnqGqRLY/CD0GRhM1tR+3uAShzOCM9NGHB7D7oEjEMY3GHfMb+R7wSeHAd898wg1aZ0weDZCddCM+Y6tA9Hi6oyLQnufn75ElF1BT9ILjxCX7DMdxeZbhBgMjwEitZJq0rOhBhXh8e5ldnQc4a6o2aHRPpD2h24uvtLKBuhd5PTZcvfJdxfYCYHaUqygCfPNXWua/FVb9mRsXsnt761KkrkXiM9voQkQqAwDwqD639+mTVLmhoy5bf4/yfGD19jK5O+OTS8ni7X7oaqKmDa2cMOQ6BTPGTbc89AgfUHk3lMQ325upZu0GhFatG+SvA5FykkN+On7+Ree2/m0AdbQDGE8XOJnZY2B74ankWnd7PtYVpS7OkexSyczoSzHv26DzcPWYOdpMzzt8Kd8cpQSwpjXDKF4YDleddam08wyx3TB87+gQQ== X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN2PR0701MB1021: X-MS-Office365-Filtering-Correlation-Id: 3d22c84b-cee9-4d0f-f7bc-08d49f019f9e X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(2017030254075)(201703131423075)(201703031133081); SRVR:SN2PR0701MB1021; X-Microsoft-Exchange-Diagnostics: 1; SN2PR0701MB1021; 3:OStWw2LrV4vE6ur470QYLL3i0bBu6mgD7WaD6QVc1PWixYWjYZMGLAkjK3iVdev7Temcyre9c6086JyCHK1JdhE+4lJnS1ORckgbx+DcAp27rNKYRJKXZBdO4wp1aYiIcH8rPFSghvgsDRHGQZG6R5JrK+43seyP3z3pGv70zg0xa49LfmFQfHfoIgzUg0clU0Ywjg93r6QaxKDijsKvb3RuztF3rwHCfvwmRh1W7DcOhdwbR5hAWZug2XfzuNDGWMbyqkazUnQI0qY6ncuk77zJtLLgvFb9qggdys5CDY+yie+4cpxEzaUdjFV55xzE2IxdeLl/mS9z8sBx3vEHBlIApqqLyXent92LSq1cmUkzIsafqPs/bExb66pKN0mSSFuVWxPbxTBOxT4pZCFWYc/oK5oqDIPNba4M+ghftQVaRh6ox1bt6NO2BtabSVwWVoE2h0Lgm/HzF2Vo48to4g== X-Microsoft-Exchange-Diagnostics: 1; SN2PR0701MB1021; 25:CpNIQxnvNFFLsplli7va04XM+CRb0nCfSoWQFpkOnTBVINiqnHHwpUTXjMBxlrmlNWgEHgSGV1invIv7lV9EUkhmgElSIZqtH582KumNcQrJ6UJY0C6hYltTvgRtcLkUVC7C3B0QfvkGlren+9vWS+rAOp+7U1yQjD7ellx3iiRfe9+lNFs9F3yiyZYGBpioBod2NY8g5udKrleNI9eHC1iHZfwzM97tFg8oYhuk6CEm687g9SCyBn61NWKM02LQLJz90PdLNpdxWFzoEkfqkSLB5b6pv51iNZNWSB86K2cXWY7P05MCJUcXQnx0Nw1AnrYrEB4nXjvJ6uDKb7vcf8XBludhIx8O4tiaEhPKDS/w66nmipsobxdcWWXfhNy+IesfVHlg30/gNiCcQppFO6cKmCnHb9q9ngHp4okN2mjivebynwi4zSg9GMsZ+d0RK9nlrcreCCUCASxMKKtAl56nAZ0E0UbYlpPSO2i7Hn0=; 31:MVuFlje34ZzAbHAkUd02x6rDsLxBhx9x3Ps30M+v654VAzbmHdjzPEQFsLWpC4T3BHMdhPUcq7CyF2FSXvV0orzleDcq9EQvai513VFrMhN5hWXJvXgjz9wuRTmmusyW4fjDct26tBeffHbMeTYL45DlvxD8wT+ImEKLApnE6qjy0nfu71Fuu2A2LfLyUkEvApCkAkfduZiNjygXoZR6uZ7yI6/CjJ5ofNxEVgloRPwFtQkSQtjPFAqzrwWPk3leMjqL3ceJFuXi5u3QMQQXLA== X-Microsoft-Exchange-Diagnostics: 1; SN2PR0701MB1021; 20:mXJuk4GUKEZSWwMQbDU2LW2wrFpO9ys9UIR1PxxhoRKTbvyviURWkXTC+Oktma3utqK4Jrv9rGHesUlx/QKqJx4+P04UOJxiN6Udrxw9VJM0bDwsYGIfAIt0Wh8vjO75cuzmT55kYDHHdXgFfyw/1dZPszX6iRNmpXFRdiPKNoadC0zFSxQhl5dccxuZGdbMMA+kJZUPa4loLGcj3WHcjqQqvwc2HzpKuAdhgLMjfd+HcO56USBnxLNYpghx+GGEZ2Sj8mT+BJXMkuEwEI1Ra+AagWTJlAxepMyVYie3o5FeFa2ZdImLH7+Pk03IfXJ7mCngzu7tQbvg/r23y4Id9acZrYg5FUvxyKL7dlDqYFDfEKMhRErIhyXDd0GXQKLeYLDhO6tmXIewdUKVIsT/5rEZUu2hxarg2qZiU6hnChMKTNoGXjLVmVnE8r1MWyiGsd30vmKxoJ3yqX2ktse1KDMyzMV3EiEQuV3Zx+oikh4YMjKDLuTQJ2g11P0YVkcb X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040450)(601004)(2401047)(13017025)(13024025)(13015025)(5005006)(13018025)(13023025)(8121501046)(93006095)(93001095)(10201501046)(3002001)(6041248)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123564025)(20161123560025)(20161123562025)(20161123555025)(20161123558100)(6072148); SRVR:SN2PR0701MB1021; BCL:0; PCL:0; RULEID:; SRVR:SN2PR0701MB1021; X-Microsoft-Exchange-Diagnostics: 1; SN2PR0701MB1021; 4:PkquT2ArX7AXDHD4rLxBgGcG7lFfsa6aCBdmu1v2aLqZ10PD431tqAUCs6UJZVu5b5HifJNs3qk4Wj6ytZvjfaAGv+8zQxdSIakjxnuedl8Q1wb88kcNLYH+05fC0BaH3fFz6bSb68PKBiAO2u09lQ1Hk+giPYQ2kfxZvFBiAMGjhWDWHJb5jjKBXEreXzQozdaiV9HYxeB4I1+zBWx+kbqq87WSzcftRHnWCRn8+D1rxcP7PS1t+AtDxiNuH6JYmJVRpTTAEjwsSEIfqE3H0av/eyY//81eRwRiuTYWHHx0ZB24yCZYMHmeFT9Otbq9WBEyyKCOnL+AlP5UEH2dMIjU9wmm9OqJQ6fF0yEniYcfpX0tot4y/OV8KALGZbXE1yHM8K98sOEVddMSSrxX75MRHk5TPeow2kCoVzC8qu2bNeVHM5FvXBcT4a74LojI7w6cFyOyo9bMu3U9LMdcKjkyTZBa8dcOgPrQ5B0tYzCDnY4M1rdz4YI+n5Z8UEjE+hRH5q4LIWnvC6jVEbh0ZTz/6iArgMzr1wpj36Ds9ABbgQo7/YXdeq8KPN29k7Gg/h+a4EzOxXFPCdXOcbwcNoB0TUYld8sxRM87fxqW6D8IAQuiQi17dWAgpEBaWAtR8SCbuR5EVkzcArqwkO//yfNypwxnklmGC/c7j1jUZpD3fBgTiYl+bnCS5kiJNiVjCOsKJ9b/4GrKRkfUexqqlEytwibkvCwUMzG9LoTHzxJhUr+noo5KO+k89eCzv/ZjAkH1SDmVy9fVK6T7G5q9WsYZx7/AIytvaYjYhWCoRCgAR16K9uEBjA2o78ayHhsm+MsTd9zRQYSxjbJU5RMcTzZp+e/wCj3ph4BI2c33GD7oVj52MZypPlp5UH6z36hX X-Forefront-PRVS: 031257FE13 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SN2PR0701MB1021; 23:47fAyTMFE9GREEoViT6gKk41sEUmxmRDuJrB/x+?= =?us-ascii?Q?faxRKVHRi8UDlWAHP3LfRU8hNKkPbdWBcDS1qVzKH/RNDHSUy+Wfto9+7SST?= =?us-ascii?Q?zUtm1OEuMQNYvMkoRWyHAsxOP13i5GPmIXHDZ23nNlWJu9J9NquEZuXVSQB9?= =?us-ascii?Q?7oebBfHJ41r/YeELduohtMrFo5/Xc23H5Iv5Xun6EjKrNs5XO4dE7wkOyLLx?= =?us-ascii?Q?bO1KEFgnFKAJXpsTha1lTlk3nCvyNFfkVkUYNPwt7NriZEYn34qpjy8bssSs?= =?us-ascii?Q?t16lkoMqs1o9HCS+KapQIDKVVlKjE1FXH720diora39/JShPPzjCDoDbiPAz?= =?us-ascii?Q?ZTM8gq1TYaIfBXrPgI7vomnD3bdXBObIkOzwIkq8E4JHOPgBPx9mK2LNftSA?= =?us-ascii?Q?vJxycktU8LbP2hCyjvadcGiwKX1lhnyGJjE+HbsV/L/AO7P/GnXJLXudL4ls?= =?us-ascii?Q?pVe6bJjMSvjK9zRT55GMAichrIOuvv9baL4zspa60zAJ2tmkf+hJgilGUgQh?= =?us-ascii?Q?w/e2xxvoMYBFfGf8V5kW8d1JJKQpHteCNP2dNSZjABHjclcVTyVql+SiuriI?= =?us-ascii?Q?/KPH5QxdtQqBua0Pnim97fTozDfnZqdbirVSmcoCOe73ak95ENxervktPOXn?= =?us-ascii?Q?6ostINn8op7hh4ZC5M9svt1IxeBteuKxz68LhWPEFfeMs6o8l+iOeHNcniOF?= =?us-ascii?Q?zCCPxokaLIhY9n0vCRFgYtQMrbDD90AxjQYXrO5H2S37Ae6khgxJljKfJT6l?= =?us-ascii?Q?LRzKWz/0GPGx7Mij8PjP+Oe8+1Pxa+4vqh+gz77jeMSFwTFKoeoCVKkWmKxZ?= =?us-ascii?Q?pDibKZV3okMdVNKrozxW+bz3Cv7jB8zqcW0U91kv8jisGp5lw7let6tjP37Y?= =?us-ascii?Q?AYyikAXP7PybK+JBeMm9tZR8SQaqSIu8A2Wp6vP+fMiz8AvBnYEBXtuov6N4?= =?us-ascii?Q?eZYEfrbaPlkjZez+aqOEG29u2CLj1wAGgjj5wRaOVfmIjSRM4PCTXSG1BJ4K?= =?us-ascii?Q?0lwyPeLXukquSh1CZakM9GGj1tf/u2l3dNyWyyj4PzNtsj516IOyaq/mkGlC?= =?us-ascii?Q?ESrloWMUZxaVnwOaZW3Lt0dGoPsi0?= X-Microsoft-Exchange-Diagnostics: 1; SN2PR0701MB1021; 6:u/Ae1J9vVv0cQMbwlKlYEkHgpw4DMVu07nOx8rzlm7av6p/f7/E6Pmyo/JTubIS5twzrP4CqHYhIQUS1gj57rMOQAVwi7frtRXanct8a6gMnOMDBTH20Fb1CdEfsa2iOUhA9AifKc2wXa7/1EyQBfIrzsCWwVtoJkKQMrrCv/ekBXt4T1l6+rCYthDo4gtZVR+CHZ7HtaB38ra5mE1CQ6q1QstqwKm9C6c4KF5sWJbNBVYqSUWe1TlnfyXNI+04aLRwSaQoOPwfklxUmJVzqExS8IAjw7EGZ3gNjNDNGnWUBC6bjxGmQtHqcvqJzKAsGDqybiFjpHbK359QOyrsR4QhBA/3vfE4yBNzQ9194rAgLO3onf+4MhHvEd3nsVllPt+DWdxEcwND0QIgiVef2s1LOB2ru65ydrTKwwlAs72Pwn0NgQtg0vIALk4JU4P+zUwB2B8tol7V981Pv6XVSMDx6e4CJShZl+/i4kZQI8QZBlKDUYaO8EXpadO5NDlC30lHi79hTwxMyfTh4g44I5g==; 5:0ru+B41rKjoSRNroLDYpYuH6NAdfF/MEgbpO7qHXLyn4MogusvpQ4GBrjD8CYdXyMOk49vlKzAVe+KCCJiXW0Q0HP29Cy6T1xhnxrbCTzcO3hXdrVZDxPA/bHA2j7vA8MgheK1uwkqQiyN3Im7XUWQ==; 24:CTe7sUK443JBVzKHQP9qenKuWFKoMDVKENEdcyZAnLhmb/PcXUl09YRGdAiOpPaIFfVHJZ/aNZzi1NfM+bmJsVOjouErrifZ6GopJ1DU2JE= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SN2PR0701MB1021; 7:j1kdv7szkyaTiI6S684wdCljFjr3wOfCwr23UNanNU8Lyt7gnNbQvayfZnXc/uprh/t2bi4ZQi6980L2YBmBLuVBBavMIvB4RvBOAYsQvn2bMU6VPYTdKjlySfhqP69ncboiZjv+uGgx1HotDQnIEol8Q/1BJNXSC9vaeWvXVgZmBkWK/nyHhxcAIQzI5NnCeMfotsYLP4Y03Det2oIGWBnO3m6wS3KdrTkrTbk+HE6glrMTSN8lpSIhgIBYXl5Gwz91z0jYO6CSrWa009XzsTKcBna3VNGRgRosgP9LAMGIkmeXJ8HHAy1LETYu3toUyw7s8SQ76d9I33sNVJ4fag== X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 May 2017 21:54:28.5677 (UTC) 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: SN2PR0701MB1021 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 already destroy all target sessions when target Mode is stopped. Target core would waits for all commands that belong to each session to purge. The extra wait for interrupts to settle down is not relevant. stop phase 2 is not using the correct vha pointer for npiv case. Signed-off-by: Quinn Tran Signed-off-by: Himanshu Madhani --- drivers/scsi/qla2xxx/qla_target.c | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/drivers/scsi/qla2xxx/qla_target.c b/drivers/scsi/qla2xxx/qla_target.c index b8e609ae6cff..5a8ed73e6ef2 100644 --- a/drivers/scsi/qla2xxx/qla_target.c +++ b/drivers/scsi/qla2xxx/qla_target.c @@ -1420,6 +1420,8 @@ int qlt_stop_phase1(struct qla_tgt *tgt) if (npiv_vports) { mutex_unlock(&qla_tgt_mutex); + ql_dbg(ql_dbg_tgt_mgt, vha, 0xf021, + "NPIV is in use. Can not stop target\n"); return -EPERM; } } @@ -1430,7 +1432,7 @@ int qlt_stop_phase1(struct qla_tgt *tgt) return -EPERM; } - ql_dbg(ql_dbg_tgt, vha, 0xe003, "Stopping target for host %ld(%p)\n", + ql_dbg(ql_dbg_tgt_mgt, vha, 0xe003, "Stopping target for host %ld(%p)\n", vha->host_no, vha); /* * Mutex needed to sync with qla_tgt_fc_port_[added,deleted]. @@ -1473,9 +1475,7 @@ EXPORT_SYMBOL(qlt_stop_phase1); /* Called by tcm_qla2xxx configfs code */ void qlt_stop_phase2(struct qla_tgt *tgt) { - struct qla_hw_data *ha = tgt->ha; - scsi_qla_host_t *vha = pci_get_drvdata(ha->pdev); - unsigned long flags; + scsi_qla_host_t *vha = tgt->vha; if (tgt->tgt_stopped) { ql_dbg(ql_dbg_tgt_mgt, vha, 0xf04f, @@ -1483,24 +1483,19 @@ void qlt_stop_phase2(struct qla_tgt *tgt) dump_stack(); return; } - - ql_dbg(ql_dbg_tgt_mgt, vha, 0xf00b, - "Waiting for %d IRQ commands to complete (tgt %p)", - tgt->irq_cmd_count, tgt); + if (!tgt->tgt_stop) { + ql_dbg(ql_dbg_tgt_mgt, vha, 0xf00b, + "%s: phase1 stop is not completed\n", __func__); + dump_stack(); + return; + } mutex_lock(&vha->vha_tgt.tgt_mutex); - spin_lock_irqsave(&ha->hardware_lock, flags); - while ((tgt->irq_cmd_count != 0) || (tgt->atio_irq_cmd_count != 0)) { - spin_unlock_irqrestore(&ha->hardware_lock, flags); - udelay(2); - spin_lock_irqsave(&ha->hardware_lock, flags); - } tgt->tgt_stop = 0; tgt->tgt_stopped = 1; - spin_unlock_irqrestore(&ha->hardware_lock, flags); mutex_unlock(&vha->vha_tgt.tgt_mutex); - ql_dbg(ql_dbg_tgt_mgt, vha, 0xf00c, "Stop of tgt %p finished", + ql_dbg(ql_dbg_tgt_mgt, vha, 0xf00c, "Stop of tgt %p finished\n", tgt); } EXPORT_SYMBOL(qlt_stop_phase2); @@ -1510,6 +1505,10 @@ static void qlt_release(struct qla_tgt *tgt) { scsi_qla_host_t *vha = tgt->vha; + if ((vha->vha_tgt.qla_tgt != NULL) && !tgt->tgt_stop && + !tgt->tgt_stopped) + qlt_stop_phase1(tgt); + if ((vha->vha_tgt.qla_tgt != NULL) && !tgt->tgt_stopped) qlt_stop_phase2(tgt); @@ -5502,7 +5501,7 @@ void qlt_async_event(uint16_t code, struct scsi_qla_host *vha, struct qla_tgt *tgt = vha->vha_tgt.qla_tgt; int login_code; - if (!ha->tgt.tgt_ops) + if (!tgt || tgt->tgt_stop || tgt->tgt_stopped) return; if (unlikely(tgt == NULL)) {