Message ID | 20180718212955.13450-5-himanshu.madhani@cavium.com (mailing list archive) |
---|---|
State | Accepted |
Headers | show
Return-Path: <linux-scsi-owner@kernel.org> 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 5DE3E6053F for <patchwork-linux-scsi@patchwork.kernel.org>; Wed, 18 Jul 2018 21:30:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4D26729A0F for <patchwork-linux-scsi@patchwork.kernel.org>; Wed, 18 Jul 2018 21:30:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4118329BA1; Wed, 18 Jul 2018 21:30:44 +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 9DC1B29A0F for <patchwork-linux-scsi@patchwork.kernel.org>; Wed, 18 Jul 2018 21:30:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729221AbeGRWK3 (ORCPT <rfc822;patchwork-linux-scsi@patchwork.kernel.org>); Wed, 18 Jul 2018 18:10:29 -0400 Received: from mail-co1nam03on0069.outbound.protection.outlook.com ([104.47.40.69]:12320 "EHLO NAM03-CO1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726999AbeGRWK3 (ORCPT <rfc822;linux-scsi@vger.kernel.org>); Wed, 18 Jul 2018 18:10:29 -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=spjoNb2XMVsOaWXT37S8Hk8vWT16W0sKU784qcE7ILw=; b=eY0FeuTmkFjJ2lWKVOsvbNDE0KpPeCe0+qEg3+LJYYOY+yddx+8Aae8l1CzkXF9yuwAWMvOXIUBpOOSIS/HhOBJHh9xgfqzjHa3VE/2gZsYiUdEdkHeDh+gZFyNBy/8BSTZ51rJg+wpv26j4saFFhu642oDvLklVZ5hHFtcvG1U= Received: from CO2PR07CA0080.namprd07.prod.outlook.com (2603:10b6:100::48) by BN3PR0701MB1377.namprd07.prod.outlook.com (2a01:111:e400:4018::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.952.18; Wed, 18 Jul 2018 21:30:05 +0000 Received: from BY2NAM05FT008.eop-nam05.prod.protection.outlook.com (2a01:111:f400:7e52::209) by CO2PR07CA0080.outlook.office365.com (2603:10b6:100::48) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.973.16 via Frontend Transport; Wed, 18 Jul 2018 21:30:04 +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 BY2NAM05FT008.mail.protection.outlook.com (10.152.100.145) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.20.995.0 via Frontend Transport; Wed, 18 Jul 2018 21:30:04 +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; Wed, 18 Jul 2018 14:29:57 -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 w6ILTu4D013501; Wed, 18 Jul 2018 14:29:56 -0700 Received: (from root@localhost) by dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id w6ILTuGD013500; Wed, 18 Jul 2018 14:29:56 -0700 From: Himanshu Madhani <himanshu.madhani@cavium.com> To: <James.Bottomley@HansenPartnership.com>, <martin.petersen@oracle.com> CC: <himanshu.madhani@cavium.com>, <linux-scsi@vger.kernel.org> Subject: [PATCH 4/5] qla2xxx: Fix ISP recovery on unload Date: Wed, 18 Jul 2018 14:29:54 -0700 Message-ID: <20180718212955.13450-5-himanshu.madhani@cavium.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20180718212955.13450-1-himanshu.madhani@cavium.com> References: <20180718212955.13450-1-himanshu.madhani@cavium.com> MIME-Version: 1.0 Content-Type: text/plain X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:50.232.66.26; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(346002)(376002)(136003)(39860400002)(396003)(2980300002)(438002)(189003)(199004)(316002)(48376002)(44832011)(110136005)(16586007)(42186006)(356003)(51416003)(50466002)(186003)(76176011)(126002)(106002)(72206003)(2616005)(26005)(80596001)(486006)(305945005)(5660300001)(106466001)(69596002)(476003)(54906003)(478600001)(11346002)(8676002)(1076002)(36756003)(86362001)(81156014)(81166006)(8936002)(2906002)(336012)(446003)(50226002)(87636003)(47776003)(4326008); DIR:OUT; SFP:1101; SCL:1; SRVR:BN3PR0701MB1377; 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; BY2NAM05FT008; 1:GGZ9OS788N+k+kMu0hB7Egqgwb+2B6UuQhoSJHqVeFwVCADg9mdvWa2cXqZeZP7pr+byDmX+BuxapNK/GmgBOUEccMuASZ6Cb9sC9cggnaD9FMcjnNDxLAU9PpTauha7 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: edde2352-26e0-4865-9b00-08d5ecf5a081 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989117)(5600053)(711020)(4608076)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(2017052603328)(7153060); SRVR:BN3PR0701MB1377; X-Microsoft-Exchange-Diagnostics: 1; BN3PR0701MB1377; 3:yX6YNH0jkR/Pbqd11MmwKTEJWrE/JRzMcn2MRUObc1Zjk5aBshmpnbxomOHCXkZeTaUq9Tc2V6kPYOY6y1fXzxvKcWmJIITv/RJVK3Hm4dTXzt0EfNV80egYxm0ImYThvWYKuHdeyrMnYS0N8BQkalBfI93+6txTDXtNR1rOaIFwX3McSnyYuLmLjRWtQNQc/jcGCMwmcAZ5sPtfhLT4z7EVxJmbZjEtxREDeFHpGILf3j9jjnImINM1Y/9GYlnm7zZH7EqqKMBjna+wk4YRp1u16KaLk/8uJ7RgOuKFWYccuNk40+9NYVH1Dus/t2K9DKoFb3Bf0a0KF/PIuE5totcSKUfSQjZPHXwuc6VmKaE=; 25:qSo2wLvkEuuidZ3JSH9xEMPFGxO9n5TP3yP6sgQLTTw4lD5YhYolIUl9WfmaF6ctkAeZ8YgKboqpVm8D/3ELo4r0C5t1cAk8gHdTJWK5sdrHyng/mVGbE4Vud8UIECfo5nYA392aAkIEB8JD86we6E16aBkt2l0azm7aZT825zEmUpAAEUIr959jbY8Iiy0QX1Is9lZGSqFFrLfXQ0Jx+cEXTtzpE/xQct3FWe/TDdgXfz2SDxdvboAzeKgMrvqbWm1iN6le37/HcdUFpCqbWOVxoTPFiR6w69yOjpnCtVrV+lX7vRObOeEpaAOLzr7NyooX8AWqCxw/eXpmg1B6ng== X-MS-TrafficTypeDiagnostic: BN3PR0701MB1377: X-Microsoft-Exchange-Diagnostics: 1; BN3PR0701MB1377; 31:qwegpzCNLBZTDbBTlZzbGn9HLnsdRla2k9Cbc+jZ1BklL6VhpG9LEDNvobnf8bQx04K45lbza28AJ7bxBjAkE/h2Oma7C5SI8m1j3ofu3MP0vKmbUdBtvL9zu3qKawH3AS7bLLxCuM+QituAF+DbLBoI6A6MGpJSK4ekrT/9bBUQsypfoq0LVgpUF9IypCf+c5P2IJi60J65coajas8Te+zsvIDElsVdYdjT8IXyT5g=; 20:fKVr82V+RRYOkhKTC7lXwtCTobhs219/TIkR9oMLB3LnITF63xozDLqe8/ElMG7vqZvvS/b2C4WFKqi2Ta8OtPrIc24hwwA7ZJIg54vHfHmuFSYhLdY2lW9S5GdRVlu0LmBuV93x8mCFSwX04a4R/5/+kH62NT8jS40mYTUHV6UpA19bxGZCaCYaXRcK5B5zlUaEEFRuIB4pg1azKeBIxh4SrSuNSfJVdNQXV6idyp8p94SYvX/UFEeDlV3IJ/P4Lte0J4MYVYHJzynwklC30ikoR9scNzhcSY7rbolDYC9TbGjgDfIZRUXB/jCeHAFkGothLUqIqHih6zvZ0QYkI3nxFEq2hOF8jvZfFcIGZsx5A+58IkvDEK7CCpSGqzEcEQF/9R5YaChlnon/e4kpNlGeBPdoG+/6MH7y8PGEYJE6MGcmbJXUrw5KMfJJuIDDhgJBhOs1JJ4SHh8a+IJxOfqvKXwZfQY50zC3ZMn3gAqapCKoQmWsNi4PyiVgssbn X-Microsoft-Antispam-PRVS: <BN3PR0701MB1377F2BACD6C5D6AB094A32BF5530@BN3PR0701MB1377.namprd07.prod.outlook.com> 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)(93006095)(93004095)(3002001)(3231311)(944501410)(52105095)(10201501046)(149027)(150027)(6041310)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123562045)(20161123564045)(6072148)(201708071742011)(7699016); SRVR:BN3PR0701MB1377; BCL:0; PCL:0; RULEID:; SRVR:BN3PR0701MB1377; X-Microsoft-Exchange-Diagnostics: 1; BN3PR0701MB1377; 4:3L0e4CQODw0LwxYM9uZHO/+WkY/VHPH5cgB+8sJEylMoCzco7ZLTUOklBjNcNejaYgYftDy1C/yp8JCexLjTJadX0I9sVJUdNl2/9GmIjy0sEoqN5k3CMa5ORpOLVoUGouDvbVwzPDv1wlJOiYJo9ZVI1LBxvP0RF8pE/wrVYZ+xP1OzyWAg9xUKpACMas9DznKJaxuT2Abvqwfbs7RUu7T/6oDM5sColj41ImWp4jg8JzcZetQefTJ6dCPjEBaZ7luUtm8JZAPZtYZ//cfahfPro380jeMrrWkcwEkjJxT4Wq0XbYbym9R1g5koNKg3 X-Forefront-PRVS: 0737B96801 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN3PR0701MB1377; 23:Kkz3tt1wzvmp4NpKCZK8knbI5zcAiKsyUFQvtT5?= =?us-ascii?Q?pCAbBrqHwptnoPDCMwQVpBf5f5E1fdB49acD9vrOKrKsEWmOw0w12HD2WoK4?= =?us-ascii?Q?V7koagghGTl9ySEZBGgkvup/fEECqynNnFmFxmQKMuzVn5MkLs7RHit7laJ1?= =?us-ascii?Q?vp8b5M1+bFXFnwoI4H7PsR04lEuuyq1867uEZru9PtLrmff44oDeTQJsjYOC?= =?us-ascii?Q?UMbKgXXBW4v1V6GF9u8RB/u8YiJCXLG6LaYJfc7cu7D4+WYLULvW3ByOPwjD?= =?us-ascii?Q?TPcq1VZhCoysW2WZmLikFGM1y2325ymRQLsE7GI+C3cxOjOl211siE6m9d8n?= =?us-ascii?Q?Vq5s3vUe1o6C0tXSA+gKGd9Ze7sfu39PZRyCH9QXDp96zx82STt4S8wN/SIm?= =?us-ascii?Q?76KJR01dyJykPk9hW7ZKDVeE4Lb6FRjvfjB8kMA1SIjK0jMbCaoNOGvor2uD?= =?us-ascii?Q?vR19U3ZlPirVKjA6LGykoU3fPOtyvivcx1pWXzMT65QjWR3PigBRNxpKKNPq?= =?us-ascii?Q?qU9IJGULQmH/f0gtmBvXDyZwimbLJKlY9px+hhyhfDZDKnFOK0PKM6Hj3GNU?= =?us-ascii?Q?7/wfxm16fTVANovSoRA8NcNLSEmVZXunOLX9P9O6wjb3CiejOlINGadj8WZw?= =?us-ascii?Q?NtdIuRA877bFw3r0L9pbZ9dp5qwD+7AIi+jHOHvDGVveP7Wl3kTgR3fHfitX?= =?us-ascii?Q?3B4TamvJ+DpIE2/WhoYyUShr3auk8/tng5M6hfV167aEQB1xDXp8qfnfBPT9?= =?us-ascii?Q?Lxn7kSov3DqESQrfVwHJbZ9a12TYer3BtMOcXxH4pHh/1Icf6sONAkWYzj0m?= =?us-ascii?Q?D6ZlSn9F/NeyEi3nRmLWp5MjO3NW+5+HddkrI91sgu8P8mFd+Cobi2uj1EP0?= =?us-ascii?Q?vsRwI6Nb9IrvxBJxatN0bvlkhChbHk30Swo5qcPicfBIcyES/0WyXtV7ZVHA?= =?us-ascii?Q?qyNxqtw66K/OD5Wxjv6rsb+P1rFrx9KkxBRQGNamjMeODHYFUqa4FkJwiZSz?= =?us-ascii?Q?y/p4TjsDADDTdRF+aSUg8TIk8d64h0+Rrn1UWOMtOAmsbY+UGummzqxNCQ3r?= =?us-ascii?Q?5f5pELxkSpkiKiq9hgGxd/5n3sCCMyspgtWDKhuJ/tJQnrD+5wA=3D=3D?= X-Microsoft-Antispam-Message-Info: tEo3KZ1m/LMNWPty0X4GTdARVgEeCGDLUosnrRmJKDuTS81fpSejIyAl05ViRjnbHHImmiGWFiSqxdPedtshSEcQeHDSkYjvaSMPIVvDFfGRUgDV/IZONf1J+AvC5hKj53PQ/9rZ6pamVuJQJ3xHFnHX3YcjfG4z6j2bPKNtyg9KOX7cuVVP2mMhGucEhPHr2XcVj94+1AjbNiyfM2cQ581XWFXlQKchaYsZQhO0KeGDW1rzi8agwSGYzacJIUPtKBoWqWaH3uj26u32jlPIRHGLFOm+k0Smqx9tCzPq3vWXEJXZMOxYx6c5sw5Lhr8cC/XeQ3XWQUCi2ui1f/q6dq6EEfhGnMaOOlus67FeoNE= X-Microsoft-Exchange-Diagnostics: 1; BN3PR0701MB1377; 6:6fsD+uq+h1ViVbuY57jRRO37QyDUlYjyg0dNZ9FIFJg7RYWkZ2Z68i7xoMg0VoN4vzdSZPo9Ea5Qtdrf/q6ACsvfTBDgstqSSSrjh7T0s3R59wCvzsEIHAyuPWnyukPeEeLPf3k0rWredbZ+YRK74DJKYKnk+7Pe7vKB+Y02XR7LTpG0DvFidEXLX1iKTr/DPgtIP5V+H/IW/oNFHftF504THo3b9SNdAkU7r7JUz9SEdwp/kMMRwl4CP6XIPDkIQfSK3g2AAnOVZIPLeIVQEcMSoNpB9Oa6Qw45hldlXfMmK2+nUyeVru+PfT6tDh9uAmaeCqo1mo3uKvQEQsFsYWzjXUigznnwE26qTLklTez9TObI3c8WDbMRNyEG4y6JNoYz8myPL7ODTGA2N18OSo5TuCh5RP2LkEG3vNnVKZNHoWGdo0HrHrnYPT+/I25w5RCKQ8g738nas2KJvKBkfg==; 5:M0f+iOcouq0JshfgxjHjdp+LUtMPWJRxBM6aHPWYOD8Niqp4G/OnfDKFxXhfMNUyl2ny0OZbIVagKq9oN0g9l+dNTgzIhzuizqLAcZumCFe6YdRKWa3nnd8Jg+mKICrAe+chhN5AZUeCVSsifUU81kr1qGDmGL0T21+e0tPDo9E=; 24:m6dKeTWoh/+tlhebEe2dKpo5MU2ynicTtt/PuYfGcbzA514KAbRrEf04gweXPtFoVsH15+Dnv919/sVbvBBQ2pfvi5qF9cclC81Ms2m4VCY= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BN3PR0701MB1377; 7:430ejbbhWQBzOG6UHMyezk3vUY7crNcICILYZl5R4i0Nt74Z3+b5MH9MwS4vOKLrX7Pn0DVN1kVA8dpS7pTwKAvW0xUIxcikWGh/liJK/TvbhqzF1ZO8Z2vjLuRX3ssvaBe1nIekv3eTLlG4fEpPh8k8aQ6zKHLwASq/zwt1Pd7zVvvrOe63q/ENbshcV/SvZ5vr3bhvM4EvkPcGF3Rg+fUI7eTNwEjXENGJnTmdh/3HhCM4suQkZkW7aBdNITw4 X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jul 2018 21:30:04.4753 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: edde2352-26e0-4865-9b00-08d5ecf5a081 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: BN3PR0701MB1377 Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: <linux-scsi.vger.kernel.org> X-Mailing-List: linux-scsi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP |
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c index 2cd2e5ccce15..1fbd16c8c9a7 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c @@ -6020,8 +6020,9 @@ qla2x00_do_dpc(void *data) set_bit(ISP_ABORT_NEEDED, &base_vha->dpc_flags); } - if (test_and_clear_bit(ISP_ABORT_NEEDED, - &base_vha->dpc_flags)) { + if (test_and_clear_bit + (ISP_ABORT_NEEDED, &base_vha->dpc_flags) && + !test_bit(UNLOADING, &base_vha->dpc_flags)) { ql_dbg(ql_dbg_dpc, base_vha, 0x4007, "ISP abort scheduled.\n");