From patchwork Tue Sep 4 21:19: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: 10587995 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 36AEB175A for ; Tue, 4 Sep 2018 21:19:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 259C628F76 for ; Tue, 4 Sep 2018 21:19:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 19FC52A127; Tue, 4 Sep 2018 21:19:42 +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 979782A124 for ; Tue, 4 Sep 2018 21:19:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727438AbeIEBqf (ORCPT ); Tue, 4 Sep 2018 21:46:35 -0400 Received: from mail-eopbgr710068.outbound.protection.outlook.com ([40.107.71.68]:36408 "EHLO NAM05-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726864AbeIEBqf (ORCPT ); Tue, 4 Sep 2018 21:46:35 -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=3TBPMKrmNbTIUasND36swBZcN/BlGbYQ8rUokAsDnx4=; b=I+PDIVhQtb4FmseBHZ8yhZPCu7bZE7/AhaJ+AED/E9upupHQk35UW43DTW20ieivLkoDWaujfOSaecWcOBPcdEa6bDyREk2RKUFL3oQChYdw0w7gCDzTSQqqhBLLI9IlATOCJaDdGLwYXy3NIxyopziFmumC9/EgbKeuJWM4Lrw= Received: from DM5PR07CA0055.namprd07.prod.outlook.com (2603:10b6:4:ad::20) by SN6PR07MB4670.namprd07.prod.outlook.com (2603:10b6:805:3a::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1101.16; Tue, 4 Sep 2018 21:19:37 +0000 Received: from CO1NAM05FT006.eop-nam05.prod.protection.outlook.com (2a01:111:f400:7e50::207) by DM5PR07CA0055.outlook.office365.com (2603:10b6:4:ad::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1101.14 via Frontend Transport; Tue, 4 Sep 2018 21:19: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 CO1NAM05FT006.mail.protection.outlook.com (10.152.96.111) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.20.1143.1 via Frontend Transport; Tue, 4 Sep 2018 21:19: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, 4 Sep 2018 14:19:21 -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 w84LJN2Y032006; Tue, 4 Sep 2018 14:19:23 -0700 Received: (from root@localhost) by dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id w84LJN0m032005; Tue, 4 Sep 2018 14:19:23 -0700 From: Himanshu Madhani To: , CC: , Subject: [PATCH 11/13] qla2xxx: Remove stale ADISC_DONE event Date: Tue, 4 Sep 2018 14:19:19 -0700 Message-ID: <20180904211921.31927-12-himanshu.madhani@cavium.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20180904211921.31927-1-himanshu.madhani@cavium.com> References: <20180904211921.31927-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)(346002)(396003)(376002)(2980300002)(438002)(199004)(189003)(42186006)(6666003)(110136005)(54906003)(5660300001)(16586007)(44832011)(106002)(316002)(305945005)(2616005)(336012)(446003)(106466001)(36756003)(1076002)(11346002)(486006)(476003)(356003)(26005)(126002)(14444005)(50466002)(2906002)(47776003)(478600001)(8936002)(50226002)(51416003)(69596002)(87636003)(80596001)(48376002)(4326008)(72206003)(76176011)(81156014)(86362001)(81166006)(8676002)(186003);DIR:OUT;SFP:1101;SCL:1;SRVR:SN6PR07MB4670;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;CO1NAM05FT006;1:SMCGkZ1Hu+KhFjsX9xximM0EErIShFyx7R4EXqZ1iKEqsg0uhxiC1niMAtKUJWgyMTwUhRbpZOKgGklltpKS9xRUZ1Uy92OcLCgLaOYkPIt/8DB/V1kxajFeegJ9hGqw X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a3d0c558-fc0d-46c3-c6cb-08d612ac1e41 X-Microsoft-Antispam: BCL:0;PCL:0;RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(4608076)(2017052603328)(7153060);SRVR:SN6PR07MB4670; X-Microsoft-Exchange-Diagnostics: 1;SN6PR07MB4670;3:4kQJ0vLGXsZSYWuzlJSs1qywNUft3r/lznbmp9CCZ3jcgj8xM9Oex4CZm7FHKImHJexgvBIdfugB6agsziC4Lqo9PfhoZp4fkof2vGOIbpz5lwM+e580BcK+lqsdfx11WBYj3VDu+xepRBOnIyA84Sds2eAY3A7mN4J/MKhX+SktQrNBQjVBR3GMTnnXcANVUpeZwRw3A19eCrYg1Mnhtlssylnfwj23D91ZqzpBUgMFn47llp6YvW35ERa3FU3RX3o2gi+EyPW50nHi+8H7XjZcILtcoLanycm/zfUhHkEMoAFNkMGRK2xTij9zVFDIvK0jIeTDnzEaQFU4rqm2c/ooYsp2M1cSqSsiyI9I8xU=;25:RtDMWIFaEobHn9NHWKmhMtUNX1TRtd7X7CwWhpvtbCT7Q0Iw/h40xeIt7oYZruSy1aS1sjC+3KMmE6FHvAdbiAnFZZmWnQiKT0LM/lel2EhkavDaT0/cU/86cyuo3bZD9z3sceEpklD5cwPWg18Iv0jZWlA2nCi+bVdRU5NhFtgJjuM6VwqEyvK2t99JtHuEns7aP2s4DEuKs5agEGSoZA/7vbWUdRpnHfz7+ix85Ud8I34NYF97sL5hIMPSkJ1L1sdGgttt4u1TFJeGvdRb120lx5fdbAJGMSlj2MONf7SwSbQI0u+VGDdxC2ItYQsaj2jDVCOY3bneuJsgKBmTFA== X-MS-TrafficTypeDiagnostic: SN6PR07MB4670: X-Microsoft-Exchange-Diagnostics: 1;SN6PR07MB4670;31:OMY4j4HrLPaNpqHisBWjOFQeVJEo5PvOUZMte/dCdlguoCX1zJ7tWk3XTcTNtZiTxCIltBFXYD7Bb8PU+8EZC9ftSYy1/Nbs96wW8Ng17H9RnrzBc9hvOHGJQUglgMArBLp+xMgb/Gmy+uJ8/jQO8eipnLXZ9jq6YikLmHRJo1NwCqHbnP314HWe0cU8C9hr3eNZqMMAmLivV39f9M+Qsr8LughCNrfSxoujJzMcI6M=;20:xBT+ByiNIfofHvfB03q5GmEfXnqQqIljHM7tJ2HxO1wJmvi7Pr6Ua5uDMYDgk3B8CGaHL1tyGNWT9EahF3NQLWv2/Kn/I+KYct+CSJ3AU5MvHiZh/BRENYMe8E++gc3UNPiJkB55aPgiYBbylEMNj6XwZJ49PujMrQP7ek07ZbmCkz2L9mcp2jSrkoE/dT8+1UUQO002rRDAnx0i93c+0HCT9bEkl7RelaR1gePjECAwR2H3XvO+sJBIy+icolztNiDY9Wq7TLGLy3pQ52f9HrRc3JrGaR0KVDaIDKGUmJIr+yerH8wVFSU/l7MY34NqciKrW51Djze7FFh2Nn4ri6MQePEA9ta+SVEjLIMUHuhU3chlGolYkPfGQtimsgJHKOTkF7PAypQRKtSEHs1QS1ZoChXrBjR2/ZoJxJWzrFsj/JP3YbDKbtVCYNlKhqYLPVtyfFFemxWm+j6A2ORcPsL3eSq0Rf16rAoGor8vQ9AI6Hzks7X+r4vKaz+wZ2cT 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)(3002001)(3231311)(944501410)(52105095)(10201501046)(93006095)(93004095)(149027)(150027)(6041310)(20161123564045)(20161123558120)(20161123562045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(201708071742011)(7699016);SRVR:SN6PR07MB4670;BCL:0;PCL:0;RULEID:;SRVR:SN6PR07MB4670; X-Microsoft-Exchange-Diagnostics: 1;SN6PR07MB4670;4:z5dbk02bpzIZCkIheh59v3M77rKM90TYgB/hUAz0flOjPr4UfIILg7WhzCw2jPMd8ByuW7NtoLnTe8euWJyehHDR1Ws/v9cgRUA7StWfO1fc1w5kZC74j45zQo/s5ZbYhAZFb/8e/RPCXTA25Wv7MKLnJyk6V1KSOdFwGrnmAo+K796QDw+tq1nJFh0jMeTbz12BiCaOjiO7aDPSan0LcKj13y1tjo7oMJtujimJQS/KIYatduU6vWAttUCHQrhy0iagub83YZpmIFoMugoIzQ== X-Forefront-PRVS: 0785459C39 X-Microsoft-Exchange-Diagnostics: 1;SN6PR07MB4670;23:81nOSf2J/30pCtonr9MshLM7nM/NvZgjN3tuqeNI0yiyXRpSm6sooosDWeEb9PEpBAykgv1ba9oFaEfBaDCw7TVmjulzSaz/EzjH2GoQO3cQeFebamBTmtKh5KQlDF43tmz/xpejoexwTnNfUZTmZ0HK7QrizmU3G3Tb8dNzk7MaNJrlDkI2fFiiDNxHJEdkhYoYjmBmV7DmfwYulM17n+sjhAe4xmx80tTj/lEoGq0oM088jMDIbIn+XUYTeSWaP/xAvPXxEiYd+LA32WbDwKh6exQTKINNzXw4DTwttFBENRhAF8jD4kSvxUf6QBd0lPOx5XSFEAXkw8NQU0YZPXyH4nv4XpNKmUGuqEIYmCdnyO9yP5/KYdp+JbMmSZIAD977qDe48VS6YK+B4w4TPMJrlfBHEKs24EfKPMpWq7tcXTiNw0+VNY0Yn7oAm1xxeK896XtgxIT2faz7ekTWpwDvrSSeFwAkMy40g/DaLenueFFF8q6a2kw+hr5q2JeYLVa0WX37eQLmc5vZQpuSD9KVhD8PO/QI57bSE50DMHhzbnCs3PwPaFORxV+tcI9kgB1s0XRoJpxo7bechiM3YbXm/YCxLyC1OEbLCz3S108n6ngJvs8zpxAVvtZFQ5lfq4bWSPZw+i0dB6EfY24GM+2R2nRdGNViEfLkceVPYrbvmmjgbSzDeRt7YowXUqN9BAEJkGiivZnqLL2KIKnKoIor9/VVixJmBn40gwsPXHXvxVKLpTf7yZWYoTOkVE1QkA5r/5UY37Rs/Um0LQ1swwfDiCrEkMiY4OfOf252iNBpV5F6MPn+pxm6kXVPRQ7cD0ohLT0BGUQvo9pB/J26/W+0qn/s6iCAt2l/+vkfwfC50Qx8ywxmh+/MX+c6vqzLtn3NoDmH/Uw8L9HWzOV0TUJyQM4VM1FC+ljSiD2x7esho3Z/02+HPde5jgNEnpbLl9Zgl9jglVmFxMxGmAE1Wum6qNkfgZSr0LNYSB0ISgPLdNzJOK4VsFdeKPrlT7eVuYWVNQAkhvizTtQVIAqhCt884srqQ79cXF+lZCUspF9u7wfQXQJQNk+9td9pOdgJdNTNQmC7dVC/JAHRfCJBYLRGwzLiEVviIPtfOZ318CvQEw1PDhsdu1Weg7Aq4YYJ X-Microsoft-Antispam-Message-Info: Qx04EPgvOCipGMhFi7PZlrhoIWnNiVNKCJqPWm708ELW3ABShM57R6euf4R9QyzZhc2jFsg8YAtBgR+ljXnoNd5DgtlKPjT5JbnCZ26SAZP7pG6F4Fst5/G/PY01JQs74LNGDt9FsbE5GEBGaeUE+N9WzU7Pax8hQTDJWdguiyuVgDTxImqAuJkXIW7JNyjO+QVV/tjG909V3cLCngCE+AwJ3tJ+Tn8N6gvHuGWfa5qVbHa8Xxw/JlJ8FyybjF9aK51g8mguGTAyO7/skElH87+Tju2nOxi4hzps7Y2KIc570XVJP6dBHJKdFw/II/fSxBm1T9W3Mnt2LFdnGpGqVuHoZp7ZUmwWKWqks67OdnQ= X-Microsoft-Exchange-Diagnostics: 1;SN6PR07MB4670;6:7MzEMqnQ/dGYHHFSqfA8nwWRJZmXk2qfCmzMQol986kn/DSLNcjY53cQXEfqamx2FyYdXKmpQSOz0zKy4z2MB42+M+aYep2/NNCA+uwYU8jn68c1zx//QnT3f+fzPRRkrC8W7x2sQauoTALv538KTjwgnaKVDFY7ELLzXvjqBi18bplgrp3ckD/drVQEzfN0E00kP//Ye63rwPzEzjiCoJGbUDjvnKU/yVfCXmhd341m1t2ClLqlyoEAev04xR0car1ux5CTOdk3pgwe20TSafzPfn1WkFMp+U7e2LMmbEU1FY67TwmbEpd35VDsPcEurwqyIxBg+KQKdNR21+FlRbK4qarcBLuoUYGUfG7Bg+Tl1ivugT8JuZhMlnGZANGwqwvVb+TTfODUTXPIyYE70vJjXvUjkcn/ccKv2lm7YBKJGFsCYzWFnDtuCtg4YJWaqbOPPHUxRWYhnvXq6R7doA==;5:1uYdGUHbaJZ0bQERH8Ty/CWW5bzIwDIQh3T2AJ1l96s5zeUf4Qha1qRgmAJ74wJoeXZlEl0oozIvwPeytOVfISFxuFiLmA8ur4pIGeDHcDkf+82tJdi231u3lZNyHeG2B6ra/rVB0iRPciHKEmM5/y/P+U6M77SJaNr3Wq7pkw4=;7:QeLRJKe1WjkTgiybl7HSFAM8mMWf8uTD8PeOqpdxQF8he5sNFoCGuzdtin0oZiuMBRJvqbUPbMvPq7E225EEYAwFFL24+4+GpolI7ULiKEABGS+duw8lxtz23d0KC+tu+udVlwUC3abrDUhcJLIc+GubVauZBSdX/o/0kd/B0I1BTi44KhzV8HffLFX3jc1s8iXdN6tEZzfThRj5LuFvc5ULgfoqhUH0bWU2W4cIDTjIYt6+jRP6FpRiF8D+uGMj SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Sep 2018 21:19:36.8305 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a3d0c558-fc0d-46c3-c6cb-08d612ac1e41 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: SN6PR07MB4670 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_def.h | 1 - drivers/scsi/qla2xxx/qla_gbl.h | 2 -- drivers/scsi/qla2xxx/qla_init.c | 20 -------------------- drivers/scsi/qla2xxx/qla_os.c | 5 ----- 4 files changed, 28 deletions(-) diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h index 0a1cae0153b0..8145636c759d 100644 --- a/drivers/scsi/qla2xxx/qla_def.h +++ b/drivers/scsi/qla2xxx/qla_def.h @@ -3214,7 +3214,6 @@ enum qla_work_type { QLA_EVT_ASYNC_LOGOUT, QLA_EVT_ASYNC_LOGOUT_DONE, QLA_EVT_ASYNC_ADISC, - QLA_EVT_ASYNC_ADISC_DONE, QLA_EVT_UEVENT, QLA_EVT_AENFX, QLA_EVT_GPNID, diff --git a/drivers/scsi/qla2xxx/qla_gbl.h b/drivers/scsi/qla2xxx/qla_gbl.h index db642ea5358f..7018067b5707 100644 --- a/drivers/scsi/qla2xxx/qla_gbl.h +++ b/drivers/scsi/qla2xxx/qla_gbl.h @@ -73,8 +73,6 @@ extern void qla2x00_async_login_done(struct scsi_qla_host *, fc_port_t *, uint16_t *); extern void qla2x00_async_logout_done(struct scsi_qla_host *, fc_port_t *, uint16_t *); -extern void qla2x00_async_adisc_done(struct scsi_qla_host *, fc_port_t *, - uint16_t *); struct qla_work_evt *qla2x00_alloc_work(struct scsi_qla_host *, enum qla_work_type); extern int qla24xx_async_gnl(struct scsi_qla_host *, fc_port_t *); diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c index e7de6f149e34..245baf269656 100644 --- a/drivers/scsi/qla2xxx/qla_init.c +++ b/drivers/scsi/qla2xxx/qla_init.c @@ -2075,26 +2075,6 @@ qla2x00_async_logout_done(struct scsi_qla_host *vha, fc_port_t *fcport, return; } -void -qla2x00_async_adisc_done(struct scsi_qla_host *vha, fc_port_t *fcport, - uint16_t *data) -{ - fcport->flags &= ~(FCF_ASYNC_SENT | FCF_ASYNC_ACTIVE); - if (data[0] == MBS_COMMAND_COMPLETE) { - qla2x00_update_fcport(vha, fcport); - - return; - } - - /* Retry login. */ - if (data[1] & QLA_LOGIO_LOGIN_RETRIED) - set_bit(RELOGIN_NEEDED, &vha->dpc_flags); - else - qla2x00_mark_device_lost(vha, fcport, 1, 0); - - return; -} - /****************************************************************************/ /* QLogic ISP2x00 Hardware Support Functions. */ /****************************************************************************/ diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c index 842456132e27..6ce5a7326932 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c @@ -4733,7 +4733,6 @@ qla2x00_post_async_work(login, QLA_EVT_ASYNC_LOGIN); qla2x00_post_async_work(logout, QLA_EVT_ASYNC_LOGOUT); qla2x00_post_async_work(logout_done, QLA_EVT_ASYNC_LOGOUT_DONE); qla2x00_post_async_work(adisc, QLA_EVT_ASYNC_ADISC); -qla2x00_post_async_work(adisc_done, QLA_EVT_ASYNC_ADISC_DONE); qla2x00_post_async_work(prlo, QLA_EVT_ASYNC_PRLO); qla2x00_post_async_work(prlo_done, QLA_EVT_ASYNC_PRLO_DONE); @@ -5022,10 +5021,6 @@ qla2x00_do_work(struct scsi_qla_host *vha) qla2x00_async_adisc(vha, e->u.logio.fcport, e->u.logio.data); break; - case QLA_EVT_ASYNC_ADISC_DONE: - qla2x00_async_adisc_done(vha, e->u.logio.fcport, - e->u.logio.data); - break; case QLA_EVT_UEVENT: qla2x00_uevent_emit(vha, e->u.uevent.code); break;