From patchwork Fri Aug 31 18:24: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: 10584329 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 C709A112B for ; Fri, 31 Aug 2018 18:24:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B5A392C5B2 for ; Fri, 31 Aug 2018 18:24:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A65542C535; Fri, 31 Aug 2018 18:24: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 0F8532C535 for ; Fri, 31 Aug 2018 18:24:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727528AbeHaWd2 (ORCPT ); Fri, 31 Aug 2018 18:33:28 -0400 Received: from mail-eopbgr680084.outbound.protection.outlook.com ([40.107.68.84]:63488 "EHLO NAM04-BN3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727518AbeHaWd2 (ORCPT ); Fri, 31 Aug 2018 18:33:28 -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=CfJomuxMO0Ykf32dJ6beHDUOvEtGG8fEuCEx6D76pVI=; b=GNCc/KGT6U7Zz/qMOS4xx0CJDFKmf12IkWQnwgBbScu01sj2Q1hZu6tbYf8OTFo2aYVzE1An3bB9ccPQ17N1u1D1fKbRPxM9opwAD4TvAPF6NmvgXlkcSsO4TrOiOUeiH4LKucWOdZjdrslRbvfLCwjXGDewBJkdaeJZkkJvQsw= Received: from DM5PR07CA0110.namprd07.prod.outlook.com (2603:10b6:4:ae::39) by SN6PR07MB4671.namprd07.prod.outlook.com (2603:10b6:805:3b::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1101.17; Fri, 31 Aug 2018 18:24:43 +0000 Received: from DM3NAM05FT030.eop-nam05.prod.protection.outlook.com (2a01:111:f400:7e51::207) by DM5PR07CA0110.outlook.office365.com (2603:10b6:4:ae::39) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1101.17 via Frontend Transport; Fri, 31 Aug 2018 18:24:43 +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 DM3NAM05FT030.mail.protection.outlook.com (10.152.98.142) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P256) id 15.20.1122.2 via Frontend Transport; Fri, 31 Aug 2018 18:24:42 +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, 31 Aug 2018 11:24:39 -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 w7VIOdUq024221; Fri, 31 Aug 2018 11:24:39 -0700 Received: (from root@localhost) by dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id w7VIOdKk024220; Fri, 31 Aug 2018 11:24:39 -0700 From: Himanshu Madhani To: , CC: , Subject: [PATCH v2 01/14] qla2xxx: Fix process response queue for ISP26XX and above Date: Fri, 31 Aug 2018 11:24:26 -0700 Message-ID: <20180831182439.24182-2-himanshu.madhani@cavium.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20180831182439.24182-1-himanshu.madhani@cavium.com> References: <20180831182439.24182-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)(346002)(39850400004)(396003)(376002)(2980300002)(438002)(199004)(189003)(2906002)(86362001)(81166006)(81156014)(6666003)(186003)(5660300001)(1076002)(305945005)(8936002)(106466001)(356003)(4326008)(26005)(126002)(486006)(48376002)(76176011)(50466002)(72206003)(106002)(51416003)(2616005)(11346002)(44832011)(36756003)(446003)(476003)(110136005)(42186006)(316002)(8676002)(54906003)(478600001)(16586007)(336012)(87636003)(50226002)(80596001)(14444005)(69596002)(47776003);DIR:OUT;SFP:1101;SCL:1;SRVR:SN6PR07MB4671;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;DM3NAM05FT030;1:Bgsqku7lPqO45xZHNuFMD8desPOuNZuej97FiHQk7S2CGBPOSmn2CcGtMTe28z/vTdCgqGZUcUEo6cSNKVSmVVi7WXPtUd8+53VSxYw+08iq0jX728U4txQgBOU/EfrN X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6e3a5dea-a25d-4836-9982-08d60f6f05c3 X-Microsoft-Antispam: BCL:0;PCL:0;RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(4608076)(2017052603328)(7153060);SRVR:SN6PR07MB4671; X-Microsoft-Exchange-Diagnostics: 1;SN6PR07MB4671;3:c107rkRiCY2ia+MA7Rg006hQqSw7/W/QZo4/nP7ap4dBdoDItzvBMHJiPbiCD0a+ecGk/dhAaNOUiwMryJ9RyhQQB9bVBiYv6wswaHUcJmIGb74PF2N3W96U/6WpzBgBvCU4FYi1ZGMumPTDD+dEfse/ZgLGNmcfy4cS/KINasI9rvr5P/0HHERfGPd34tkQNBW2yDqhbOBd8VuJYeYrfMx0gT8WKtIopJmAW6KLo1/aoKW/AeLT4xx4UimYxx/HSRUjsItjbnp1SCJ33Q41tnXIFN4UBuK8pWjkPecQf6GAcm/tyKcektf578kdbhG1lPk/QO2RpljKTDhT3at0ZFVGReWjKGuXcooi7XZmwb8=;25:1HtQbzdc3UmTpEv9Uv23oSRUDPQBO3gmlpuGGadyAFn28B2paDqqyvvwdlHMUDKaTOTo3hcnh6I9mRjR+L5GGIQyfKaeZ087PRA4xbGQh9M2W19GrgSt6emkgjmuOiRMz/jQEoJWLfVLRXjDL4TzeUZ9v31E5EaNNtxX1UlvB9ZwQuQoYf29cecFuAalacX56XcelSHvKYfQsG9Xxqm1sRObPe2ey5Pixwn99vxB4x0MX9/wahhknbsMxEqzlaaq3DkMUqzqoKizcj67gvJ9DwpSC1vf663mT5NiYTRVzWBgEKgDBp6ZnaPqlb+8VQrdYivYNUUO9hrQkmorCcD5PA== X-MS-TrafficTypeDiagnostic: SN6PR07MB4671: X-Microsoft-Exchange-Diagnostics: 1;SN6PR07MB4671;31:+ztwzz1xvAO7lLCvknEpcdvWgMnXFKHTpyxgmqIGPwcvq+R0HiuI2TfebimwjT47QWluYVGgX04RTE7mlzbLx5EBn2s3WqJBVMt88Jvyl3sNlb0uezt2kxJjY4PAb9fVCxRYx/7poQOU1MZE5CRzbjOmEUjcU944eJZLy21HKhBrUvksCXZF7+DH1d5w/YKOHEklakxUHG0G71yEKrRtbrtUw5FEMDhcXJtBiadWYEY=;20:I8NCbtXRKhqi95Rpu0WIsg5QBDY5RY088EWTKC5mjMg2mxCsedUd+v7RTDX/3EIiFtz26yOTczY+uH0kuyHmEzPyLOCaNQ0faOB1cTRGbM9J2f+Y6+zvmG4nKILMULdwo0b1R+FlEJAbvcFmfNDAIS0SY1qFlLQaaNGSZZtpWiXsMOZAATA26Ctu77jiDv1iJAjG+Cg0KedA8SwQyCCMVxwbsB2wz8Om6FxGPWyOX/krUilV/gSCiAGM+PaMImsAJdhYViswzJDoEiOzXe+UC61OARzn1LX5aZ+YmMAEOlUhw+ksL5UGMXs+41I1xxZKKxe1AsrJkilUs4JD9S2KgQKbmhmVUpy/Fiy1A1TopsIRolzAV9bdNmcVosz6uiJse7z54kU0b0le9TpZ2bExNQBfzgmGsQqhld06fEaeINEVD21n0nRTRSKdL0PJPYt1j7Nn7pCDkIcOqa61lC8DTRpDC1unX5fsTzO01PtdXIi4x9J2wTHYVMnLufBxKnP9 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)(5005006)(8121501046)(3002001)(3231311)(944501410)(52105095)(93006095)(93004095)(10201501046)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123564045)(20161123562045)(20161123558120)(201708071742011)(7699016);SRVR:SN6PR07MB4671;BCL:0;PCL:0;RULEID:;SRVR:SN6PR07MB4671; X-Microsoft-Exchange-Diagnostics: 1;SN6PR07MB4671;4:6EAJcZ4l9AtNAGw2+id8UPi5YyUG7zyOcjhLd0XpX5jWdIw2YhKjComdJu+kwyr60xj+uLZ9VJOVEjAczLYcD1S9Nb4gQCRWXxA2BJl27cPoGnaWHoxYJ3XMIBuDImgovhB786Jo2HlPzFS1JWr30utRTmJ8z9X/UGGS2QM7ouSGjQHgMuWgsdI09PMT1vlvEIjdJ5O9dTEa0l3TftXEUbvLD2SpSqNPQoSSS9F8RLrLeLustOXcMyGU6oOVRq+LjmGnG+83IIGkbgERGjqfOiW/zWTC7aT4fgJ4aETFKG561eraAFuRdt/H3Mpx3oP9 X-Forefront-PRVS: 07817FCC2D X-Microsoft-Exchange-Diagnostics: 1;SN6PR07MB4671;23:6QO/me7mtmci/VwO/J9kWyuyLFMnt8KwRko2YbGEwc5HsznSjNzjodrrKsrqsEu2Mf9cRfr9amgDQILilq/UEiYr2gLqDWtQKgUpoYPhDaZzBHf8+SmQ1jluEgfPLLDPEpOSBBOnOWhR98nIWRftten9oarxRgC7Key4edphOuYzj1EcTSLbZPlTuRwL2WgmakvfA/gMbqr+Y+2yBj5yqLZAYnffI+ysDGwHjKQAwQsHTdh474YSvTYMyMu3XDPXDbP8wIRsOoSRQR2EMaDcI6od4r01lgN80HUnCRj1szlD1HKVkPXYuzjnKAwXTjCcydtVP4loMB4MCqJiIgJNwjlfT9unwdgHkkEyhwco9mxkNxxjkwr43f6QfQj8KnaUwQZm9IMEc2qMO36kM+6HWNkNQ1xriTUy0eZgzLxaj+UvW0NH4lMzS/j9sPQ5ubFaZ4GFtojtNDjHB/WY947gYBYnyv4Sq+VOvP3HaSrqjmGGkyMznAbh/dxmHNZfsCfdcY0AdFcSrWbQX7CUjVc70DQXhJvnj5yMnB/mEPZRkS7WLFRMgkHu7jtTTpi8ZIca/9ZJhnvel+iKH3SeMBc5IbiVHojhe8GJZrHY/XJXtcjVJNnErfXuuKu7hfTGkdoTEBlpk57JSmHUg8fTW9A4Fz78VdbXHGNniHD8gQXx+MuIWvlft77MHyFO8S3LmOe/n9gi7epHJppY7pmbBGop5f4PkHorAMNgPu/feoUqJahg0J7dy5c3hUgiEDo2xz63H5O09wEdJty3qXHv5wV/mX9xJ4RrBcUx8RBbPCDhWRqkrB+O6hxkmoHbo0E5VZr8ZDNY5lbhhyJjyxo+ZDNOOxilPn+FuuOFFjT4cxwisXkYtDB6xchLBiGHOWGLqsgC3qEo3kBfargnKuIIyezzQU2ggy8uzq7KmCyWDOZpJxeuHubDEf5fi2wHnPasghmyVhoP0164u5E4Cv92wNDjOo2/YttNkqGkTdcsMln13Sz+3TFZZ7t2nKkNzJB5lpapU7O2lrmUt1BUCeSmaVbLjR7YzjkwaH2nZstPRWZVxe8aZmHBCuNNHpQ+c5bOj6bInkdZhganl9O/9wtkyAALwjzG2sR3ZsNtZzF3Cx253OUc+zwEqtKQBt6MQ8Y6iGVr X-Microsoft-Antispam-Message-Info: So+MNgHTAyIrdNqmX6qQdra7j9AV+LcnIjM0dLbAPw1VaF3zB7QMy/1SxEwdyFBaiHOqDKkqlLEprtTJMwDm/OyODWggUqg0L5vh+Ah5QR44wcy1YNi2PpQ9N+fbfsHcS6e9M80Vbzv1rKHTjlQU9fEiel9wJ6awy78VHasP148spk9wH8YscPn9tkirSjrYf1hns7w5KquShuUAUxyc9NzJPxm6B6DbkpUVDDwn9Y7Sm7wd3IurjkZ8mGm+RD7pphIDozMlNJ4TL7iJj57pF3kLRBc9ud+W/Wgs2B3kVx1IPBYMuKmLt2flX4I8Lj0pRGxRGozsp9IVHJ9FmTEtU/z0D4P/+r7x91MXbAPR58E= X-Microsoft-Exchange-Diagnostics: 1;SN6PR07MB4671;6:SZe+1yYiOzdwCG8Q1dvfoC43gwXBaN+Y5OsP6RwvuoblvV2/5ZclkuX5vWE08P503pzL8wFnIQzZ/SvUTh/9RvbFTCYYPy418wffoheaHwp/tSwWUKo5QLWWh0LNXFf6aH12ba5AIUrvr/uDt1AK7h32P8OO3he9DRpSMOG4bZH0WSjLBlbscDIZHCIQ8VGktmo2iHpiVCRDeeqFJA9aZTgla2SjjFNudH3j7EpGjLfR7dQFdWStENFbBEq+DoyQuaGzY90mOYS5ROGgHb9MZ3YJZzUC4cD7qeuBfE4KmyFdj1hZFSqDDf9R50FyAYZ6mZxKtoIjbeXvxL1CG6KUIoUW4zl7xt4sT8Y1uT8lSycr5zWIZZJSKbhmqiuxpqbjG/FXmxs6pEVau51zs/CuB5czKVE1h9TeJIbO5LiK8e0IC6iF39oGpScJfnS4oiMQgMY7GB0zaYCeajLqZlrK4g==;5:pHWQhoULZHfoPv6F3iGVGElRfNP2/wob659a55mS4lNQMQdJAFDdnHJzNEyaIsROqCNjhPuzg1v6gWWdzX6h6Jym5v/zIupa9MP3nQsJSczmtIoXVGXf4xIOM1CZC9Y6ARZKiL6XnaU5tsxl2PdcCm69bD/x8GQLJ5+Ff74QEuw=;7:WOlFJG+9iY+h0PnbwGYkiy2GNE24CRTt2Pupbt1ATFxs1BGMG6f+8BYEBMMavi9969BhMge9wGr6AZ2k4W/oOXt4pA2MKROMZ9b/ZO18W+mzRG6XvoGWyq69ODaHAE2oIpxLmR5b6ZCBBZ/vzGFvFj40BZKTtOouxhESjHzovJyvBCvkdesYlZDGPLCNwzZ7UO/1uvpEKnevNlZOjZ5vp56WnTiqzIfOS+RKWp+yMNbNceSqeqLTi+zEUQ41rNLG SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Aug 2018 18:24:42.9182 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6e3a5dea-a25d-4836-9982-08d60f6f05c3 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: SN6PR07MB4671 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 improves performance for 16G and above adaper by removing additional call to process_response_queue(). Cc: Signed-off-by: Quinn Tran Signed-off-by: Himanshu Madhani --- drivers/scsi/qla2xxx/qla_init.c | 2 -- drivers/scsi/qla2xxx/qla_iocb.c | 17 ----------------- 2 files changed, 19 deletions(-) diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c index b934977c5c26..4686fb5f26aa 100644 --- a/drivers/scsi/qla2xxx/qla_init.c +++ b/drivers/scsi/qla2xxx/qla_init.c @@ -7142,7 +7142,6 @@ qla24xx_nvram_config(scsi_qla_host_t *vha) } icb->firmware_options_2 &= cpu_to_le32( ~(BIT_3 | BIT_2 | BIT_1 | BIT_0)); - vha->flags.process_response_queue = 0; if (ha->zio_mode != QLA_ZIO_DISABLED) { ha->zio_mode = QLA_ZIO_MODE_6; @@ -7153,7 +7152,6 @@ qla24xx_nvram_config(scsi_qla_host_t *vha) icb->firmware_options_2 |= cpu_to_le32( (uint32_t)ha->zio_mode); icb->interrupt_delay_timer = cpu_to_le16(ha->zio_timer); - vha->flags.process_response_queue = 1; } if (rval) { diff --git a/drivers/scsi/qla2xxx/qla_iocb.c b/drivers/scsi/qla2xxx/qla_iocb.c index 42ac8e097419..119927220299 100644 --- a/drivers/scsi/qla2xxx/qla_iocb.c +++ b/drivers/scsi/qla2xxx/qla_iocb.c @@ -1526,12 +1526,6 @@ qla24xx_start_scsi(srb_t *sp) /* Set chip new ring index. */ WRT_REG_DWORD(req->req_q_in, req->ring_index); - RD_REG_DWORD_RELAXED(&ha->iobase->isp24.hccr); - - /* Manage unprocessed RIO/ZIO commands in response queue. */ - if (vha->flags.process_response_queue && - rsp->ring_ptr->signature != RESPONSE_PROCESSED) - qla24xx_process_response_queue(vha, rsp); spin_unlock_irqrestore(&ha->hardware_lock, flags); return QLA_SUCCESS; @@ -1725,12 +1719,6 @@ qla24xx_dif_start_scsi(srb_t *sp) /* Set chip new ring index. */ WRT_REG_DWORD(req->req_q_in, req->ring_index); - RD_REG_DWORD_RELAXED(&ha->iobase->isp24.hccr); - - /* Manage unprocessed RIO/ZIO commands in response queue. */ - if (vha->flags.process_response_queue && - rsp->ring_ptr->signature != RESPONSE_PROCESSED) - qla24xx_process_response_queue(vha, rsp); spin_unlock_irqrestore(&ha->hardware_lock, flags); @@ -1880,11 +1868,6 @@ qla2xxx_start_scsi_mq(srb_t *sp) /* Set chip new ring index. */ WRT_REG_DWORD(req->req_q_in, req->ring_index); - /* Manage unprocessed RIO/ZIO commands in response queue. */ - if (vha->flags.process_response_queue && - rsp->ring_ptr->signature != RESPONSE_PROCESSED) - qla24xx_process_response_queue(vha, rsp); - spin_unlock_irqrestore(&qpair->qp_lock, flags); return QLA_SUCCESS; From patchwork Fri Aug 31 18:24: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: 10584331 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 524EF1709 for ; Fri, 31 Aug 2018 18:24:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3FFC02C535 for ; Fri, 31 Aug 2018 18:24:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3450B2C5B3; Fri, 31 Aug 2018 18:24: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 C5BEF2C535 for ; Fri, 31 Aug 2018 18:24:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727530AbeHaWd3 (ORCPT ); Fri, 31 Aug 2018 18:33:29 -0400 Received: from mail-sn1nam02on0052.outbound.protection.outlook.com ([104.47.36.52]:29088 "EHLO NAM02-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727405AbeHaWd2 (ORCPT ); Fri, 31 Aug 2018 18:33:28 -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=4La41tnfV9u0wn1/1YbSomSa6Krp2LHn3GNuW/Ka1DQ=; b=Fv6+W4frVt5UtZY6fWdSZWYYbBfoLaf8Vgy/hlG1ulguG8YRYRv4zYwwhisaD3/XkGU0m2Bmne2YZ6CWUWOQP5U0w9ej2pSbHaIk2kJWiZz+HVpsqDakNN0nPofX1RDDbYXUEJqL+0Zp2VNoKxDuOvFFTrMun7+rB+v6FGuD30w= Received: from DM5PR07CA0110.namprd07.prod.outlook.com (2603:10b6:4:ae::39) 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.1080.17; Fri, 31 Aug 2018 18:24:44 +0000 Received: from DM3NAM05FT030.eop-nam05.prod.protection.outlook.com (2a01:111:f400:7e51::207) by DM5PR07CA0110.outlook.office365.com (2603:10b6:4:ae::39) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1101.17 via Frontend Transport; Fri, 31 Aug 2018 18:24: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 DM3NAM05FT030.mail.protection.outlook.com (10.152.98.142) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P256) id 15.20.1122.2 via Frontend Transport; Fri, 31 Aug 2018 18:24: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; Fri, 31 Aug 2018 11:24:40 -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 w7VIOd3x024225; Fri, 31 Aug 2018 11:24:39 -0700 Received: (from root@localhost) by dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id w7VIOdc6024224; Fri, 31 Aug 2018 11:24:39 -0700 From: Himanshu Madhani To: , CC: , Subject: [PATCH v2 02/14] qla2xxx: Fix incorrect port speed being set for FC adapters Date: Fri, 31 Aug 2018 11:24:27 -0700 Message-ID: <20180831182439.24182-3-himanshu.madhani@cavium.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20180831182439.24182-1-himanshu.madhani@cavium.com> References: <20180831182439.24182-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)(396003)(376002)(346002)(2980300002)(438002)(189003)(199004)(54906003)(72206003)(106002)(316002)(42186006)(16586007)(478600001)(76176011)(51416003)(87636003)(106466001)(14444005)(8936002)(110136005)(5660300001)(50226002)(36756003)(47776003)(26005)(86362001)(575784001)(336012)(186003)(44832011)(476003)(486006)(126002)(69596002)(50466002)(356003)(6666003)(446003)(11346002)(2616005)(305945005)(1076002)(4326008)(81166006)(81156014)(48376002)(8676002)(2906002)(80596001);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;DM3NAM05FT030;1:ZVOpSNZBnpOlDB5CJzF+yXkxecM9CUDV++zfnE0OWzlHIeUkB4ZmuQyjR/3VkBoxHOK+h8Ez0bmdBqdakBRP3uaHne3YssMio86Lqna5Y9AYN+B3vNwhzXSEn16fZhet X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1c025c8c-bf1a-4fa0-90c7-08d60f6f06bb 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:629aAc62ZOGjEoAqiu9n9y0GA6hisWBLmfu6JTb7NeanLoObA3sQJ5V8Hnxx+QmduULoauPgh5ZXvLLUXFDA2brgAFvFYa4PFuesdk1iPclxir1G/casP+Z3RuDpXEWAZuUnWUYVPnK6d+2FFJHJC+FaxBWpe7NB5+aapityyz/ZKJiFAHcTmlWQqmUXIvcrE5x9e28FZIDabhCMRXcUB/sjVBKPcpwS6RJQCzg16oblnO1Cq13CvCJBqRcNqdmgG6D00MJck1NMc6sBN8vc2DW+vgHTr/lzJQYmbNQofclK1ZMhUtcxlc5bBCuJ05S5jtHh00J6fQePkJ3LaRAQ1aTRTIVjfUUOcW4gA78brjY=;25:vW6qVspRr3zzm32XaGZ0tpprDJWpTUCdcDYYGVAZtd1GEOsovYLoeHUB2JukEKp3zh8GKHzu40gBWjeM1m50ISKjIUKETS5UkEP2eYT+fKxYCbKvAYQ0OsxdNBtaDvSck9MOzu5nMuHN/t6bAKR5NXh/JLkt458r/QGb90/KnG4PMm3GCFu8570hsUQwqmKqzccsKHCgWGFD86N1UcRMLG1j9fsejc0BKD1CDUX5mv/Z0s/XTSEnNPyw7bOQhlaOzvL9q58zvYZAQKTcv+MlOx8W1gCpjHoyKStNq6lCytAA8myKLD5RH0OHD9vS1gymEUHdjssF0q+7P3B5Q0LkOw== X-MS-TrafficTypeDiagnostic: DM6PR07MB4668: X-Microsoft-Exchange-Diagnostics: 1;DM6PR07MB4668;31:VUlM2U1D9R47J0yuliNsh9y/uN+GUtmb7uWbf28+jMuRb1faJPoNrKeyLJr6X9tdWF6Sr8AxOnvXupgRugeKmP/guNv44xG7ocJns+zwIUGAkcaWGlhX+WHEsCsSLxeXi58atdHnz3tdkcZqnS+xxbHkY+eLfc+nrxchJerF/g7hCf3x0ef+rmKTGJpHtxhQchFxBAvGjK47DO9AKW/WQArV4rjAIM2SHKbRS+ACbnk=;20:D5y6vNY8ZEewE9zcwNfjE+XNhulW6SLBEY7HnsROc6VZt3IbcqdQq0nKNQmAtia7GyqiJO60aPgcl2SCFN6rHmB5rA16P4eZxbP6cfwwc1gK2GDAdcrfAsZJV/tNCDCCF6LKXpNLLELaEkU4OpsH5vHGnLmVAMaHaNBN7cLW4M1GCgHnwa2G3Pm1H9PBIGekgSQm0NclE8UjYGC3sXhgXkcUaDrZlcG2U9xRaOWuCZzXW+Aw63mxUklF5G27H3DHMhkr6bZypkt+hRfts8jhnMDfynZBhMM4yXoMMD7Io1UeQohrKP65owieebtJTuFaO4sfOhzxBonmzk/r3pIHSHTGsXY4QzfxaaNfzey2Qdekyt+azAz9TniyxKFNWZdBpNfZtNJYKA+RXb+A2HtAD9ap/GPmoFc79RbgzcPa5LwO1NObgUlh/XUf5yi0EIFM7m7wAMJooPbFwGz2eYgIFVCwurwmyC6QHiur60f7++rrOqO8W/mZCFKiAvgeoo/U 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)(5005006)(8121501046)(93006095)(93004095)(10201501046)(3002001)(3231311)(944501410)(52105095)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123564045)(20161123560045)(20161123558120)(201708071742011)(7699016);SRVR:DM6PR07MB4668;BCL:0;PCL:0;RULEID:;SRVR:DM6PR07MB4668; X-Microsoft-Exchange-Diagnostics: 1;DM6PR07MB4668;4:S99pww8iUr2uMseKI+pZXRM6SZ4oeC5OwygbVzdu83efzPcnf7p5zK20FHxZ05n+XFavGGOCC8WCRK+CK3lJaYsc5KT+b5uAN65W8HGtpdVDuhPhLev5GrmiuZjuS4E8T3/l+dyt+tSVEopHOL6URMt+WzyIVee/hHe3mdalz+au8d2jBfjBWXql6tWq75USbbG8EKENQN/ngEG6YRaL2Lmqpu9oOHMzjHCWpOHRP/7hUD0UZKE9BhG3FuLViRYHwB5EfrDtZ8diokTsjyILZ7RFMUPHdFSmGX2bTZfxUSyzzBe0vR7DmXGF+sVNprrU X-Forefront-PRVS: 07817FCC2D X-Microsoft-Exchange-Diagnostics: 1;DM6PR07MB4668;23:SeGwdz2Oi7vLHPHuKizbd7GryDy+/f4qq/Hd+tGV4Ig0XWYCvHfKnbCaiaRHAMZ7KbpvdacKEyHmHcoBknMWtcRdkL13shMWK8u5skOb0KThJoHyHarws6N0pe1hAAX0OCXnDSf7vaDUdeKPK96vSfc/z0yZCtBn/McnxXPIofPxne6oqzryUDE6oSr0uP5LuR9lXhOSqhhJPyW2CM9bfwdzXzIskOPk8yoiOm4gSXfnKB/eS7ajKG3kmkXhjY4Zg0YyV0GroBPwJsXrrw3Gmynbeuuv/PeZ1/7QLZkXkjzgV0DRJ4cgErEh3tb8MExlvm07KWrbXowPKOQXWHecOUThLjKeFjtjFCibcPuyWFWiPIp5BHIfSGc4CGsCp60Qdz1zBYu27iJpGczcG5NMsxYDub+/SO0VmQ/eXvkxyPzeE7oYGh5zS+8QBc0ycUT0q6Q8wEixlp6Yx+hjVlY5Nre2RDfdW9Gkk54MsH1acZb5p9/bwQDg4TY0WjSOU3dysaVh863dCumc+96dyagLDiToPkRUrnUS9/3yDiKLKIETC1Oh97Ly8ykW6OQ7HSlfWHGDTuAJajLriiAdKvjmKhmI5XOfAaFzU+5uRmCMEoQB9AqbL7JC+klchAC+u6GgAJCJge+FcwGlXgVwPn5YuncmXAK8t4I0oMdbc+yXJ+nMHU5I2NxvQ57uJ3031lMjRZdVb7SMimTtmpQE/SBFzaHeZzMtVWXSEHGJNJ3bmXVIn4EApWI+OGqt/YU8VBWoYDg/NhN8hO3Lz4jOYJecZ+7DJ/xw0f8otMRgIf9EUuf8mEjZOXYAMSyo7NCzfCIwGRExMUKSTS4r91xSa5uK/DZAh5T3t99hn1B1aBUWtswueio5TB6i1NCKZVnT7ObUWSSvJ8xdIQ1dlfmyZRMbN0drcrzfNgcnQiU3/+GSX2ADkosq+8HnXanj/BmtcDc+C/JG83WpktPiw7W4IyzBuHJIdTRxVituhDI3PFdQDuSjKCJPS7drH2C93qBhNOPyJkHhFCBsDpIMG1OW/bmntmR4iGpQXdpERc5o2W/ijL18+4Yp0Mh+OrB3eBrzz0RzzWudVODw2cI3WAtyvXoANtIbHC/8oyueVWxRC5lSPDzkLmJUM21xCunPIKd1EKBlrWnHbm2shB7mNSfMzJakmA== X-Microsoft-Antispam-Message-Info: f21LWyAG7jZodiTwX5b10/7A7KcQ0DO88GltEZ+FzuzYCXlyKCbPV2zARrS4SbfYWC/Y+IAhrmRSAiwG+N+1m1bwD0ITVRRSFF5di7pyde1DI5xjIDwsVk6Ho7uA2yVT5un7Evt44680jqy+vJep6t3g7te2/AslGLP8tRUitTqqV4j7gqet6koQlAUMVM9HZrjal0WaRUzOyQjq8gnVcY148WTtBCqDTOZeKyEUj4XzWzysZHwW4HJlZSQfYgvay2mqdKkuxDUAAbb/IBi95xtqmUG5vI8E0H75WYHn5onD/gomxAwvBCMjp03oe9RNzD+OCfwywQkysT0O96k0+nBV/OS/81rqrnCntjhtRZo= X-Microsoft-Exchange-Diagnostics: 1;DM6PR07MB4668;6:lSmmSxUzKO0kHrc84W3hsKzbIGICXzFFYfyIN6Dv0SlstZF6KWIGwjUK4m4Mo+8fOfuhwuVo0OTdOHuMQ/mTg5NaVEHgUxuErmKt82n3oc+hWgICj8Kh2qrp/SnRnxVep3u8OzAwyi80/cArcw4Rh/0kQyJgLQvpgELxCg893nRxkRjAoTCP2SJwo02fxS7gFGL3g6qKGUFsnib6Ql1hyZrC4Mrage1Ulg701R+qWTmL/6zMQVPQXcvrNlv5qJ+NB3I2mGz+HDB3vCCGsoYF+gKkE44ThQR/tyxVF4xheOH8ght6YFEiRN4aNKMaEtEYQ64ZoF7NbYCxU8XT6eh6NcICu33A4vPoex/HgzeNblAcyi5d2W67UJEsd5QpIQTdQM3265nKRu6iCmYR7thDdYDgLTGH/gsb3VY9EbLARtip6XhYrepwXCuhSGmFqB5MlFqA02xMqSygznkBXfyS5g==;5:t1hM4GJim3E63Keir973A2fIbTv3d19A3ZCNaNHYvjSLqWVKNE5ZOZQNubljH5GDNhEqLSReAiYUXz3jD1EhR+B49Qegpt+OKyLULOmOUYFLNqYJf3R3lr49JJlkrDSqnRSdQ9AbgnDP6rrKkn67FX9XmzYNsVS8XToVr+JkAZo=;7:45ZDWPSO/1LLqiB9P3Aa/rXjL0Z0EKastZ/EeX4feDpe7QRe94L3GFuVQSmDvS8ZmnnqLYYboxtK1ERa1hn+2Z9E9LQpUV7CzbY8zc4R744hVJPEaM1LupZz6vHwD4ORIQra+h+pVFFkkTsaLgXE2lOyckZJhhGhyZXxEHDcF/ylxT9yHopg6wZuZxxqnaTEquRpA9rYCOxVHbRaj6H2s0BBGH10A84zKfCAnpnRcpRnhlsmO28VYly2EQFoW6iH SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Aug 2018 18:24:44.5277 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1c025c8c-bf1a-4fa0-90c7-08d60f6f06bb 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 Fixes: 6246b8a1d26c7c ("[SCSI] qla2xxx: Enhancements to support ISP83xx.") Fixes: 1bb395485160d2 ("qla2xxx: Correct iiDMA-update calling conventions.") Cc: Signed-off-by: Himanshu Madhani --- drivers/scsi/qla2xxx/qla_mbx.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/scsi/qla2xxx/qla_mbx.c b/drivers/scsi/qla2xxx/qla_mbx.c index 2c6c2cd5a0d0..c73039916c03 100644 --- a/drivers/scsi/qla2xxx/qla_mbx.c +++ b/drivers/scsi/qla2xxx/qla_mbx.c @@ -3762,10 +3762,7 @@ qla2x00_set_idma_speed(scsi_qla_host_t *vha, uint16_t loop_id, mcp->mb[0] = MBC_PORT_PARAMS; mcp->mb[1] = loop_id; mcp->mb[2] = BIT_0; - if (IS_CNA_CAPABLE(vha->hw)) - mcp->mb[3] = port_speed & (BIT_5|BIT_4|BIT_3|BIT_2|BIT_1|BIT_0); - else - mcp->mb[3] = port_speed & (BIT_2|BIT_1|BIT_0); + mcp->mb[3] = port_speed & (BIT_5|BIT_4|BIT_3|BIT_2|BIT_1|BIT_0); mcp->mb[9] = vha->vp_idx; mcp->out_mb = MBX_9|MBX_3|MBX_2|MBX_1|MBX_0; mcp->in_mb = MBX_3|MBX_1|MBX_0; From patchwork Fri Aug 31 18:24:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Madhani, Himanshu" X-Patchwork-Id: 10584337 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 774BA5A4 for ; Fri, 31 Aug 2018 18:24:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6424F2C535 for ; Fri, 31 Aug 2018 18:24:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5877A2C5B2; Fri, 31 Aug 2018 18:24: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 D1A4B2C5B4 for ; Fri, 31 Aug 2018 18:24:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727538AbeHaWdc (ORCPT ); Fri, 31 Aug 2018 18:33:32 -0400 Received: from mail-sn1nam01on0062.outbound.protection.outlook.com ([104.47.32.62]:14183 "EHLO NAM01-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727531AbeHaWdc (ORCPT ); Fri, 31 Aug 2018 18:33:32 -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=rvgjRJ3NElUy+ExVRJSyd8TDcG4WNBwq+c4LsoBMDok=; b=QE/P3OGIF5eCAwFWU1qCXoUoqG6+UhE+QzYj9jykaGjlkyRrFQFuY9sCldmP1PfzzhhQRPyLPkWuxJ4DeWYnE+djpUxYES7gykH3LampQd/ghSmb5HPcvtAwJRXcgfnDRAWo79KOAyQBm/D6crW+Zu0K4bY5Sa12VwSrN1xPN5g= Received: from BYAPR07CA0014.namprd07.prod.outlook.com (2603:10b6:a02:bc::27) by DM2PR07MB1449.namprd07.prod.outlook.com (2a01:111:e400:50c3::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1080.17; Fri, 31 Aug 2018 18:24:47 +0000 Received: from DM3NAM05FT013.eop-nam05.prod.protection.outlook.com (2a01:111:f400:7e51::200) by BYAPR07CA0014.outlook.office365.com (2603:10b6:a02:bc::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1080.15 via Frontend Transport; Fri, 31 Aug 2018 18:24: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 DM3NAM05FT013.mail.protection.outlook.com (10.152.98.122) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.20.1122.2 via Frontend Transport; Fri, 31 Aug 2018 18:24: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; Fri, 31 Aug 2018 11:24:40 -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 w7VIOdBZ024229; Fri, 31 Aug 2018 11:24:39 -0700 Received: (from root@localhost) by dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id w7VIOdxV024228; Fri, 31 Aug 2018 11:24:39 -0700 From: Himanshu Madhani To: , CC: , Subject: [PATCH v2 03/14] qla2xxx: Use correct qpair for ABTS/CMD Date: Fri, 31 Aug 2018 11:24:28 -0700 Message-ID: <20180831182439.24182-4-himanshu.madhani@cavium.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20180831182439.24182-1-himanshu.madhani@cavium.com> References: <20180831182439.24182-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)(376002)(136003)(39860400002)(2980300002)(438002)(199004)(189003)(50466002)(42186006)(316002)(110136005)(54906003)(16586007)(186003)(81166006)(81156014)(48376002)(26005)(5660300001)(106002)(14444005)(8676002)(36756003)(44832011)(51416003)(478600001)(76176011)(80596001)(72206003)(86362001)(336012)(69596002)(126002)(106466001)(476003)(486006)(2616005)(4326008)(87636003)(446003)(6666003)(11346002)(1076002)(305945005)(2906002)(8936002)(50226002)(356003)(47776003);DIR:OUT;SFP:1101;SCL:1;SRVR:DM2PR07MB1449;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;DM3NAM05FT013;1:C3bVlt/Qw7zBPxatRduBpXCf4G0XFzSC6BQ1oreF3qB6+Vbuv2KkGdbdnUH7TNJsYuCrHcjhYkNBdzq9N1mJKhEtn0JvikPbthu9DYDdcVgS9yd4MV1MFV40rhh26c4d X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 01be2d6c-ce9d-4506-662d-08d60f6f0781 X-Microsoft-Antispam: BCL:0;PCL:0;RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(4608076)(2017052603328)(7153060);SRVR:DM2PR07MB1449; X-Microsoft-Exchange-Diagnostics: 1;DM2PR07MB1449;3:nJcS4VU+tstq2oFDI36Xhdy9h0mDpX9V7OrjoFgbydbLimjwDdzeUKdz63EbcsLbA2TcCyQ5oq2yZVFDdOXuVItct0X3AqjO1rBA+ZKNeSHbO3Z+2rC3rgmZMOFSRp4AxQScp9LLOWeS/1GnPwW8d95JT6CU4dVxjM0dnTw+XG/PQlVNca6woaQak15j242x6YsFIXtNsi7xgdwcTwlQmfeEiOT6YwIWPYkrZaWONo5/900hzokWHvBGoT5KxVINBKndehtjjeIxLncp7Etgs2rzFKedJvAY/aQyuPscRpW34FKrjHtPtnOOOUz+HJjKDdCLNCyTdFntlbFn6NEpmfbuwOg0+I8v7yRATdYPuH0=;25:fu9n2zykJfwdyECMQf/LItY807LY0VjqmRKcqdcO3w66mtmoX+rKk2oq2FoTRYNtFoxPQviOCVSvpqRJyjGfvupPeC9m2A8LuPmc1urxGNbLZxIkkdhGWzvs67rgk+NZP1mRJ1SLvn+toDeE6fe7OEmqx0Cp+0rP3biyFawN/CwfFsYnYjtCHs65l0bY0S3s14TOHeSkvfC67TdsL/qhL/3qL4ezjCYcWNpo7kitpvAv/xIMrW0V7dhr9E6nkmaLZzChH7fRk6BFIflWqZQ0XTA6TUopPAfxM/ngt3QbXxok6SUNM5PYk9+sErS30EDdUEwli/gZecvtZn8N4JO0MA== X-MS-TrafficTypeDiagnostic: DM2PR07MB1449: X-Microsoft-Exchange-Diagnostics: 1;DM2PR07MB1449;31:jcsf9HJntuxH5+l3MLj2iv2uD0VMOs38YFvYF+rfd9cMJzI2vBnP5hTvIQCT86szlpfmTzxYwuAnawkluObd+TRyXnwAy+xRED/bdUhfLP1X1waFHnX5NAxoxVlQJuvsYcVR+XqBBzRwD8jDkReRgOaPPc2OpqYRvyGoJVDClX03urZTuZ5tyUrq1j1Fp/wqFXXIqwx9J7bzsGKG1uL5FMU2G8yWPfrwMLPqOa+Pv1Y=;20:6TKfY3v3JhimR/nsHJj65f3KZvUx4bFRQ/8No4zVgIXdEuyTaawbHZsKkc6RVQuEufBEvhpgmk2o9zG6EpXpTrDtSomzNLC+QWweNiItWRYVyd25iaj8+/QocmohcOQyBSCV8iA68czV1LRRWDx7jv6+Wv9fU+FcIMb7R6EEqJ/9xaoCtkbOTXuMf6ifBWKs/S8IfakdstlOlWidXTTi5NLeIZ681ZU+OIw5xlIVNtvZTCYEmFH6Q4SSsuGQsSGyHg4gnGERQ711uCwEnhxAVbt3locbRZTSZDpyKcwDIFKgg8IcrLcP7puKwxiQimzyo7MHL4CRU3g8cj7ASCDag+kATVFF+9PO0InN4i4a94aG9dRL4Q6L8fZh17YNpDnXPjzYz8OjzK0ol6VUwm5f9ABEiEuvMdj6G+lOVN+aA14t0tVs5mP2QabDBriskgTjjPs/5DuUXo0hXOAYWtbKUNRIJDl+UiRtpGy4ZBPeAYZ5O0k8ALXYWJW8OeHmMIJ5 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(269456686620040); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3002001)(3231311)(944501410)(52105095)(10201501046)(93006095)(93004095)(149027)(150027)(6041310)(20161123558120)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123562045)(201708071742011)(7699016);SRVR:DM2PR07MB1449;BCL:0;PCL:0;RULEID:;SRVR:DM2PR07MB1449; X-Microsoft-Exchange-Diagnostics: 1;DM2PR07MB1449;4:uHJPvp6RQYNqL6Jb31Xd/aJkkL9DFfl6EFtUTxKQbu2tSwa7bM19UOJTyA7m3LWWZgPf+h/pxrCfY9HoKGyWjNcqXY2KNvX2j/XyOKRHnTFw/x64+Jey+fTeCJ7v732B7PziyigX59Qpx+nmV7FpNcRQ8WdtZSs8VetICUcyDvYBIBboIRism/2xWd4+hhv2JpFdkzmGsxbV2R8uJbgdSK1Wl/50NJF9hi2PZE1u6s2+fDXu9q0FyrJ/quHc7+21gX7AP5MVnmP50ETrBsw3f0R044ZTnsXMGzC4EmGqNykzXqfoVACt22GTN8apdYNv X-Forefront-PRVS: 07817FCC2D X-Microsoft-Exchange-Diagnostics: 1;DM2PR07MB1449;23:d5yJNyZUDhLjLUDOHfxdWmKVc5QXEdelFPNa91FKni8ggC/uABbMZ4MKqrETFqzaoWH/DQKW/aGGjePCLg6+k7oEh3gMvIAEJXn1FE0Km6BoSJZMOXFinhs920Y/SpR6oJka/QKhHt21ode1l2qVZtxxlIfxSM9KFYdLkMiY6hTrWNqpLTKIAV03tmJI0srT44aqW8tFmAvjComkfTrTbbWFHsm6PTnYpBSCI/gx6r9C11eGbVCoVe4cgaz8QDq3Ash+h80hgvbihEVTB5uyRtBu7lLNXRmKAe4Cc83bealzO+IAwkQpLgVXPyFKzah74fAgFt5Bv5cnmB0O1iqlri74cAB1e1i89YiViCWDYdsKSul8SCHD9I7vkdV8+/H7Y0qZ5MP8naAG6tdqUcecE8abF6qp6ywBYy4k3znS0oZ6c92R1nAZ2HGFL8rnZa/A5wfs6Zr8T86Il5c6MKqyml+Cf9nb2rLKHf6xIg9T1qskERMVbp26EKq+Q/AhBumo8VrleCVX3rQ+2gkOTaDiMoA+hA0cZAhvjODO8QiKlbzn2Sw9xTGJx3TWt2zzKmi9S32kOpTa9GLelI2/QkvRB4jxJq8sTgdYNnLsD3ch/29ZSqqekH1ck+DD5IXE6UqlDTVMYe+TZK/oXfn4YaClBHIv55EGZ83IzVJaaMrPBqiezyteRHDgCHXXmgdFjuGw9Pz/m4BngC3VslNHbi0sNZ8ijPc3fkmJUgm9QCMCxuyWlgSEUt6yzLu7wZ+oS7guAOU8JdY4dyuY/A/3Ua7m1OcplhgAh/tw3b3OBzu0kZOwewJrUHb5OrroipDvDHy31qeRGIIjf1sG3xsVCXEZuZz2wNAjVHpha13AGFr5noyyI8M18oqVGNYGofc/2jUdxZku0b6Id8hNi5ztmsRvr1Sd3nOdN/fdpujQyAeYO16mEqVpJWefRbQwGCzTkzvhB7BNvp5sSkXiqCcPF5BM4TDNvO3DPIuxnimk05XkXcrPlLB/xDl9DSOxEwvTc7BPC1TteEcc7IKNmVmm25PuIAaTl7tx2Y3NAFrqSP+o30vQ5agQTZCVpYs0HRTHf1YNpy/iH7RXk1OwcmVA7x2ETSTVc+MZFwg+yeJuab9Y7O+h/eqvzgQj/y22lilCTpUw X-Microsoft-Antispam-Message-Info: vCjSWzUFUClXAcdhZzzZpzKx+GR0ciG7rkxh+2my1zSr8ERMzp1cjJP7MZUwumGC5XcDGz+aQxVmcK4aSk+49SGe1PIpYpRUFFMWOngYEpz4tYxRy9DKYoX63ENxV0MpBlC2kyAdnNL63Y6c3kHdy84auqfO1RCp++qZLMGNe4hOtOEc4Z9ExXSyH3nTY53KV34/nDaOzsJ0SiIBFjnZ0KE7OU0rjSH0hrbZjDE35CnKAmWHZerXo3hzO/WZYeAByUr/RlndutTmpxdVLaRIdZS4UX67hPdSeUprP4OlFEYRGCj0X2HkjsuUDzVIn0lNwAK1Au67f+wjC2Uo28ChdVLFscnfuQl4H6Up09prF/U= X-Microsoft-Exchange-Diagnostics: 1;DM2PR07MB1449;6:qmyv1JqixGDhSvm34te6MK/aSZXBsmboMPFjuVvzta3LNzu8Te0lK+GGKGB4WtO4XCr88u56tFa4twMkB7WoSJFYHShZKg0Ssx5AJnpBTzTxmXGYL+Ez4Xd7WjuCK4t2lMybf2WO6O7AVE+xFirJswAfUdJnom2GucSscvHT+/3VqCc8OuzhqK1fwkXDVTtC+Y6A57jfaFzNwAED9H18BBgT8xQB7WhQ6LbRAyZHhlZXBZDMEHrit1FdIsoL3Pn9K+L0hWh3My98dfEoclZ/HqQSawamImyg6/0RtrqnYxT66OMuWqahQsHESHGDYk9NKFLZ3G8vND33YDPAyvtOxAbqFYH0wi3vEirk43ClbU87m8yRhJ5OH1ydJ0AEzfYGOUdCk1umjv13HTzF29bs4M6j642NdW3eJLs0HAJ/plxestf6An30VFEGg85eVsNr9InXvPjZSbpeBAPqMiPo9Q==;5:0eOgBcMjfOJhfNe6th4ixflsF0aiPZOCvah5pClWA+yfMz/DqhJUdg/Ax2tcKRLJ2PBXZW0QAnAIIS50+sa65WR/Fz+0rfEPmqbGANYkHpffF5S2Ddz0XGXITtoK0eDRJt8/Fq2ZMb3H4XBHFln8/n1gPvX0MkHJ9RnafWE+Qp8=;7:1xYBpbaeGXMoEgoJtTBkNInahwKwMIlDnyJGSPwKMzxQbhQGrRhBa+G5cWtDym7aLPZQNn7DN/hZE8xllr21lGm+JsdD4ibX6taXPX68H3p7zLyYYZ/Hz6NsegpFSty0XGsmpcgCqyUjylEzKPcC3sl4bq3s76RjM8m5DrF6MrEi57+RIGNNy/nQTU++6KYj5tmxwGfhtgMnBZ4ZKz8LL1aGbovOf4wbYmSXZbt+C6XTLy726mxqG+qi+k7gs9xX SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Aug 2018 18:24:45.7773 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 01be2d6c-ce9d-4506-662d-08d60f6f0781 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: DM2PR07MB1449 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 Abort of initiator scsi command, the abort needs to follow the same qpair as the the scsi command to prevent out of order processing. Signed-off-by: Quinn Tran Signed-off-by: Himanshu Madhani --- drivers/scsi/qla2xxx/qla_init.c | 15 +++++---------- drivers/scsi/qla2xxx/qla_iocb.c | 12 +++++++----- 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c index 4686fb5f26aa..3eb3c4f554fa 100644 --- a/drivers/scsi/qla2xxx/qla_init.c +++ b/drivers/scsi/qla2xxx/qla_init.c @@ -1747,18 +1747,18 @@ int qla24xx_async_abort_cmd(srb_t *cmd_sp, bool wait) { scsi_qla_host_t *vha = cmd_sp->vha; - fc_port_t *fcport = cmd_sp->fcport; struct srb_iocb *abt_iocb; srb_t *sp; int rval = QLA_FUNCTION_FAILED; - sp = qla2x00_get_sp(vha, fcport, GFP_KERNEL); + sp = qla2xxx_get_qpair_sp(cmd_sp->qpair, cmd_sp->fcport, GFP_KERNEL); if (!sp) goto done; abt_iocb = &sp->u.iocb_cmd; sp->type = SRB_ABT_CMD; sp->name = "abort"; + sp->qpair = cmd_sp->qpair; if (wait) sp->flags = SRB_WAKEUP_ON_COMP; @@ -1767,12 +1767,7 @@ qla24xx_async_abort_cmd(srb_t *cmd_sp, bool wait) qla2x00_init_timer(sp, qla2x00_get_async_timeout(vha)); abt_iocb->u.abt.cmd_hndl = cmd_sp->handle; - - if (vha->flags.qpairs_available && cmd_sp->qpair) - abt_iocb->u.abt.req_que_no = - cpu_to_le16(cmd_sp->qpair->req->id); - else - abt_iocb->u.abt.req_que_no = cpu_to_le16(vha->req->id); + abt_iocb->u.abt.req_que_no = cpu_to_le16(cmd_sp->qpair->req->id); sp->done = qla24xx_abort_sp_done; @@ -1781,8 +1776,8 @@ qla24xx_async_abort_cmd(srb_t *cmd_sp, bool wait) goto done_free_sp; ql_dbg(ql_dbg_async, vha, 0x507c, - "Abort command issued - hdl=%x, target_id=%x\n", - cmd_sp->handle, fcport->tgt_id); + "Abort command issued - hdl=%x, type=%x\n", + cmd_sp->handle, cmd_sp->type); if (wait) { wait_for_completion(&abt_iocb->u.abt.comp); diff --git a/drivers/scsi/qla2xxx/qla_iocb.c b/drivers/scsi/qla2xxx/qla_iocb.c index 119927220299..c699bbb8485b 100644 --- a/drivers/scsi/qla2xxx/qla_iocb.c +++ b/drivers/scsi/qla2xxx/qla_iocb.c @@ -3297,19 +3297,21 @@ qla24xx_abort_iocb(srb_t *sp, struct abort_entry_24xx *abt_iocb) { struct srb_iocb *aio = &sp->u.iocb_cmd; scsi_qla_host_t *vha = sp->vha; - struct req_que *req = vha->req; + struct req_que *req = sp->qpair->req; memset(abt_iocb, 0, sizeof(struct abort_entry_24xx)); abt_iocb->entry_type = ABORT_IOCB_TYPE; abt_iocb->entry_count = 1; abt_iocb->handle = cpu_to_le32(MAKE_HANDLE(req->id, sp->handle)); - abt_iocb->nport_handle = cpu_to_le16(sp->fcport->loop_id); + if (sp->fcport) { + abt_iocb->nport_handle = cpu_to_le16(sp->fcport->loop_id); + abt_iocb->port_id[0] = sp->fcport->d_id.b.al_pa; + abt_iocb->port_id[1] = sp->fcport->d_id.b.area; + abt_iocb->port_id[2] = sp->fcport->d_id.b.domain; + } abt_iocb->handle_to_abort = cpu_to_le32(MAKE_HANDLE(aio->u.abt.req_que_no, aio->u.abt.cmd_hndl)); - abt_iocb->port_id[0] = sp->fcport->d_id.b.al_pa; - abt_iocb->port_id[1] = sp->fcport->d_id.b.area; - abt_iocb->port_id[2] = sp->fcport->d_id.b.domain; abt_iocb->vp_index = vha->vp_idx; abt_iocb->req_que_no = cpu_to_le16(aio->u.abt.req_que_no); /* Send the command to the firmware */ From patchwork Fri Aug 31 18:24:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Madhani, Himanshu" X-Patchwork-Id: 10584333 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 42D0C5A4 for ; Fri, 31 Aug 2018 18:24:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 305972C535 for ; Fri, 31 Aug 2018 18:24:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 24E522C5B3; Fri, 31 Aug 2018 18:24: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 9B9062C535 for ; Fri, 31 Aug 2018 18:24:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727536AbeHaWdc (ORCPT ); Fri, 31 Aug 2018 18:33:32 -0400 Received: from mail-eopbgr710089.outbound.protection.outlook.com ([40.107.71.89]:58496 "EHLO NAM05-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727405AbeHaWdb (ORCPT ); Fri, 31 Aug 2018 18:33: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:X-MS-Exchange-SenderADCheck; bh=3rfL93jTnka9zLwn2YuzeMaSl9qD9rdLkNXDPu+Q8JM=; b=JV2ic7Do9FS+DSbHDLy3chNl3E2c5ggPLLEKsFhNhXidg2MwxTza3+5NoETtWB9ejJF1Re0jl0nNqWdcIzYW1sbjEysxazxhMAlPM/34npnCfL8XwPBK4yJjcEz5X5RrIKX22ul97yMu2u+nXUht6ExovnoOhElE5bEiw/6Nh6w= Received: from DM5PR07CA0119.namprd07.prod.outlook.com (2603:10b6:4:ae::48) 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.1101.17; Fri, 31 Aug 2018 18:24:47 +0000 Received: from DM3NAM05FT030.eop-nam05.prod.protection.outlook.com (2a01:111:f400:7e51::206) by DM5PR07CA0119.outlook.office365.com (2603:10b6:4:ae::48) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1101.16 via Frontend Transport; Fri, 31 Aug 2018 18:24: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 DM3NAM05FT030.mail.protection.outlook.com (10.152.98.142) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P256) id 15.20.1122.2 via Frontend Transport; Fri, 31 Aug 2018 18:24: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; Fri, 31 Aug 2018 11:24:40 -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 w7VIOeBO024233; Fri, 31 Aug 2018 11:24:40 -0700 Received: (from root@localhost) by dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id w7VIOehY024232; Fri, 31 Aug 2018 11:24:40 -0700 From: Himanshu Madhani To: , CC: , Subject: [PATCH v2 04/14] qla2xxx: Update rscn_rcvd field to more meaningful scan_needed Date: Fri, 31 Aug 2018 11:24:29 -0700 Message-ID: <20180831182439.24182-5-himanshu.madhani@cavium.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20180831182439.24182-1-himanshu.madhani@cavium.com> References: <20180831182439.24182-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)(136003)(39860400002)(376002)(346002)(2980300002)(438002)(189003)(199004)(1076002)(69596002)(26005)(106466001)(80596001)(76176011)(51416003)(50466002)(4326008)(305945005)(356003)(8676002)(81156014)(8936002)(81166006)(2906002)(5660300001)(6666003)(50226002)(54906003)(42186006)(110136005)(16586007)(316002)(106002)(36756003)(48376002)(87636003)(478600001)(126002)(72206003)(486006)(47776003)(446003)(476003)(11346002)(2616005)(86362001)(186003)(575784001)(14444005)(336012)(44832011);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;MX:1;A:1; X-Microsoft-Exchange-Diagnostics: 1;DM3NAM05FT030;1:iSpigCOBSU8RuTNS4YnE72kGi3iEWz3iFKau1b5K+7nmAKcSeiu5k+hDsYjd0wPSEstGFOIhAJc18YHN7QwbpxUf9tFxP0jiifU8M+ro2ywRjU/OFhWm9fFfZ1J19DwH X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3bd33d04-83e0-4507-53c3-08d60f6f0853 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:kS0hCn8IF6UqIpGAkhgBn7PsD3tNFjimy9jLXRAbLTe5NeMBxqRranHA0tcscOLMVivWOVghTKWcvMks/b4IrIANdYkzSSVBSRn5ecxTFfHUgYNbWJ0wbs6ln5neNVrgueWbeP5wX85bS9fyQUmnse0ZL866jU/S6svU7l8oAg68yRk5Ye8DlGLqjXeUfIPg6Yn8ywYmPZO6vXFjK5us7UhKojP6nz5VALdDqIKlM5MF2c2rCD/JyI+ARNvJtRQtG37AirKpWCXsXamWuy7QeAqQ87zDsstAHF1+daLb2QlMq0C+HwTu6P8mNrebHzRm6VTv+Hw6kQSHsnOa9CRIQt81JDq6jPg5ecIapx9PWBc=;25:yUNh9OjkrwJ3vAfmpkDWDUftB5IZHeiJ0Nx2q3cFPnLbtfyfGSZz3ImA91laAXwSj4Qz77GC66p0E3ZqMIZa3RtQQ1IphjWqV/qW2wLL39ffVPohr8tfDC82kQBaXJMBSurPimjugs2AjA1zSjeiDrBpW0HSLqxJbMY74M8iFKfxRL9dlw1HROylX2RF76TPkRiAL6+ezA87mNhvADITUDe3poLsfuJ3ybquJ0cGkYJE/CoLWFykrO2d5vpExum2WWtGWpFixQgzzUGLpdcJdm5bBFBmEJrzQvVzkTpy27xL8e22QDQKQibtQgRA+9pMPEECdYrV9NEJPM7/duJ/1w== X-MS-TrafficTypeDiagnostic: SN6PR07MB4400: X-Microsoft-Exchange-Diagnostics: 1;SN6PR07MB4400;31:OsiEytf7crMYKBL/sqv3lg9akH6QiSpnXkviI1INLA8EfNx/dFrI/pPBM5t0c6TdiUNd5ef/jbaJlg0erxwFDKRBpk3JWkdePlMBV6qLJ2M7gktdlgC708G47EJX7WUnZUSgyxjsQPAwR8V24DQhNKJiKherQnJ3bfme6F7zvFgJuqq3zMSwZGhwxTHi5AebKMbSnBZgOXJ7ZXimCqJGVETQnSS7VzTbPDgYC2uOz2E=;20:lQdrCwwasdTS04avzbMkcQh0SfZLuY1TivmRTNil8vMup8s76Z51WKNqyQen0/lbpqC1ifOWFjCew9zAgT6KlD1ZShtZiglzzGqz3dYFiz5HyeL43NPYaY924VanLjdR+DeI4h6aLcSlA3ID9k7Hoe1ZiS1+qqWCJeKd7FWj5iABI8/URcpYHwXwgKh9d6gznviT+rTDdwHFYqGxFPNbug7/IhUT26/B0lMeswo57H+40B65F2+aDsrXCf2qdmKj3Q1GId5uplHGhIWMl9xUw0rLBBFHJZgQJ4gDnHPFFwgLZpyZOCkG8KP6uW4mnW1vQevmk9gjRoykgA82+6XmyN8/WnqATPgPlSt1OsjOEbsAfixSl0UNZ0tYb+G/XymZKfjqm4Gl9V8MbYcl79zbqYutbPdKQtCWdfQfaU4251CFuymygSIXawOwjL1ao5Oig0MvS+nj55SLZ0KruKTgF1fG71Lv/cGxCgOxY5Xa2qQehF9EWpuj/7TEf3I9aEAP 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)(93006095)(93004095)(3231311)(944501410)(52105095)(3002001)(10201501046)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123564045)(20161123558120)(20161123560045)(201708071742011)(7699016);SRVR:SN6PR07MB4400;BCL:0;PCL:0;RULEID:;SRVR:SN6PR07MB4400; X-Microsoft-Exchange-Diagnostics: 1;SN6PR07MB4400;4:Rd7ynEmY/R+gg0aRF3IlZG/r3V5Vs9s3aYfXQ6VJkI+nM5R0e/1O3gDuJ8LuRcmLd3v2h0V3lpa8RFECUmhe3C/hlWJwdkE0qvsdtlDRWLg9QnoLtkiwirLSrjQpF1LDiWbeMwo/s7zwWK2WP3+he+o2Bw/94TiaQrtxvb6Q7HSREmomsbSFL8Xjmh7xhw9T+ROb8ZfJa5io+oVo5uAjk6OwbxLdd2D8uD4xnv/u0/qINxmtAcju4G1gzqmpnXcnLzJbWP7uHthH4iGxj0JesA== X-Forefront-PRVS: 07817FCC2D X-Microsoft-Exchange-Diagnostics: 1;SN6PR07MB4400;23:E622yvgohLTQO4ILoh3wEVyklgNGzPZSsSzTZ0W/ag9hM/zfuEis8pRYbJ9qT5dP6ApD7jOLBd+3Im+HnSFT3iMp7jN9iFDHWeOhFSpCDVKC7IdZjeboplDf/PM5ht42cYJuP+RcOC/Bn0ZmoRiinHW+H3MvSUIIQ87GvSTw5hffYCEfsBiNjuSKl9PXq1hJ46wawQv0mhGtYeOg0+LHl6HdqRMmwtHMp++v2JGwR1YC/frONlsbDNJVMdqVCqk+tp2Hab/VO7Hd4gV4nQ2wkfricFaZcxUFUG+3OVtiaqxuJ5V2+QYvSbbyIFUriyD8i1Ih8DvKquoaJke46kqtULvaKsViGTBADCGu2GFmYmwhMpZ+XsVI+h5UcmPosm+AaOXQkt0lm7NNme2vNU+rouioExM7w66hiue4olY10N9bNcFH3Qlw/jAPSqOpFK/wVgZY1uQeWauPmXypCaQw3CkQMhyXEIahMRISfafQYGtlE6EGvKSe7MjyWhwdzw2H5IbdpAmjSLOYqC9tjCcqFUen96x0Q1pGOYPRU8fKKRgE5m8XJC9BXnjxSf5CD5uNYElrC21kkzqiYL/ihIunBsjxIQpQAgpq/kI1IqA4xyUCd65WkQHUN9oOmQ7d9bpv/hFGPSylMwZks4SaQnbbcYjhIsdJNUgeehuNdE4KQCFmZ9MR2fFrUwKUh74r1Fi6XjkQdz7BRuc1DgnZp3V4tHjod611UJ1enCDbHGEyEPH9yw7wxjXqsQNemlMkCxxVszhJmtIvgjToBgfOYkXngxPD436I9qEZ+mPpTxxvzEmA7zDuHVLdLr+8oZkUJxO4fkpXZRamuGXpkCym3CXFjFP46w43TSEk9yWndN3TTnIFNU0DPfg0+YAcB2DULHUbB6JKBXRuwH0SiwiMdd06wojHpoLqZkJS7MwLzDvsN8HiVQgyBNJHXiMlQdTPBH55/fJ5+uTSdvJmy7NZE3/5CDHPt2gbzrIU8WDld0gaayms15uvzpDbwbNBFtkh6aHTSPue4hWsgrCw+9mrCzBTk/MTzSSDRkWuQRgknHwUjQmEsZh+NUW9T9kT9gukK7pEgoAUF3odGIL01rXojgm2bZj5AWmOuSbozz0BGbe7BYxQEWI4lPj+e1TFEz71+8Y6t+YwzjjCH6MsR63x0/ZcGA== X-Microsoft-Antispam-Message-Info: mb8wBIwVXZgxJF+C1lPhOWMHdSGO8nXxJ8IaxmP4Lynjd5MiklS9oTGJRDmhPpN+84tgZLSKmYbt/HmqjbMTs6IvYLEn/8mQWqVSJn39GgWjos3hm475djlcPyIk45q6FvGNIs9GQTIGl6AUcMjvOhCSDbca7KjLOu2NNgb0Vb36n0sxKxtnw6SjgjsCJl1w95BELuWqVKvUFykEoi1ROG2ZSxaW7P7ofCPmmXPBl0hoy9E0icfTgYY9lTUWbNWVKBgu/ClaKInWJazEUIIODIZnrvBCs4gmX6Mt15/3/2chRHuH5ontStD9mtmHeUntHs704vI1L3x3C3Ry5Yf8CgJhb568k6h5d+no0kQWr+k= X-Microsoft-Exchange-Diagnostics: 1;SN6PR07MB4400;6:txiltPRWQi6G01iOripDdFUv1pEz08SJbAHALfYbeEARpOID/VTryaK/dYHHYbxRw6yfpDA0fe80W2MhjfJe3yHu+dqoTWJNrv4iEe+LAuZesd3x/katJd8ImNhvd/uuJeT2HvTcz4BsxWkYmilh8vbk+92EXyZTqH81Igi5dJrt3MMcMTDKRawyE8zRLEEN7ZTQE1xtEyooDyxZ78CgyWntHAMOR4hNfGEXmgpFtVSkq9tT1rnVN1OJkiW9UAdhFCPk//YZt84UA1WFC46izxyjEkxSiptDtTR5YEK3XIRJJyHNWVYyw9OGJLT9XngtQK7hZTDfaXV/cCna95Bpz9AzGIo4lH/GUaZE+HAuxVMkyLR83QABYBYD9Ug+bwdduiAwfCobJSGFXExqJjKmEGQ22Py0OT4xFvVUEPEKRoSkowkbm4gZ78tx3LR7I3xPxohdpOXXDorBvl0Wj6gnBA==;5:xqYYKwrVAQ1HOBKn8cH7CTrGjkkGZbz25EuC1P6rhxO1kB/CHwJLpd6z1QJrDal+Qjztz2pSzoEE/7x+Hx/8xOmdaEsLkdJ2xWlshP8OmOzVq8mEHPQmPx8gH88FW/4L9NrsAddAmnUoLbJ48fU0hokyQ5osi3l473dtoznX81U=;7:IUy9IsiP/d5CeABcuQ12CJi9wdsDaVVhCJ90ZXy9fCuI6WESaWm4NpF06pvFc48haHK1mhyWwdSvKNClIRJWbYILV7gZ5+qZ5dPLnmZ613msD4kAyjQkt7yad+eOXdBYxo/YlqHwu2YCJQr7fGIlonXlnJYl5JbUZ7PjIzHfZ9RMejcKMBL9WgFmtfnWBzYPlznX4F1UngG+G7GovgaHGWMWoebw3q5cOHdZv3+s144w0lXx5VdIcVsxtfCoIVS0 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Aug 2018 18:24:47.2152 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3bd33d04-83e0-4507-53c3-08d60f6f0853 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 Rename rscn_rcvd field to scan_needed to be more meaningful. Signed-off-by: Quinn Tran Signed-off-by: Himanshu Madhani --- drivers/scsi/qla2xxx/qla_def.h | 2 +- drivers/scsi/qla2xxx/qla_gs.c | 12 ++++++------ drivers/scsi/qla2xxx/qla_init.c | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h index a9dc9c4a6382..c41d0dbbbd79 100644 --- a/drivers/scsi/qla2xxx/qla_def.h +++ b/drivers/scsi/qla2xxx/qla_def.h @@ -2351,7 +2351,7 @@ typedef struct fc_port { unsigned int login_succ:1; unsigned int query:1; unsigned int id_changed:1; - unsigned int rscn_rcvd:1; + unsigned int scan_needed:1; struct work_struct nvme_del_work; struct completion nvme_del_done; diff --git a/drivers/scsi/qla2xxx/qla_gs.c b/drivers/scsi/qla2xxx/qla_gs.c index a0038d879b9d..c0c738bbdace 100644 --- a/drivers/scsi/qla2xxx/qla_gs.c +++ b/drivers/scsi/qla2xxx/qla_gs.c @@ -3951,7 +3951,7 @@ void qla24xx_async_gnnft_done(scsi_qla_host_t *vha, srb_t *sp) list_for_each_entry(fcport, &vha->vp_fcports, list) { if (memcmp(rp->port_name, fcport->port_name, WWN_SIZE)) continue; - fcport->rscn_rcvd = 0; + fcport->scan_needed = 0; fcport->scan_state = QLA_FCPORT_FOUND; found = true; /* @@ -3981,12 +3981,12 @@ void qla24xx_async_gnnft_done(scsi_qla_host_t *vha, srb_t *sp) */ list_for_each_entry(fcport, &vha->vp_fcports, list) { if ((fcport->flags & FCF_FABRIC_DEVICE) == 0) { - fcport->rscn_rcvd = 0; + fcport->scan_needed = 0; continue; } if (fcport->scan_state != QLA_FCPORT_FOUND) { - fcport->rscn_rcvd = 0; + fcport->scan_needed = 0; if ((qla_dual_mode_enabled(vha) || qla_ini_mode_enabled(vha)) && atomic_read(&fcport->state) == FCS_ONLINE) { @@ -4005,7 +4005,7 @@ void qla24xx_async_gnnft_done(scsi_qla_host_t *vha, srb_t *sp) } } } else { - if (fcport->rscn_rcvd || + if (fcport->scan_needed || fcport->disc_state != DSC_LOGIN_COMPLETE) { if (fcport->login_retry == 0) { fcport->login_retry = @@ -4015,7 +4015,7 @@ void qla24xx_async_gnnft_done(scsi_qla_host_t *vha, srb_t *sp) fcport->port_name, fcport->loop_id, fcport->login_retry); } - fcport->rscn_rcvd = 0; + fcport->scan_needed = 0; qla24xx_fcport_handle_login(vha, fcport); } } @@ -4030,7 +4030,7 @@ void qla24xx_async_gnnft_done(scsi_qla_host_t *vha, srb_t *sp) if (recheck) { list_for_each_entry(fcport, &vha->vp_fcports, list) { - if (fcport->rscn_rcvd) { + if (fcport->scan_needed) { set_bit(LOCAL_LOOP_UPDATE, &vha->dpc_flags); set_bit(LOOP_RESYNC_NEEDED, &vha->dpc_flags); break; diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c index 3eb3c4f554fa..6d9c8a017ae9 100644 --- a/drivers/scsi/qla2xxx/qla_init.c +++ b/drivers/scsi/qla2xxx/qla_init.c @@ -1551,7 +1551,7 @@ void qla2x00_fcport_event_handler(scsi_qla_host_t *vha, struct event_arg *ea) fcport = qla2x00_find_fcport_by_nportid (vha, &ea->id, 1); if (fcport) - fcport->rscn_rcvd = 1; + fcport->scan_needed = 1; spin_lock_irqsave(&vha->work_lock, flags); if (vha->scan.scan_flags == 0) { From patchwork Fri Aug 31 18:24:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Madhani, Himanshu" X-Patchwork-Id: 10584335 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 DC0C61709 for ; Fri, 31 Aug 2018 18:24:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C96962C535 for ; Fri, 31 Aug 2018 18:24:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BDB662C5B3; Fri, 31 Aug 2018 18:24: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 46E1A2C535 for ; Fri, 31 Aug 2018 18:24:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727539AbeHaWdc (ORCPT ); Fri, 31 Aug 2018 18:33:32 -0400 Received: from mail-eopbgr710089.outbound.protection.outlook.com ([40.107.71.89]:58496 "EHLO NAM05-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727533AbeHaWdc (ORCPT ); Fri, 31 Aug 2018 18:33:32 -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=ob9YUdlNJ45AQO641iwb7WEDoYzoeJ5eK9N7QHpQaXc=; b=lOw32/+UFAg+InruzqLr9iwDg79jG+kC57kyHwiZczfEQIAftW+CQaye0YznwL/SJpzqZJTwXamdSO+hECYrQC7bKIdAKc8og5AWEVABAQQDYlF1q1ec1ZTIQZ+LwskoIwxHZo4Tn6Ewq0xBDZV8XSlwEZ0sHnw3pzdPOaleLpU= Received: from DM5PR07CA0119.namprd07.prod.outlook.com (2603:10b6:4:ae::48) 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.1101.17; Fri, 31 Aug 2018 18:24:48 +0000 Received: from DM3NAM05FT030.eop-nam05.prod.protection.outlook.com (2a01:111:f400:7e51::206) by DM5PR07CA0119.outlook.office365.com (2603:10b6:4:ae::48) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1101.16 via Frontend Transport; Fri, 31 Aug 2018 18:24: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 DM3NAM05FT030.mail.protection.outlook.com (10.152.98.142) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P256) id 15.20.1122.2 via Frontend Transport; Fri, 31 Aug 2018 18:24: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; Fri, 31 Aug 2018 11:24:40 -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 w7VIOe1C024237; Fri, 31 Aug 2018 11:24:40 -0700 Received: (from root@localhost) by dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id w7VIOek3024236; Fri, 31 Aug 2018 11:24:40 -0700 From: Himanshu Madhani To: , CC: , Subject: [PATCH v2 05/14] qla2xxx: Remove redundant check for fcport deletion Date: Fri, 31 Aug 2018 11:24:30 -0700 Message-ID: <20180831182439.24182-6-himanshu.madhani@cavium.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20180831182439.24182-1-himanshu.madhani@cavium.com> References: <20180831182439.24182-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)(136003)(39860400002)(376002)(346002)(2980300002)(438002)(189003)(199004)(1076002)(69596002)(26005)(106466001)(80596001)(76176011)(51416003)(50466002)(4326008)(305945005)(356003)(8676002)(81156014)(8936002)(81166006)(2906002)(5660300001)(6666003)(50226002)(54906003)(42186006)(110136005)(16586007)(316002)(106002)(36756003)(48376002)(87636003)(478600001)(126002)(72206003)(486006)(47776003)(446003)(476003)(11346002)(2616005)(86362001)(186003)(575784001)(14444005)(336012)(44832011);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;MX:1;A:1; X-Microsoft-Exchange-Diagnostics: 1;DM3NAM05FT030;1:tfYEPduLjTT4jTXWbH5YRdZ2F7Nx4XIWSs56GWPglmDq8QCon5qmoUzFpthGsxtslNrC/PJuA4ud7qMeFnrC8xG+uUVyoy0FmyU6VNayCEfAizxEN7Ta2/nQBc5DZGTY X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 947a7fc0-e79a-4414-8a5e-08d60f6f08ca 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:2LZOmoZMxQ+YaEl+T43vcjIaw6Az4qtpJtfs08b4mDp1M/hxWmBaSL4Hzhbb58E4jz54bTvU01Lv5njcpF9WRPJveLgtwKrarUhQgSr7epIjWExn9sNr8Ui8BGwjHFMonUJw/lL0fQ8iMnvQ6ugAu55PdoJ/xAlScCv/6+XOJX8cjJ+rTaFpdEQAdctstApq0wZPsFQY6l4C+BDbQWiVY6M42Fcg6c/F5xz0dXCFVZyq2qlbOipJQB+Hj1WHL3vNnI3zBxOIdvWv3XKI6bVUkNYaLSgvbIctwUJfhoK2O6hRsvHKI32OlveEi2IzXarB6izXotGbF6VcyDn8ZBozicdWNTGccLNbRuWHvyFDgcQ=;25:wkJC1/faXlw4DDMS/Klxj5pMrlG17pXztLUtlVZMRsoOv+MOJgisMIN630v7O0Y80WmjLG0D5pUvRiZVaCw/oC/l5y96BBN8uwNN821qx1PMOXrfHeZBjdIwO8ATCOTaQ0gsguEsONC8hP8w0vOpXd+4ZjEaFOB6tqdxyhYveWQMRYHkUyUyGp+Sy/41aIHX7Ty6pmFoArT2fQ9jxiErIGSP37BHaASN0h7+PYV+TBmgb+kip7X0wEHRWlnokkEXY9bV7vcr+3EnYYGxkG7iSwDG0Ubeb+zU1pK/+fVjPTr/PZKd9ZuP+Rql1O/y09ACrzzw7mb7+9Y0qbZvmhT4NQ== X-MS-TrafficTypeDiagnostic: SN6PR07MB4400: X-Microsoft-Exchange-Diagnostics: 1;SN6PR07MB4400;31:cEVYiwkiuVzwOVcQ78mmb2tAhKYaIpsB8uB0ah+4CHBL7p6LxBtWs/qyJgqweAHhP6CSYKqhZLczPmcmzb+pFI1Fyko5f4ytndzZsDpYIPHd/riJ+Ik4esLA5vMXzK1C9J30PZuRXKnAIAKrBbWTcxORn9r61aW1NmWxB05Q6w0Qgry798H99CDtIznKLHGuZH+djTu1GusDnMzje/Os8CbQzrK2koJG6jp6S8ntGZU=;20:LdqPnqAVtenHbnOJbWE0n2hQONxZ2GThQsNAILASySRZY5KWOm0+YmX3LcxCcoNYdAJAh/zVER/P0aPcArdViC5Y44VR+bmLQP9KXC/53p2LMa5ANo/X+jih2LYRyh11wjGIPVpDBonVxrsquaWmn6MKo4GcFtlmt37PLgPB4gyPt2vOygkpKfTMrUbQnVs+ejv9ou3l/9oBP9TxVBDsrWR4RJQUxRSlCYwNNRdjw16NUuWBXt9CXOSSW/HfZxLgFTzP5DG/be6puE56tZ1yZQopwsOBfNLLbKMBFk1FFXHtYcb61GLVAsOl6U8thbZlGvs6BEyfzXf99L53940nzQMdGY7MVS9nztSo3ncUCv+w+asnVMS/8D6PGt3XqfkbfIqgxeFY/J6SLDrgU8BgW1qYwzMBBiDUXRHBTVM6g0R1B8GkcQzr/9uvmSZdbKPJWpSpj23WbWDxRneX98g0kmVIR4FoqM1GVyAjpPLVp1efhHNbOibdhVZbXWMMmq5r 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)(93006095)(93004095)(3231311)(944501410)(52105095)(3002001)(10201501046)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123564045)(20161123558120)(20161123560045)(201708071742011)(7699016);SRVR:SN6PR07MB4400;BCL:0;PCL:0;RULEID:;SRVR:SN6PR07MB4400; X-Microsoft-Exchange-Diagnostics: 1;SN6PR07MB4400;4:25Gc3pP0ZBe8Eop+VGpvYpnrhRUW/+TJ2yFm8txb199H4dpmB5yPKhdr+Roby+SnOUT44h92iZC70rqPUwKGrd1Oc2qfjxrl/3Mhb249yyQTG7jkp1e0cUaKTeXJCsPKOz0MIMtrYfdm+MWTAwxwlK/iqAruyFxvPIpY4Avmp3V2rboUyQVMj+aWqyEotEgu59+OSYToyvAmD10W8jHVYUrcMI52NWgAiGhnlZ5QAUr6zNnzkDtI69UeEamZyoKnLRtJuX5mDIWWgKJSItolVA== X-Forefront-PRVS: 07817FCC2D X-Microsoft-Exchange-Diagnostics: 1;SN6PR07MB4400;23:Bvhj1othOehcaYc/4BKXrVaSQZ90JwL09xy+bVExjxIExyfrR+oCM+CWWj9vvAWguVzKG60kEmT1BuYrnO+FqAPTwkLFEjcNxlrLPjfAfGLfk2BeC9b1GYb0Q5r6ReqK5b4QM9PCxmLExpHcFjDgvpK21VxK2qSG174QBe4p0O6Fink0nBZfBkLBoK4GFZJepVh0C/kJMCKp2/uAarz6PiLKogZDjNNGUOYl/ccHVMsQnw17Rl3vP7YOxrTspUND0O+mgcD/RNI3FMmtEBzilYBTHaFSeWfsAJANNnWwdWkJ44KOtjFAEy27NVSt6/dUr9IhJfzB5sTqQTpuqzq41VAnyc8aRIZsIVNmKaMci+lt61DPU5QzfflppaNhUmLv13Me2M4tJ3CCU+sdpcAmpoBdvFoiBjhP0OtbKhTbnlQdRhbHrJ0KLKcSI0sZuuY4I0ShfEc9qbCLydXH+64+LaRg6P9tsJQYWuLBqLKr52EFgGO56Q7mGVUI+SbOhvE/Iy3q+h+Wggo0xvuR2dDenb+fcyTOopmxLZM9LInD9zlOJzdtQoiHUVXs9lZIia7j+XLoPSdt8+3zNsh0j67BIC2z+1A2Ijv/Ng5X1VciEzs8feeGJHR7vSEt9kfH7ymhnhgVAoHidbV1824APukgenbiBlxNDvPpS/HN7uAt6GVYXW7rAj3RL72oiWvtTHF04xCV3pzbCYDCqo3cciofCEdaBqrDremPBEEbbTAudXmXdE84X9ihXCA61iEmIc50JBu/ZhrnNu9y1nktVs24w8cCIzeOhUtqoW5+zFW4qWEEHlo0Iu6/AFWiETAdif5z321eT6tQKfC9XEIb6zhK9OgUgVNoYwmMJ17e7CvacI1SHf2kUqjPNmw3bUlFXmxnb1yX1uUixuOgUSCtaX9X53T0Vi9nJ1y9oJclbrk0GBxeWX3TBg84W4F/qsKN2z8WEXvsicLjYvW1PTn+JWhW66SFv7AAJP8NXf8sSljXsR/QbGipL6fWz9TyctbgXKMA82sHQbjriRXFU3Fawn/0FxPbIxC9fumnoahN6wVdToDGIoSKjHYhvKyTQMf7OQBUDBtSrM8LfbwX9a9sSLr/JJ6gboY6zD+ZTdxxhomGROnTzCOXVvp8FtIEfXYjGlyDMRslkDQA34Ace8M8K3Ltaw== X-Microsoft-Antispam-Message-Info: gyaLxSl61P4mZwJU+VOnt8ta2herAAefRtjkPPAoRkB/dUavuO9D9NlZpHEAzHHmDVoV7reUx2wzyW18l4f7p+IKS8Ja/Cz/0s+kxHHe8jEer4pa4MKBqR47DapwzraWSWaVf4HOrUBOC47TtwqZyGvKrYHvo1I5yXBrYDqUfRr4NeKn/mC+aDLQA/raSzHLLLGy/trRlgdDwdo/g4biK/V2d2jUKL5aHangFlaKjgnCnzFmbP1GWAggUtW6FMfSfr1AmQ41zNPDyHOlSmsgo2JW/mFK/QjsNnQESOV1x65C0L6vJ+rN82m/v/Nitl7tFHIJ2VOGPAYhavxxQCoreAbBTz7pBRmQvVw1sWDP4DY= X-Microsoft-Exchange-Diagnostics: 1;SN6PR07MB4400;6:5WYgZuwuYJLg/PLMIw7lvawZKeyBl48DeunnCJ+6IgNtjiFEwwNsqox03xFh+R676bWLSziFzNs6Vl79PtD0/zlT/r5rEqtwh6afz5vIKpd6zaptN30dEu0aHa/RT+hmftQzufwyJL178xgYeI3poAoeEt8rcX+KmTMmWRqE8L+eHi0n0tYDc280W7TKtronOP68XaOWDwGHBYrR42E56HefgAnDtpWM9QNmYXL+jwMccvR4JMrRdqVSHTVAIrnpPw7fhUKMkczuPsmQcZqZqiQmhHfa9O9ld9U/FopLupbgwjtfmEX/p9tQm+tPAICcOHSQ+ehRVmzNxD/EeYDFjwS0kkPu6FB9oJhDQ/mmH4Tas8reyF74kNDtQrl9lhBCAodbXmCbIaYkniJUBAd/3k/poL3RBIrL4nyQgmpiqD69mJlvScWqipbOYpZAt65TdHD/VLfEbq6DEEDkz0568Q==;5:F2fOP6v2VYyzyEmPXRFGyl5QcJKXu9ftoeQ6F9w+YclPE+D5CRts5bUiRkSIGSOmkgFvZmTpU+OUWgVgSsY0/kSuathscIvYdE7roHJ5inXquSBFhf0iyXzix9Qr81jsLzIbM7qlaU2Mw84WmOBuG6WrN2rU8iCeijpjj8XC5Bo=;7:4QpreknEimqVS2q6WUJrEY3xJrFkYc/9i8rmwEhq9ihQnQ/RuzxIGMp12amob/52uzwmy4YPuxnjq4yi8aX0M+ZTCTOfghlNgWZP75JMHwdB8Civ5hNMR9OpExsmAHTUtUeHmGrAbcep242YoVq13HhzzoAj5ATNPIyynJ8TcyQXZPf1nIcfRNNIlyQ3Vmie0KVJGXJG7J5ao535WSMvWwRz8oYkiB3PHidKKL+OdfkE5dRxhemzQIxlPta8ELzR SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Aug 2018 18:24:47.9969 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 947a7fc0-e79a-4414-8a5e-08d60f6f08ca 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 Remove redundant check for fcport is deleted or being delete. The same check is already in the deletion routine. Signed-off-by: Quinn Tran Signed-off-by: Himanshu Madhani --- drivers/scsi/qla2xxx/qla_gs.c | 62 +++++++------------------------------------ 1 file changed, 9 insertions(+), 53 deletions(-) diff --git a/drivers/scsi/qla2xxx/qla_gs.c b/drivers/scsi/qla2xxx/qla_gs.c index c0c738bbdace..6e95ba0d3c8b 100644 --- a/drivers/scsi/qla2xxx/qla_gs.c +++ b/drivers/scsi/qla2xxx/qla_gs.c @@ -3442,26 +3442,10 @@ void qla24xx_handle_gpnid_event(scsi_qla_host_t *vha, struct event_arg *ea) if (ea->rc) { /* cable is disconnected */ list_for_each_entry_safe(fcport, t, &vha->vp_fcports, list) { - if (fcport->d_id.b24 == ea->id.b24) { - ql_dbg(ql_dbg_disc, vha, 0xffff, - "%s %d %8phC DS %d\n", - __func__, __LINE__, - fcport->port_name, - fcport->disc_state); + if (fcport->d_id.b24 == ea->id.b24) fcport->scan_state = QLA_FCPORT_SCAN; - switch (fcport->disc_state) { - case DSC_DELETED: - case DSC_DELETE_PEND: - break; - default: - ql_dbg(ql_dbg_disc, vha, 0xffff, - "%s %d %8phC post del sess\n", - __func__, __LINE__, - fcport->port_name); - qlt_schedule_sess_for_deletion(fcport); - break; - } - } + + qlt_schedule_sess_for_deletion(fcport); } } else { /* cable is connected */ @@ -3470,32 +3454,16 @@ void qla24xx_handle_gpnid_event(scsi_qla_host_t *vha, struct event_arg *ea) list_for_each_entry_safe(conflict, t, &vha->vp_fcports, list) { if ((conflict->d_id.b24 == ea->id.b24) && - (fcport != conflict)) { - /* 2 fcports with conflict Nport ID or + (fcport != conflict)) + /* + * 2 fcports with conflict Nport ID or * an existing fcport is having nport ID * conflict with new fcport. */ - ql_dbg(ql_dbg_disc, vha, 0xffff, - "%s %d %8phC DS %d\n", - __func__, __LINE__, - conflict->port_name, - conflict->disc_state); conflict->scan_state = QLA_FCPORT_SCAN; - switch (conflict->disc_state) { - case DSC_DELETED: - case DSC_DELETE_PEND: - break; - default: - ql_dbg(ql_dbg_disc, vha, 0xffff, - "%s %d %8phC post del sess\n", - __func__, __LINE__, - conflict->port_name); - qlt_schedule_sess_for_deletion - (conflict); - break; - } - } + + qlt_schedule_sess_for_deletion(conflict); } fcport->rscn_gen++; @@ -3548,19 +3516,7 @@ void qla24xx_handle_gpnid_event(scsi_qla_host_t *vha, struct event_arg *ea) conflict->disc_state); conflict->scan_state = QLA_FCPORT_SCAN; - switch (conflict->disc_state) { - case DSC_DELETED: - case DSC_DELETE_PEND: - break; - default: - ql_dbg(ql_dbg_disc, vha, 0xffff, - "%s %d %8phC post del sess\n", - __func__, __LINE__, - conflict->port_name); - qlt_schedule_sess_for_deletion - (conflict); - break; - } + qlt_schedule_sess_for_deletion(conflict); } } From patchwork Fri Aug 31 18:24:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Madhani, Himanshu" X-Patchwork-Id: 10584341 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 7354B5A4 for ; Fri, 31 Aug 2018 18:24:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 60EF32C535 for ; Fri, 31 Aug 2018 18:24:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 555082C5B3; Fri, 31 Aug 2018 18:24:56 +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 572322C535 for ; Fri, 31 Aug 2018 18:24:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727560AbeHaWdg (ORCPT ); Fri, 31 Aug 2018 18:33:36 -0400 Received: from mail-sn1nam01on0051.outbound.protection.outlook.com ([104.47.32.51]:49568 "EHLO NAM01-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727533AbeHaWdf (ORCPT ); Fri, 31 Aug 2018 18:33: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=oFKkBXJQBwLDhd8cA7sS2rynE6JorfK8VZP+gSZzhIw=; b=aZxK6S574WMkYY9bsNbiTWqiRaH7WDNz2Wm9aDUtYo4VQqt/fgKGEvfl9BHBt0L7cYtNHIVTSmblSWSLVQ8lRXSWAsZZm7TxGwS4K8PazATtqsGIP8ANvZWg0SSg6qmoiQeoeQhYI9bakHVBbtZZxodk3DdXxFJb3HK81uKh+M0= Received: from BYAPR07CA0005.namprd07.prod.outlook.com (2603:10b6:a02:bc::18) by DM2PR07MB1449.namprd07.prod.outlook.com (2a01:111:e400:50c3::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1080.17; Fri, 31 Aug 2018 18:24:50 +0000 Received: from DM3NAM05FT013.eop-nam05.prod.protection.outlook.com (2a01:111:f400:7e51::204) by BYAPR07CA0005.outlook.office365.com (2603:10b6:a02:bc::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1101.15 via Frontend Transport; Fri, 31 Aug 2018 18:24:49 +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 DM3NAM05FT013.mail.protection.outlook.com (10.152.98.122) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.20.1122.2 via Frontend Transport; Fri, 31 Aug 2018 18:24:49 +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, 31 Aug 2018 11:24:40 -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 w7VIOePQ024241; Fri, 31 Aug 2018 11:24:40 -0700 Received: (from root@localhost) by dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id w7VIOeZn024240; Fri, 31 Aug 2018 11:24:40 -0700 From: Himanshu Madhani To: , CC: , Subject: [PATCH v2 06/14] qla2xxx: Move rport registration out of internal work_list Date: Fri, 31 Aug 2018 11:24:31 -0700 Message-ID: <20180831182439.24182-7-himanshu.madhani@cavium.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20180831182439.24182-1-himanshu.madhani@cavium.com> References: <20180831182439.24182-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)(979002)(346002)(396003)(376002)(136003)(39860400002)(2980300002)(438002)(199004)(189003)(50466002)(42186006)(316002)(110136005)(54906003)(16586007)(186003)(81166006)(81156014)(48376002)(26005)(5660300001)(106002)(14444005)(8676002)(36756003)(44832011)(51416003)(478600001)(76176011)(80596001)(72206003)(86362001)(575784001)(336012)(69596002)(126002)(106466001)(476003)(486006)(2616005)(4326008)(87636003)(446003)(6666003)(11346002)(1076002)(305945005)(2906002)(8936002)(50226002)(356003)(47776003)(969003)(989001)(999001)(1009001)(1019001);DIR:OUT;SFP:1101;SCL:1;SRVR:DM2PR07MB1449;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;DM3NAM05FT013;1:rzDiJu0O+i6Wjnh7tSH5ZEW/YJrqlBYpO0H3JDeZiWyXas0mLNdVcRtfiDXZmmUGIcbpHtCDvsLC/Qz+40fjlahmCZ2OEvhCMJeQz4WX3RgOf8fmbMAFBcM1w7hUQ7G/ X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1ec0a2a8-7e15-4534-515e-08d60f6f0990 X-Microsoft-Antispam: BCL:0;PCL:0;RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(4608076)(2017052603328)(7153060);SRVR:DM2PR07MB1449; X-Microsoft-Exchange-Diagnostics: 1;DM2PR07MB1449;3:a3IKAa/mRWJgbTQAKUhQdw/dA81EZLX8Kr7myrT7GGn4PhvQ6M956gLZe7+E8323Fp3SZ40hN3a3MA7gDjy7BmHfwRzG7WHzQ9LSivxM+dVgQZUyq3nv9UpNeEHQeil120w3+erZtpskrnVSh+27RGKEXayTXsTS1FDrRLHIq7D8vk6g4wCLm6LjBKOMgqq7dtxGpRHzwcFR1k7Le29bmYx6smMWdW+2DtOW+izjgrfyQXMKIBs40ADwz6UDRasonQ0oQ6Vhf+tTDK6X73/KsKGLlF+FflrzITyWksiju3WNXRDNT9J9UwiuStCCE2IhUCbFAi9t9g+c4WdPxQBPMDA1kQ68hYYvf3OYzm6l5CY=;25:qVMowPze/W41iddHVOSYbZan7TW9BLYJlZRDvUuYV1xuPKybzyYo7ycYSSAcGc6wJATEMpHcwzxwyoZC3Uz+1qRKVeOnCbhymLdUzqrtcdCK9EOuApySHrNfVvUEq/KL29Q+8XWYImlQ0erWpVbg1dwVXp09VO2Psb/QrsbAZ7Z3hcJOSC2BEFkHDlxSmXlrxCc13HA2ZeDDYnsZopmGD71CMOiLzq0X8mAP37yyXQydmnlsDYJaBey4odMEg4JH+cPAen1Xjt2RCVmALj23PGPX0aknemWOH4hanBoV0qKlvwpPx1E63rN8wPX98s66+c2udnhHvyBFpjayIDVxWw== X-MS-TrafficTypeDiagnostic: DM2PR07MB1449: X-Microsoft-Exchange-Diagnostics: 1;DM2PR07MB1449;31:/Uiz38d5VnvyEV/chKQzI314Hj6VKrAAbEa1cYQkyP21XQwwHKo9qcZpaehUnUnHN7SQ/IrMnkAjiIR5rHPP1fPC8ydmTsU1ITKCPdagzUOptOvVolMudLL6nCdpUHAJ6ZKL7lqa1YRNC+cY5oLubcsSBnGmtPbkYNowuogczY9cQLp0k4kFEwGHXyKj+qpn6iJLM4rswcRGvCuH05UQV2PLspImqmjEk4tvFfLobMU=;20:sRgdn7FzkLzzSj1tIZ5YupTapVz/RpEtuKwUHmWeC2+JsyCBx/XcAd2ybY4ZcnPMoXmmwqVUhcYfh6HTOghv2eY/p03i9Z35XSBan0YqZWTSnsgCR4mzD+Bv4yAeAwWLKsCRuJEZnsaKHzv3V1jGzHxabZjudawRI478U2xWPEkXLv5ThCdGXWO3el+As7/C+8rcKX7GtKYk3lJqo2Aq8SVjf7CzurupAEgpHHnQq5CAQRNkEQ8j0rNH9a+9LHJ89ODYicKCiLv3VrQ5+XrWwha/qQxQysF38XuGv+pEY9EHKDislWdnQsg+hjBaF5CCntjp7xAiPaC8u8/OKKpIUNdFZkZlIV5zt2nUjCHvfJGST66hve3wI463/jHJvjwVKF/c2xAD7AKIfGakVlpI39xwqqSXtK6W6Bx0R+C/CPwNwoDFj8Z9BUH5rKOX0dexnwRyWwMLfgZPmHwVwF2PShik07pK8E7PnZ/No4JSsGenk0J/4v4bGyiRRKtbB5Zp X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(163750095850)(211171220733660); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3002001)(3231311)(944501410)(52105095)(10201501046)(93006095)(93004095)(149027)(150027)(6041310)(20161123558120)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123562045)(201708071742011)(7699016);SRVR:DM2PR07MB1449;BCL:0;PCL:0;RULEID:;SRVR:DM2PR07MB1449; X-Microsoft-Exchange-Diagnostics: 1;DM2PR07MB1449;4:IxSK38XqE+M7FwSIRUzGs7wtPhxlcWnOf4hQJF3XDpwGkzUJ9pTIoBuZRomksdTweLxBdHqbDD1v7wNB5mdHDvYA5i4QK4VYPJvkVz82BExyfar+J5Khh400tYE/zZ00PiEe87K/rBUyZQ8lJ1QmlIHxh3MoFxRorzCKoMyaOUM5A+hqRQzNfCHTGJs05b6Q/LR6WwbdyD8ASQPqcB+GvkCx0s6E2l6+4DTHk4e5quwaZL8RFDIp6+qZKG3mzaFJf3XuReAZhiFzqUE+t7S2FepojTAnQggZErv4Hj0ywYIOxKZJZX6XXXqi8GBayALsy0gq5/9gNSpjLOvgoJLKildya5cmh4eruOX+AU7TTJ4= X-Forefront-PRVS: 07817FCC2D X-Microsoft-Exchange-Diagnostics: 1;DM2PR07MB1449;23:QBocVYfwluDIXzY3otgwgkeDyhM9L+1EyVfeMKck6pIRpa3XwdxkhbIe2MTgODQMCbR+e8okTOUIAB6m1SGkibNJ8LpAoZ5aD7hXCfKwXLTSVUhmImXiKk2R/9SEmhsfqnsBaB0GYw+myM8nNzUE4tDD8BT+dv/M83iAZhoZ/GLrEswpaYxltwBm018mu3gBp6sqnUcy4wga8PrjUq4/ICX6dMyeAaBGCsWonSbC/aoMVaTg9fluAsIFi1BfMw5TnH7xPeMQwElPg3IISyM6OU+BJg+VNma3b7K1kqVxIc71QXf3M5UD4tOp7QT2smVKZU80fsCQDJTCd9xv86r3cVOIwdzmDmjG9cLVE0oV40fpIreYKEBzf3iXhqPlBw3h8jt9Vi4EqlZmL3mecPbtHrzB601DFd9ssT8YiQfnQsy7nBW5fP2Yjc1Xs3jF2A1zM/JdjS0DEYiBuLyXaXitO2gePgFbdMh06OCnbeQ/8JW5qqifSc2urICbl4V6fR6Ik82gUgHHsJfyQ6yngzJDEvMAsuUvIguwskrD0PuoV1VUhhC9bE0exodYhD+eip2ioGWncsunEnE+rzVUYLJZHL6Lfu6/H2udAYJzDUTziJDkZ3GLYdPxj4/RwkayHzi7zR2mUhTQq/7WXjlLvMypwY0RETvTd9Gd69AgJG6sKoFQh/JWGcv4UB+bRsf8aEpHSl7G/79hNOm///i+X/hMdWDcOUeuWrGMGVm6fJXddpCT13R5q40YpzqKh5Dw+/4lPU94Wfs/PQtmxp/270DpzCThdRE4cwACUsesGHf0MMH2cEUPy0+xV6EcxYh3TgOSt+2xmrWiJOJ3c/5vgaJdIemCQfKZn7jGY6m1gPh5E2gZuKSjSQjKAZZIt5bAM5L3JBJ4Je9o/2PmeTzFbQ5Mk2tNrKcJD5BnVAWRRT3WJOV4OBHHzdCRMLu7JsAXW3MqYzWvGFhhhrChxDeWjzlLwgMaKSMklTPogo3pM8FGc1Hl0l+cFcqM9liOoemJxBcnxAgCWokZGsGF/7c13e0jT3iBJybD6cRjgPBGPmo8243nSP4gYhNIKGQllWtXmGIUM9zxT1hpGwJiDEq+cMjtSg/NsbetTu1lA/tZ601SdNhUW6BjSoEPTcnc6nIz+6rCv7VJR/apaSMQGIwdgp6MGevbH9mi1KQpnUWPJpC+vdEhguPB864fogwngGQv4XotiZM1OuaeRABq2vXBUntv7y7yv1WGCOQVtXOlQ4wOS9Q= X-Microsoft-Antispam-Message-Info: PqvwKKp9F7tOx0xi0h/Uam8111eDat44L5w9g924suhMrm5Fdb4vXHUoECzEvAGTRIV5hbt7vfRDU81BLEFzCXEKgT1YuoJhCt8Z9J1SfvAy52kzwTklMNmnm3sWaAo+n8/DMugxEzQ2U1Fe92FSuAr+Ee+CIzSm/CzQ4VGy0MYeLeZ/1sgYlA5sR4UI6eO8Z+YXX8pqKaeMJQDcxCIaRcSBtin7tVa0fmjd9MmCxEMyRha9S5PFqcqw8Qd8gP0VSZgGfKH3uGfmHleXSkllpRcK8UwzsvjkAifv/t0wdhnG0T4/U/7EbVCIeFaHBEZzDyblwJvN15blUCYwbCcCwpSgf3jRXOGCTtK9lwFgqig= X-Microsoft-Exchange-Diagnostics: 1;DM2PR07MB1449;6:97VnHpdDsuNSrxlsri3CjXy2vMuXtS06hcxPDFm7s/ID0JYzN71egR3BZ4HPr1LRxGOiYiC3Xu4ibwCKo0IOoC4kkkVDPGOvPxQ8AH99xba5hSwgVKMaMkVVHLjWaQOUmI5CtjjcZ8OcJxw7Zu0naoZj4rwh32Zx9s1ex5JtjSBHGvb+eAtnhOVJdsVYSBnh5EtEk4FKN3qFgnv1i5Q1i3ZmWM6Xiedhj7tWDbQ3i2rklZ7C355QUnsQPiNV04oboy9un8QBCMMUYqM5rBtccvaGsSDQPc+oLtZjl9L6+jcpu8Ul2SnSrbAwbSiFnZUSDoHB3bnCL8Nfiak+I1D7nYTUzTa2uvhz2XtZTqeCDUsOQyVhkZRK7S8QJy/QrMo5opIYtsTZfJklijeKC1mRURAOikfVSjrmeBxQvXEETj1HAus11vYGZQzhaPx6cIvm4tX/Sljce8we+MaJYbBhYw==;5:PP8KY/gsbZsuXXZar6f1edWhIIhlTBCJvpW7+p42OncU+V+5wJ4PjKB7etlk5EH2hIaLR5BH3jL1g5Za4N4krgWdy2UYYEpGyZLZ5viy/eneQkA7n0ufX+ydbcizf15ZnQMZmLLSyBpdc4hJmHOjJ1nV1HYaVHst5Aac7U/2b6g=;7:bpqZNNZqiUkcJhvVoHW6l/VSpDfIB8Rc1lgMmxu3OBk/N5hutlTXhCNC06xNSu4pNh93tcY2ZzyG2yYVV/vxR4cSlENmK17aI16euZ5tyC3MAf8CYxIlhQ1zkH9FDrcay/QmtmcD0JOHWsbPtK8VPlIwbnLr4phmSFHM50ZGm8bZBiotu9ZoUdlaWxXyL+z2EtTW8jJzZhcDwHHIWuGCeOA/E4jupcfPH/GmWDC54zKde8B2VXyws1P3rnK+HteB SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Aug 2018 18:24:49.2305 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1ec0a2a8-7e15-4534-515e-08d60f6f0990 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: DM2PR07MB1449 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 Currently, the rport registration is being called from a single work element that is used to process QLA internal "work_list". This work_list is meant for quick and simple task (ie no sleep). The Rport registration process sometime can be delayed by upper layer. This causes back pressure with the internal queue where other jobs are unable to move forward. This patch will schedule the registration process with a new work element (fc_port.reg_work). While the RPort is being registered, the current state of the fcport will not move forward until the registration is done. If the state of the fabric has changed, a new field/next_disc_state will record the next action on whether to 'DELETE' or 'Reverify the session/ADISC'. Signed-off-by: Quinn Tran Signed-off-by: Himanshu Madhani --- drivers/scsi/qla2xxx/qla_def.h | 6 ++- drivers/scsi/qla2xxx/qla_gbl.h | 5 ++- drivers/scsi/qla2xxx/qla_init.c | 66 ++++++++++++++++++++++++++----- drivers/scsi/qla2xxx/qla_os.c | 26 +++++++----- drivers/scsi/qla2xxx/qla_target.c | 83 +++++++++++++++++++++++++++++++-------- 5 files changed, 147 insertions(+), 39 deletions(-) diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h index c41d0dbbbd79..16dd59bcd60a 100644 --- a/drivers/scsi/qla2xxx/qla_def.h +++ b/drivers/scsi/qla2xxx/qla_def.h @@ -2375,11 +2375,13 @@ typedef struct fc_port { unsigned long expires; struct list_head del_list_entry; struct work_struct free_work; - + struct work_struct reg_work; + uint64_t jiffies_at_registration; struct qlt_plogi_ack_t *plogi_link[QLT_PLOGI_LINK_MAX]; uint16_t tgt_id; uint16_t old_tgt_id; + uint16_t sec_since_registration; uint8_t fcp_prio; @@ -2412,6 +2414,7 @@ typedef struct fc_port { struct qla_tgt_sess *tgt_session; struct ct_sns_desc ct_desc; enum discovery_state disc_state; + enum discovery_state next_disc_state; enum login_state fw_login_state; unsigned long dm_login_expire; unsigned long plogi_nack_done_deadline; @@ -3222,7 +3225,6 @@ enum qla_work_type { QLA_EVT_GPDB, QLA_EVT_PRLI, QLA_EVT_GPSC, - QLA_EVT_UPD_FCPORT, QLA_EVT_GNL, QLA_EVT_NACK, QLA_EVT_RELOGIN, diff --git a/drivers/scsi/qla2xxx/qla_gbl.h b/drivers/scsi/qla2xxx/qla_gbl.h index 178974896b5c..b8e4abe804d5 100644 --- a/drivers/scsi/qla2xxx/qla_gbl.h +++ b/drivers/scsi/qla2xxx/qla_gbl.h @@ -54,7 +54,7 @@ extern void qla2x00_abort_isp_cleanup(scsi_qla_host_t *); extern void qla2x00_quiesce_io(scsi_qla_host_t *); extern void qla2x00_update_fcport(scsi_qla_host_t *, fc_port_t *); - +void qla_register_fcport_fn(struct work_struct *); extern void qla2x00_alloc_fw_dump(scsi_qla_host_t *); extern void qla2x00_try_to_stop_firmware(scsi_qla_host_t *); @@ -109,6 +109,7 @@ int qla24xx_post_newsess_work(struct scsi_qla_host *, port_id_t *, u8 *, u8*, int qla24xx_fcport_handle_login(struct scsi_qla_host *, fc_port_t *); int qla24xx_detect_sfp(scsi_qla_host_t *vha); int qla24xx_post_gpdb_work(struct scsi_qla_host *, fc_port_t *, u8); + void qla2x00_async_prlo_done(struct scsi_qla_host *, fc_port_t *, uint16_t *); extern int qla2x00_post_async_prlo_work(struct scsi_qla_host *, fc_port_t *, @@ -208,7 +209,7 @@ extern void qla2x00_disable_board_on_pci_error(struct work_struct *); extern void qla2x00_sp_compl(void *, int); extern void qla2xxx_qpair_sp_free_dma(void *); extern void qla2xxx_qpair_sp_compl(void *, int); -extern int qla24xx_post_upd_fcport_work(struct scsi_qla_host *, fc_port_t *); +extern void qla24xx_sched_upd_fcport(fc_port_t *); void qla2x00_handle_login_done_event(struct scsi_qla_host *, fc_port_t *, uint16_t *); int qla24xx_post_gnl_work(struct scsi_qla_host *, fc_port_t *); diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c index 6d9c8a017ae9..39710ebd5950 100644 --- a/drivers/scsi/qla2xxx/qla_init.c +++ b/drivers/scsi/qla2xxx/qla_init.c @@ -1182,11 +1182,7 @@ void __qla24xx_handle_gpdb_event(scsi_qla_host_t *vha, struct event_arg *ea) vha->fcport_count++; ea->fcport->login_succ = 1; - ql_dbg(ql_dbg_disc, vha, 0x20d6, - "%s %d %8phC post upd_fcport fcp_cnt %d\n", - __func__, __LINE__, ea->fcport->port_name, - vha->fcport_count); - qla24xx_post_upd_fcport_work(vha, ea->fcport); + qla24xx_sched_upd_fcport(ea->fcport); } else if (ea->fcport->login_succ) { /* * We have an existing session. A late RSCN delivery @@ -1304,6 +1300,7 @@ int qla24xx_fcport_handle_login(struct scsi_qla_host *vha, fc_port_t *fcport) { u16 data[2]; u64 wwn; + u16 sec; ql_dbg(ql_dbg_disc, vha, 0x20d8, "%s %8phC DS %d LS %d P %d fl %x confl %p rscn %d|%d login %d retry %d lid %d scan %d\n", @@ -1435,6 +1432,22 @@ int qla24xx_fcport_handle_login(struct scsi_qla_host *vha, fc_port_t *fcport) qla24xx_post_prli_work(vha, fcport); break; + case DSC_UPD_FCPORT: + sec = jiffies_to_msecs(jiffies - + fcport->jiffies_at_registration)/1000; + if (fcport->sec_since_registration < sec && sec && + !(sec % 60)) { + fcport->sec_since_registration = sec; + ql_dbg(ql_dbg_disc, fcport->vha, 0xffff, + "%s %8phC - Slow Rport registration(%d Sec)\n", + __func__, fcport->port_name, sec); + } + + if (fcport->next_disc_state != DSC_DELETE_PEND) + fcport->next_disc_state = DSC_ADISC; + set_bit(RELOGIN_NEEDED, &vha->dpc_flags); + break; + default: break; } @@ -1550,8 +1563,10 @@ void qla2x00_fcport_event_handler(scsi_qla_host_t *vha, struct event_arg *ea) case RSCN_PORT_ADDR: fcport = qla2x00_find_fcport_by_nportid (vha, &ea->id, 1); - if (fcport) + if (fcport) { fcport->scan_needed = 1; + fcport->rscn_gen++; + } spin_lock_irqsave(&vha->work_lock, flags); if (vha->scan.scan_flags == 0) { @@ -4723,6 +4738,7 @@ qla2x00_alloc_fcport(scsi_qla_host_t *vha, gfp_t flags) fcport = NULL; } INIT_WORK(&fcport->del_work, qla24xx_delete_sess_fn); + INIT_WORK(&fcport->reg_work, qla_register_fcport_fn); INIT_LIST_HEAD(&fcport->gnl_entry); INIT_LIST_HEAD(&fcport->list); @@ -5218,13 +5234,15 @@ qla2x00_reg_remote_port(scsi_qla_host_t *vha, fc_port_t *fcport) void qla2x00_update_fcport(scsi_qla_host_t *vha, fc_port_t *fcport) { - fcport->vha = vha; - if (IS_SW_RESV_ADDR(fcport->d_id)) return; + ql_dbg(ql_dbg_disc, vha, 0x20ef, "%s %8phC\n", + __func__, fcport->port_name); + + fcport->disc_state = DSC_UPD_FCPORT; + fcport->login_retry = vha->hw->login_retry_count; fcport->flags &= ~(FCF_LOGIN_NEEDED | FCF_ASYNC_SENT); - fcport->disc_state = DSC_LOGIN_COMPLETE; fcport->deleted = 0; fcport->logout_on_delete = 1; fcport->login_retry = vha->hw->login_retry_count; @@ -5286,6 +5304,36 @@ qla2x00_update_fcport(scsi_qla_host_t *vha, fc_port_t *fcport) } } qla2x00_set_fcport_state(fcport, FCS_ONLINE); + + fcport->disc_state = DSC_LOGIN_COMPLETE; +} + +void qla_register_fcport_fn(struct work_struct *work) +{ + fc_port_t *fcport = container_of(work, struct fc_port, reg_work); + u32 rscn_gen = fcport->rscn_gen; + u16 data[2]; + + if (IS_SW_RESV_ADDR(fcport->d_id)) + return; + + qla2x00_update_fcport(fcport->vha, fcport); + + if (rscn_gen != fcport->rscn_gen) { + /* RSCN(s) came in while registration */ + switch (fcport->next_disc_state) { + case DSC_DELETE_PEND: + qlt_schedule_sess_for_deletion(fcport); + break; + case DSC_ADISC: + data[0] = data[1] = 0; + qla2x00_post_async_adisc_work(fcport->vha, fcport, + data); + break; + default: + break; + } + } } /* diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c index 42b8f0d3e580..1ae31a119a37 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c @@ -4761,16 +4761,25 @@ qlafx00_post_aenfx_work(struct scsi_qla_host *vha, uint32_t evtcode, return qla2x00_post_work(vha, e); } -int qla24xx_post_upd_fcport_work(struct scsi_qla_host *vha, fc_port_t *fcport) +void qla24xx_sched_upd_fcport(fc_port_t *fcport) { - struct qla_work_evt *e; + unsigned long flags; - e = qla2x00_alloc_work(vha, QLA_EVT_UPD_FCPORT); - if (!e) - return QLA_FUNCTION_FAILED; + if (IS_SW_RESV_ADDR(fcport->d_id)) + return; - e->u.fcport.fcport = fcport; - return qla2x00_post_work(vha, e); + spin_lock_irqsave(&fcport->vha->work_lock, flags); + if (fcport->disc_state == DSC_UPD_FCPORT) { + spin_unlock_irqrestore(&fcport->vha->work_lock, flags); + return; + } + fcport->jiffies_at_registration = jiffies; + fcport->sec_since_registration = 0; + fcport->next_disc_state = DSC_DELETED; + fcport->disc_state = DSC_UPD_FCPORT; + spin_unlock_irqrestore(&fcport->vha->work_lock, flags); + + queue_work(system_unbound_wq, &fcport->reg_work); } static @@ -5025,9 +5034,6 @@ qla2x00_do_work(struct scsi_qla_host *vha) case QLA_EVT_GPSC: qla24xx_async_gpsc(vha, e->u.fcport.fcport); break; - case QLA_EVT_UPD_FCPORT: - qla2x00_update_fcport(vha, e->u.fcport.fcport); - break; case QLA_EVT_GNL: qla24xx_async_gnl(vha, e->u.fcport.fcport); break; diff --git a/drivers/scsi/qla2xxx/qla_target.c b/drivers/scsi/qla2xxx/qla_target.c index 8c811b251d42..34fadd320f55 100644 --- a/drivers/scsi/qla2xxx/qla_target.c +++ b/drivers/scsi/qla2xxx/qla_target.c @@ -600,14 +600,7 @@ void qla2x00_async_nack_sp_done(void *s, int res) sp->fcport->login_succ = 1; vha->fcport_count++; - - ql_dbg(ql_dbg_disc, vha, 0x20f3, - "%s %d %8phC post upd_fcport fcp_cnt %d\n", - __func__, __LINE__, - sp->fcport->port_name, - vha->fcport_count); - sp->fcport->disc_state = DSC_UPD_FCPORT; - qla24xx_post_upd_fcport_work(vha, sp->fcport); + qla24xx_sched_upd_fcport(sp->fcport); } else { sp->fcport->login_retry = 0; sp->fcport->disc_state = DSC_LOGIN_COMPLETE; @@ -1230,11 +1223,12 @@ void qlt_schedule_sess_for_deletion(struct fc_port *sess) { struct qla_tgt *tgt = sess->tgt; unsigned long flags; + u16 sec; - if (sess->disc_state == DSC_DELETE_PEND) + switch (sess->disc_state) { + case DSC_DELETE_PEND: return; - - if (sess->disc_state == DSC_DELETED) { + case DSC_DELETED: if (tgt && tgt->tgt_stop && (tgt->sess_count == 0)) wake_up_all(&tgt->waitQ); if (sess->vha->fcport_count == 0) @@ -1243,6 +1237,24 @@ void qlt_schedule_sess_for_deletion(struct fc_port *sess) if (!sess->plogi_link[QLT_PLOGI_LINK_SAME_WWN] && !sess->plogi_link[QLT_PLOGI_LINK_CONFLICT]) return; + break; + case DSC_UPD_FCPORT: + /* + * This port is not done reporting to upper layer. + * let it finish + */ + sess->next_disc_state = DSC_DELETE_PEND; + sec = jiffies_to_msecs(jiffies - + sess->jiffies_at_registration)/1000; + if (sess->sec_since_registration < sec && sec && !(sec % 5)) { + sess->sec_since_registration = sec; + ql_dbg(ql_dbg_disc, sess->vha, 0xffff, + "%s %8phC : Slow Rport registration(%d Sec)\n", + __func__, sess->port_name, sec); + } + return; + default: + break; } if (sess->deleted == QLA_SESS_DELETED) @@ -4752,6 +4764,32 @@ static int qlt_handle_login(struct scsi_qla_host *vha, goto out; } + if (sess->disc_state == DSC_UPD_FCPORT) { + u16 sec; + + /* + * Remote port registration is still going on from + * previous login. Allow it to finish before we + * accept the new login. + */ + sess->next_disc_state = DSC_DELETE_PEND; + sec = jiffies_to_msecs(jiffies - + sess->jiffies_at_registration) / 1000; + if (sess->sec_since_registration < sec && sec && + !(sec % 5)) { + sess->sec_since_registration = sec; + ql_dbg(ql_dbg_disc, vha, 0xffff, + "%s %8phC - Slow Rport registration (%d Sec)\n", + __func__, sess->port_name, sec); + } + + if (!conflict_sess) + kmem_cache_free(qla_tgt_plogi_cachep, pla); + + qlt_send_term_imm_notif(vha, iocb, 1); + goto out; + } + qlt_plogi_ack_link(vha, pla, sess, QLT_PLOGI_LINK_SAME_WWN); sess->d_id = port_id; sess->login_gen++; @@ -4910,6 +4948,7 @@ static int qlt_24xx_handle_els(struct scsi_qla_host *vha, if (sess != NULL) { bool delete = false; + int sec; spin_lock_irqsave(&tgt->ha->tgt.sess_lock, flags); switch (sess->fw_login_state) { case DSC_LS_PLOGI_PEND: @@ -4922,9 +4961,24 @@ static int qlt_24xx_handle_els(struct scsi_qla_host *vha, } switch (sess->disc_state) { + case DSC_UPD_FCPORT: + spin_unlock_irqrestore(&tgt->ha->tgt.sess_lock, + flags); + + sec = jiffies_to_msecs(jiffies - + sess->jiffies_at_registration)/1000; + if (sess->sec_since_registration < sec && sec && + !(sec % 5)) { + sess->sec_since_registration = sec; + ql_dbg(ql_dbg_disc, sess->vha, 0xffff, + "%s %8phC : Slow Rport registration(%d Sec)\n", + __func__, sess->port_name, sec); + } + qlt_send_term_imm_notif(vha, iocb, 1); + return 0; + case DSC_LOGIN_PEND: case DSC_GPDB: - case DSC_UPD_FCPORT: case DSC_LOGIN_COMPLETE: case DSC_ADISC: delete = false; @@ -5964,10 +6018,7 @@ static fc_port_t *qlt_get_port_database(struct scsi_qla_host *vha, case MODE_DUAL: if (newfcport) { if (!IS_IIDMA_CAPABLE(vha->hw) || !vha->hw->flags.gpsc_supported) { - ql_dbg(ql_dbg_disc, vha, 0x20fe, - "%s %d %8phC post upd_fcport fcp_cnt %d\n", - __func__, __LINE__, fcport->port_name, vha->fcport_count); - qla24xx_post_upd_fcport_work(vha, fcport); + qla24xx_sched_upd_fcport(fcport); } else { ql_dbg(ql_dbg_disc, vha, 0x20ff, "%s %d %8phC post gpsc fcp_cnt %d\n", From patchwork Fri Aug 31 18:24:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Madhani, Himanshu" X-Patchwork-Id: 10584345 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 09064112B for ; Fri, 31 Aug 2018 18:24:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id ED0652C535 for ; Fri, 31 Aug 2018 18:24:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E16C72C5B4; Fri, 31 Aug 2018 18:24:58 +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 764BA2C535 for ; Fri, 31 Aug 2018 18:24:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727591AbeHaWdj (ORCPT ); Fri, 31 Aug 2018 18:33:39 -0400 Received: from mail-eopbgr680045.outbound.protection.outlook.com ([40.107.68.45]:32692 "EHLO NAM04-BN3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727545AbeHaWdi (ORCPT ); Fri, 31 Aug 2018 18:33:38 -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=oukvGbXI5CPFuXiccYHYsyHqPONErU78eF1wayWZQ1A=; b=Z3b59DzfEHSXnS1ZMxLDdC0/WhFVA1cBHGVrWVZrqjmDTMBJiWq9K0VluEbWDsrMooKbVyB7GId1fbhFMk7IpixvogOishASeK/PFabrPOVSQD1uz1uRm4+kDv5umhNXgFQNrvuHlMWAzCeklFEunnFXOUxYiJA6+gg2QQVwiSk= Received: from DM5PR07CA0113.namprd07.prod.outlook.com (2603:10b6:4:ae::42) by BN7PR07MB4385.namprd07.prod.outlook.com (2603:10b6:406:b5::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1080.16; Fri, 31 Aug 2018 18:24:51 +0000 Received: from DM3NAM05FT030.eop-nam05.prod.protection.outlook.com (2a01:111:f400:7e51::203) by DM5PR07CA0113.outlook.office365.com (2603:10b6:4:ae::42) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1101.16 via Frontend Transport; Fri, 31 Aug 2018 18:24:51 +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 DM3NAM05FT030.mail.protection.outlook.com (10.152.98.142) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P256) id 15.20.1122.2 via Frontend Transport; Fri, 31 Aug 2018 18:24:51 +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, 31 Aug 2018 11:24:40 -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 w7VIOe7N024245; Fri, 31 Aug 2018 11:24:40 -0700 Received: (from root@localhost) by dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id w7VIOefw024244; Fri, 31 Aug 2018 11:24:40 -0700 From: Himanshu Madhani To: , CC: , Subject: [PATCH v2 07/14] qla2xxx: Decrement login retry count for only plogi Date: Fri, 31 Aug 2018 11:24:32 -0700 Message-ID: <20180831182439.24182-8-himanshu.madhani@cavium.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20180831182439.24182-1-himanshu.madhani@cavium.com> References: <20180831182439.24182-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)(39860400002)(396003)(2980300002)(438002)(189003)(199004)(476003)(51416003)(44832011)(2616005)(356003)(69596002)(72206003)(478600001)(47776003)(486006)(106002)(126002)(8676002)(336012)(1076002)(26005)(11346002)(446003)(76176011)(186003)(50466002)(110136005)(86362001)(54906003)(42186006)(16586007)(2906002)(48376002)(316002)(5660300001)(4326008)(305945005)(87636003)(81156014)(81166006)(50226002)(36756003)(106466001)(8936002)(80596001)(6666003);DIR:OUT;SFP:1101;SCL:1;SRVR:BN7PR07MB4385;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;DM3NAM05FT030;1:5ZQmih6n6BQwUMZqZoHI1SJJJgbO1vzwPuL5xWzScJAMJ3xUrLYTR/AqBOUfH/szLLyFcP6+yFR3Br0arVlWuVrCSdctU6vdpitVyzG1Ozy29tqkYFrmoUVZOiHW1D/2 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: cb4abf7b-1a2e-4361-76da-08d60f6f0aba X-Microsoft-Antispam: BCL:0;PCL:0;RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(4608076)(2017052603328)(7153060);SRVR:BN7PR07MB4385; X-Microsoft-Exchange-Diagnostics: 1;BN7PR07MB4385;3:4wMjqoHw1jvulgHh3A0Qk52fP9f3GBcJ0YAGjgVkYZZqseM9JIvSQhiOlJnHJQCauChQ7gReD3llaEB1DJr/PzczOCDFGIk7LdINoDOO5GRe2e3iQ3Rvj7Wt6MGYhZCvzj7gD095m9QgIWrPr12dm8Zp688chtdmY1+qosBHyGEvPbMkpM4MfdPrH0WVhgShqWlZYQ0sMaIxpqKnEDe5mQ9a8MCL7bqCk72lgpd8s8kziaNEz0Sna/fKvsWnviex+2y3QMBpIzvSl+a3Z9DBnVBRVuZRL19MlWWgX8OTHcKvIzKKbb7aF9UZV6VeAt6//P8dS9xpp3TZe7LT1usTx0M9tYfjzTiZakpuDRx9tGE=;25:swC5EvrF5AX7PkSNLfzAK+frMuRFAOtrDi1OST7d3pTJJN1g6lJwzTEiSNFXSGuNI0A81mgwGuvDq8EmQ9ruXFkPtsRht+DVss+xDUfZxgzsmEefumMsGNOeNgUcJPHpWGK0dp2CZ6iPzKDuapoo++Ynlw4+byQhqQ6AxJcrJ//U8P2X4xIv+o9rVBYa0WIgv4kALI8G7+/cRJaWIvAMTf8t2XIprCrBCsuVARkGuT+lrvrUmC0ZS9HSHKC5gJ6/nFlbPuIa4uxv0V4EqO2mZOHSXiHvt7tuWkfQMIOtwudcwk1ft1AAZi8GRLp/tTAYxp0jkPsktmJ+sBS5qjdPjw== X-MS-TrafficTypeDiagnostic: BN7PR07MB4385: X-Microsoft-Exchange-Diagnostics: 1;BN7PR07MB4385;31:YMYYBFBNKfX4YIeZg1aD1wSPo8p/q2OFDcytmsWyojO2kiHisYMf6pTyKL7bkCEEv0g1gsDWjxx6YWlx0zW8YfUp61WIKhhy4fL4Fvl/gN19uOoEFfmbvEQFkoaOBUM/155zr9pRivfnXW2Nl10oYxQSsqCVPmubgZVrp3tfuxbzEF/3fKsXuJ8e+0gdnCtuYZz637bpChpN+aLDytRc3G0sHzJ3uNDNhVAxxe0vb+Y=;20:Vs7dsg8R/8+1DDCKSS2g5BDk0B0tA/v+ydgb9QtOKTVcn4otNNxIlIodJlWsd1gFyLbQ8vrRzfa9kk+LbFfo9OQFblm9dzyXTumJzk0rSG53e2I1g+knF+bw1mYjjRzz0v3ArmZpgFfEwq9fZgfUZhdD/LjKoBJuCjPUj4RSV5zSigNdWDTZ6fm+FoOnMxlYsB+KNcB1DmQtdlDEgxzRyo5S5HS5yfFNabnNAWmxW+ugarR/Cd1+z/ZIULH6HLQfuovrm/PeycZtDhzfhTQg9xWrU2NRl6XnrVHxOcV2QVkAq6/pE9wzg1nyzGAPXd5heo1DJh4bsPfSdbwKWXkc8SKsy/x8D0nHsEuVsnWEhTPa5IkmJWKuDmfiG42xopx+KHmnHBFRM3zE2aRDBIsbDJK++Ww4bgBG58nLmyBQ3RlfiPN6GA4jNaUfmxZe1Y+j0b5U6s/ZGMxdZWpmFzuIWTUZ3csop5oLkNI8Zo+OkwXr//VWO2bXixzQXV3L5IjW 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)(10201501046)(93006095)(93004095)(3002001)(3231311)(944501410)(52105095)(149027)(150027)(6041310)(20161123558120)(20161123562045)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(201708071742011)(7699016);SRVR:BN7PR07MB4385;BCL:0;PCL:0;RULEID:;SRVR:BN7PR07MB4385; X-Microsoft-Exchange-Diagnostics: 1;BN7PR07MB4385;4:jaqKCUyf0pdEabJ97GUQlBD+5XFl5Lzyk16aa8LIpqwPvCQPQX4n2+bMahXVEIgaLYyJdlRgjjZSU0D16OTk9dRu9YkAITmUjtEDbGY31IceSHcV7KgT3SQ6DcY4rQTRBD7Mo1hdRLo2ckzLPp8RsI57WBkfS0DXc7lgFmS/oTBrQFNh5t4i6mxVdJalRfg81efaxfH1i5Mvkbmd4f5ZTRvut2khRKLgeI0o9ItxyGBB8LFjgS5nCfibnoq4iqZRy+8nRd7r7p4N7UEXvmGJfA== X-Forefront-PRVS: 07817FCC2D X-Microsoft-Exchange-Diagnostics: 1;BN7PR07MB4385;23:mQRMTPF7Kn7UpeADm0R/XTY7h/MJvLu08ZFlLoYxncY8RGFZU7Aaolkw5Y5Qusjkyrc6i3VpKeDBzkhRxd4M8q1wIDapkIJgIo0FqKJqBSuS5spWUe8tDu8TK4AWNTvlxPv6l75QS5LaTKjcH5/EZmN+tHAeVBEKbQSBVgEsDiPMJlV4BZBq6RxV1DogpA1fdx7uXiZfnIFbAL4HxvCFEOGfA/etIW5W/aYxXEY5I+cqcgiJeawlYvHL6NM1IV3G00lE8GdmHVhvOhIozt2gT021Mz6/Q6FPRIRkesg7FkvtAiCWkk9G3EpS/4zMYzdUFqyj+IO9OPtE9M/HhgEt5/6oNskL0X44+naBztc5YkozQN8CQuuV3lLvf69pYqbvs9xW0mHvYBonuPzkCXIrGcT0E07nKLRVStyR+j9Fs2NVgGkPt5yLmG4rJypDY5/2RSKv3Ls89Wcrk7yIrkSKq933ZHsAnOSMqc7bT1qB0kBVh3e7rQIqSNrpZq+lF5DZjhsUNrhbGxd322x1zYDw34ixin5YnVzSYpfnfvuQ6qzTevhFEAjy+J+G4IrmZZhvemv2C4XS+YAHEQPnTsfr+Gvz7C7ueSstK7KVfkgY87h6uK+wTXmD6ZFLkLaZR7zf5dbJO/6BMcqLVyIeOMLc+LQ5wN8QbTdsraZVaBqnu5zKxeE9j7hVsYX/FjJ1UsjWQvhhqdBWqEUD/6GGL9CZ9upHNA3I/WXIHDJjxDNXklYTAMbX030WRQYfq2pBx3G7dciYXlnmXnxjToCkMywUZQdmZxftRQ9WA1z9HnxLwWBUTsBYXgy4rA0B2N4i5k8fDGj6VEQ1vNGym8843gImZxmjLaAXATtNzB7PNtXEHTmg6DZuUL+seQ0P2UO8a2TvF3xAPBJ2itfI3TYGK+ccpfFBudRjaExlWK70Qo38DaEr6M+H9nD39hOkD1EJdUxzJag8MhRvfc71yj6nZX/pkBDJaU3PLT/CNEnGSzXep/z+wA4e/Xc99qvsqTcBlk2mA+x860rBD0J6RprpfNCIDlShDGA2m7MUdiuWBr4dRS7Vu0HBWgom5byqh/aUPg2CMGPex8mIt7Hr0ghzwDELMoW16UZfYFrVoYOIZO6Xy3A= X-Microsoft-Antispam-Message-Info: BZxHRSgy/NSoCX0Drriq4vvOUBX+otZMttyvyOieBcrxUfVvoMRYMSfmjMVIocX//ZVYgVh8xxa8VsSiCUhdwwe0DOq7QxS3zhAnvaczhdpOx8XthwGP/zYcr6c5HAgGKuz4B2wHQCawJ5KJaBVZYs8+BejspAjHf0t/aUXB2EjNbeJ9taqF+PnQ54dmzoD95At7ado7I2lJUkHFnGbkTmFyOBr9kcIURY+5L1LTOVWRe3eDO2xbBkcgmWrFhTZVfixAva40SPtAy6WowBp64tUa3s5Zi0inMVxQciSGpZ3lGG1YbInRQBr4vJU0nApYcr6E4W5B4Jd3BPX7W5AHK4ALxDa/dSRumDBGIsLSBus= X-Microsoft-Exchange-Diagnostics: 1;BN7PR07MB4385;6:3kYP6lqaPeinf1aVUzInEs0gFpDv2vpn7yrWx3wHs9JHpzERqHjd1W1ckUQ7QfQvJLBTW6bLMNXZJztDdDONcttoWvVm7Mn7+wZrnGgEZIrPNbrwPn6iQ4R1Aqw9yMj9iDKNck6KCQGtYzXAKEcA/lobtllzYGkB4uiXN6T4fgbJE0NBTXzbvsjq6tJDfHFn4ZvJVMLV4NTj7czSC2BVprKC+7wWnZMH+OI5uyY+J7NcHgayD9m2jpHgaqVIAr78qWdJC0RTGb8Z+5hWqUOPBZwcpykSy91TJEF7+tK+O304XBf9+NBZtpG2NJvj3oABgjvazIEYZJGXFGSVv1du6zg6l8FRbncHxOpwx09/kQ5/P3OD5aJcrlrb08H2zgV+Y/8C/2HUrugbRAessh2ELFVJn/OMFQ71x0fpI1NHdAUOUgcuzaAnjUtzGlQuBtwr2Bf+Q33DJr7WeATA59vFNA==;5:l+F7iVjv8OsOQ/aLN9nOxiAZbrj7mWHbQN2yx0EM0WwYnMWt01pla0DEslmgJS0hZZz9HsntuebHGyPMdJ4bg+flSxCNOgULsDr2uwnosKw770/Q/fubKzavxdCWBT8fImJrCoABLchQY8dEDeJSYCdNixYCUkS3f5uC+56YvxA=;7:fTxNLP/E5zN7/dJcRmTHUPPgT6weyE9KcW+A/LC5L/J8oATIhd3NvRAZbWWjUrLDXdIsk1xuX2b3X9vBD1rzygCRKrQ55S18lKuEiDffY/fHkLaHiS/da4ggAKAuF6LdG6rAJn0EJXo86AxRvY1Igmn8Q/JYR/83h2e+7fVYW9cyqKmQxHLHO3NoewykQpO9vJpzv7aElvehvydybf69XkdUTW7g/I7U32l8ytETCeQ/gkIqXDu7ELZai2j5n++k SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Aug 2018 18:24:51.2157 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: cb4abf7b-1a2e-4361-76da-08d60f6f0aba 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: BN7PR07MB4385 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 Decrement login retry count only for plogi, instead of number of attempt made for login. Signed-off-by: Quinn Tran Signed-off-by: Himanshu Madhani --- drivers/scsi/qla2xxx/qla_init.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c index 39710ebd5950..0f069eb06d8b 100644 --- a/drivers/scsi/qla2xxx/qla_init.c +++ b/drivers/scsi/qla2xxx/qla_init.c @@ -1276,7 +1276,8 @@ static void qla_chk_n2n_b4_login(struct scsi_qla_host *vha, fc_port_t *fcport) login = 1; } - if (login) { + if (login && fcport->login_retry) { + fcport->login_retry--; if (fcport->loop_id == FC_NO_LOOP_ID) { fcport->fw_login_state = DSC_LS_PORT_UNAVAIL; rc = qla2x00_find_new_loop_id(vha, fcport); @@ -1302,13 +1303,12 @@ int qla24xx_fcport_handle_login(struct scsi_qla_host *vha, fc_port_t *fcport) u64 wwn; u16 sec; - ql_dbg(ql_dbg_disc, vha, 0x20d8, - "%s %8phC DS %d LS %d P %d fl %x confl %p rscn %d|%d login %d retry %d lid %d scan %d\n", + ql_dbg(ql_dbg_disc + ql_dbg_verbose, vha, 0x20d8, + "%s %8phC DS %d LS %d P %d fl %x confl %p rscn %d|%d login %d lid %d scan %d\n", __func__, fcport->port_name, fcport->disc_state, fcport->fw_login_state, fcport->login_pause, fcport->flags, fcport->conflict, fcport->last_rscn_gen, fcport->rscn_gen, - fcport->login_gen, fcport->login_retry, - fcport->loop_id, fcport->scan_state); + fcport->login_gen, fcport->loop_id, fcport->scan_state); if (fcport->scan_state != QLA_FCPORT_FOUND) return 0; @@ -1407,10 +1407,6 @@ int qla24xx_fcport_handle_login(struct scsi_qla_host *vha, fc_port_t *fcport) break; case DSC_LOGIN_FAILED: - fcport->login_retry--; - ql_dbg(ql_dbg_disc, vha, 0x20d0, - "%s %d %8phC post gidpn\n", - __func__, __LINE__, fcport->port_name); if (N2N_TOPO(vha->hw)) qla_chk_n2n_b4_login(vha, fcport); else @@ -1419,10 +1415,6 @@ int qla24xx_fcport_handle_login(struct scsi_qla_host *vha, fc_port_t *fcport) case DSC_LOGIN_COMPLETE: /* recheck login state */ - ql_dbg(ql_dbg_disc, vha, 0x20d1, - "%s %d %8phC post adisc\n", - __func__, __LINE__, fcport->port_name); - fcport->login_retry--; data[0] = data[1] = 0; qla2x00_post_async_adisc_work(vha, fcport, data); break; From patchwork Fri Aug 31 18:24:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Madhani, Himanshu" X-Patchwork-Id: 10584339 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 3BF645A4 for ; Fri, 31 Aug 2018 18:24:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2AB752C535 for ; Fri, 31 Aug 2018 18:24:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1F0F42C5B3; Fri, 31 Aug 2018 18:24:55 +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 B06082C535 for ; Fri, 31 Aug 2018 18:24:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727552AbeHaWdf (ORCPT ); Fri, 31 Aug 2018 18:33:35 -0400 Received: from mail-by2nam03on0053.outbound.protection.outlook.com ([104.47.42.53]:32544 "EHLO NAM03-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727545AbeHaWde (ORCPT ); Fri, 31 Aug 2018 18:33: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=O2Q3/HnzJYf2pPRHctIyVwYOzjvv8byW3+V7kuK6YG4=; b=l6Qt/3GRj7kT4woQT2MIFMZF5i2NkQnKCZM/AeWc8TuzVVBPEPPQiEEAts9cR+RRQVXb/+k695HHkmraigDLbFpWXJhalrvOYs+49+33G1AKVkQot6RWdKWTz1l0aSRB8MLdZd1IKAGpxIcT2yBlymhWuPOf+15dmuYexmfpGl0= Received: from DM5PR07CA0086.namprd07.prod.outlook.com (2603:10b6:4:ae::15) by SN6PR07MB4398.namprd07.prod.outlook.com (2603:10b6:805:58::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1101.17; Fri, 31 Aug 2018 18:24:50 +0000 Received: from DM3NAM05FT030.eop-nam05.prod.protection.outlook.com (2a01:111:f400:7e51::209) by DM5PR07CA0086.outlook.office365.com (2603:10b6:4:ae::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1101.14 via Frontend Transport; Fri, 31 Aug 2018 18:24:50 +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 DM3NAM05FT030.mail.protection.outlook.com (10.152.98.142) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P256) id 15.20.1122.2 via Frontend Transport; Fri, 31 Aug 2018 18:24:50 +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, 31 Aug 2018 11:24:41 -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 w7VIOeP9024249; Fri, 31 Aug 2018 11:24:40 -0700 Received: (from root@localhost) by dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id w7VIOehU024248; Fri, 31 Aug 2018 11:24:40 -0700 From: Himanshu Madhani To: , CC: , Subject: [PATCH v2 08/14] qla2xxx: Turn off IOCB timeout timer on IOCB completion Date: Fri, 31 Aug 2018 11:24:33 -0700 Message-ID: <20180831182439.24182-9-himanshu.madhani@cavium.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20180831182439.24182-1-himanshu.madhani@cavium.com> References: <20180831182439.24182-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)(346002)(376002)(396003)(39860400002)(2980300002)(438002)(199004)(189003)(106466001)(6666003)(80596001)(47776003)(69596002)(4326008)(8676002)(2616005)(126002)(336012)(486006)(186003)(11346002)(476003)(48376002)(14444005)(446003)(356003)(50466002)(44832011)(26005)(8936002)(50226002)(81166006)(81156014)(305945005)(86362001)(575784001)(106002)(5660300001)(2906002)(316002)(110136005)(72206003)(16586007)(478600001)(1076002)(76176011)(87636003)(54906003)(42186006)(36756003)(51416003);DIR:OUT;SFP:1101;SCL:1;SRVR:SN6PR07MB4398;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;DM3NAM05FT030;1:3DxOQGY6tq0rPWS0oVGdzNWjtwRlrhjb3RhdW8NOKkVG/oSc5+7q9FQbOlTcUYSRn4Ay7id4JHwfqRC1UfTZLSNaPE5JtXkqhtB7k98/lR83l1kY6uh+GCxjc3R/Bnw3 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a796ce70-de77-4f71-a291-08d60f6f0a45 X-Microsoft-Antispam: BCL:0;PCL:0;RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(4608076)(2017052603328)(7153060);SRVR:SN6PR07MB4398; X-Microsoft-Exchange-Diagnostics: 1;SN6PR07MB4398;3://sllKphQZIGpUVCqoJ17rYUU6lq4idFtM3VJinpVw+N/xLyZhfz5yudqkyxLb6ZqKvkSlWqRHBtq5ky2+IQ2JljPqkp5UenTKbu3YojbWJ/n5cpF4SvmFbBYT0ldMfys+KH/Pq9hiSz2qt9k1ldJqdDemLsrcBdBLEX6njB+pggIbYCumHT8xSXqNLGQzoRSObPo77f6jtymqmXa+iqsvXAJ2ccsZfIFKJyNGpZUL/8OYMtMwVDSSKVDRYDEYMOuSvEfeCsNAN2MMkD0LSXvkQJj8nWQB9hoKbWp/BXI8h9vcLlqnkw8QPx1G1Qc5zN6ZbjGegBqiOQ1bIUQyRMllaR6TpDhsc1VZyhYr05N+U=;25:CdmtW2flm5W8rhTCwSeAtBZrNAXGleoTA9BSU4X6QsrJ+9n1TmZ/7/OWKEqtIpn6jPfCateVsJV9aTehCHmwAvM2X5ceee6ptFLEZS3Hh6AXyUXiSb0ERm0PMwtqhH7mkQRaSMpa85Xs4S7MFLwAfubWhjMnmPeA9dI+BPWqrhob0OTGZ1rndopWzIiT7PJBMvywahiv0KKs8atUvABRTPzKsoNQv3HCZSYAf7f6YFcXRAs9rmVR0mhdUUG7UYwv4Ai/9F23WdoyP0h4nuR7vEiO1bjoFFL4EY8EOxNqWofpMSEFsyafqq6ynIyKfKWCYLyABvRyA0AtJGO7u/bbCg== X-MS-TrafficTypeDiagnostic: SN6PR07MB4398: X-Microsoft-Exchange-Diagnostics: 1;SN6PR07MB4398;31:y5WzegitP3jGAdCtXP/KlHLTsAMWX0tbR4vGpLFO76drunR0RnphYUWZGQkp4V6bRfQKUsKJ83jsPKmOTw5JEIWGuLy9GZl5WYSQLsN9vRPzo+PWTUq4WzYP5ixKoh+V/Ck3rxwuvd2ebjPEQMr4E3JhQseeCgtOdqgyrWJCIP+fQALn09UBHHnr7JEqvQoczjSCe//Lv2XH7+DzYAjsSF0B8y7ylgwuaMencenEc/U=;20:GX5e+BhRFyzkgTlCfBeluWi5ahnm107NZe/eCOPC3W+ut+tBlUIkd8N3XdhGVUH/zraOxsW6LffU1lnYlKhT0RPdYy6NqMNzPjIymhDIBQDqWP3UQFR0rXDYfSxCNG4c2bDXTsXt8OngR4IqVviM6XAAW+Ur/WmjCiqXR2ZWNq2EGFKBGkxNLdqEAP5M5nL5ed3Vofvgfd5KWmiujt1heLAl3vQZ6xdTjgIKbOudCiD6MVRYFAPy+tid77+HD4Yf+3lh28ptKbb7HsXZ4CdN4k1jhDLloVH9DeGbCP0byw/ceZesean2RG1Ko5vcJSvf0jYq74ASqGyC1uzFpWzlAT3e7PqGqA+gfOgBe/0MR7NERjEGlN6ALPA14z4Pwpmwk5eu96FsqQGF0F/vqJrCDisnHNdgv2+BpUuTCWHcawasF5r5YrpNU+HjoVssgJ4H2GSd0D0Qbm2C+5VJ09p8vBq/T/Ue35ecFA0fW4B6Danl7Zp6FadzvcoibP6gAS7g 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)(8121501046)(5005006)(10201501046)(93006095)(93004095)(3231311)(944501410)(52105095)(3002001)(149027)(150027)(6041310)(20161123562045)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(201708071742011)(7699016);SRVR:SN6PR07MB4398;BCL:0;PCL:0;RULEID:;SRVR:SN6PR07MB4398; X-Microsoft-Exchange-Diagnostics: 1;SN6PR07MB4398;4:Towljbg3T6ARe5Pb62UyKIEXMfUl7NTG38m/foJnsmYuwQA/Z2PkzR86gTC6//a41Cto5JqLadd+/2QIKrfvZiZoGxp6OdOnE9hASA0IvLfiJKkScFYUVAt0T+fAYx5+yFwVmCILT/cI31EK4nJp5jJrZ+mYyBrNQn/1/dDlylGrVv9AMh8OBkIvZ/iuA9WmFnaIhVDnEXUXQxq8zbdTP+lFqEpt6xShuQVmqP5AtLK5likHXw7jDBQBbA1lPnevw63dJ0uA9uY1YPAJBnGvbpnEMMxHSZNo7PLGuCT/YaS95rwXAuGnUU+RZECefiLX X-Forefront-PRVS: 07817FCC2D X-Microsoft-Exchange-Diagnostics: 1;SN6PR07MB4398;23:2/4h2zqaN0KfzPaW/RzFr1Xn6LYM2zMmibZFhNdygvVsj7y735oHSyR3ppIB/szkgmOFBTMR9xm4b1vNjBgPD4+FTkSXHB+utaoefvOzZFcnzCuo5cSHN/vbWLoKWQB8P1FNHBJGeZnhnOO+n//ifyuvWRB5Ti+wAM3X3eKbnfsGclBN0hZuyK0Ra8TNjzYefbcxelgf8oajIAq1yhTwUDloKgnUWPyNOl8pI827lV9UM3Prj7/TvyEAy6Q7aKQc+kn80qt8/HETNQVIHrT1c3fUubF8ZSCnM0kgfuostTEfRm4ggiUDfdBxTPkOZqDY02rU2MTiEUHERKaw2ndmn9qjvfMAMUPMyWciqKTuVqHaApdnbjzQt5SnJPt9s1Vi9W3AEAH1sIopXqsQCPnY0STrYYfIHxzd5d/eV02+JEBiMilrHGM2HnMlTM0cg5rLAYSDazSgZqh3+OrjCo0wEICAp+DXGKyR9bE6IIBOjZwdiOXDfx+Zw7qoKf2+aXxfZJR6PjT+BpC0Qv3pQ/3RhHN/5xQYMCa7KeKRyPiWfa/+yDCvE9oyT+v9YDxz1ASrFAxjV5QS/g/WgLpdCBqLqfrb2BwKPNz8nMiakHahUZapDaB1UR6d9qzW3lkPeE8b1l57rGbmLetwjhv6iL4kzTMaRHXewYchHP30Qs8f8c9UoLVAXYavR+FBTa2o6CvAZOV4flpkheIU/OAwNp8kSodrG/yKwDDGJwqjybEGXpeTXT4JUjKmGaVnOYwvQ1FsDVX0gngET7qN7Gx7pWyyWUS0FnmG2hmEgKfS5aKq52DjWHNujgfY4d2iax5XOBrH8yo7GkxvZfkGTlzBuovpTrDfg+oQ0BnhjBWvRN0xZ3M1K4IqmSjvKHvkh2e11Fqa53ujM1biZBKFAe4mbFYi/A1R2MC99Ooo8P9+z1sBAOi1xKblaIwEojEF+VxuZBTVWPnzpAnf2sOr2qpdGf7YtOJwzfvLqJLxjJcxAktMWSbUBeX9n7cQ3ZjPFceCH3g2Jz6JeCtxDFnye1MZrJ/sMZrRUuptrdqW4/UNxhD5GSeItJSqPL/eXB4I/MTAhzl6k45zkNAGt3NSWC+4PhmwojpgWACw/qkZGXLbDqq9hT2nKQlwYluIR7mP6Fpf95mQsK1JRj/ERVGi77XtHHRDFA== X-Microsoft-Antispam-Message-Info: z41pAH/pSgzeQL0BG8wZ2BJkfvX/jOv/6yTBhifr8+grmcVrouz5TlIpt2mhU8fKJ+pRWi+Kiw7YiiV9KMKja4fQyFsd+byO39eQ/W/25mrGD9D58HJUfdcY/gwCOPqj+6IYU+39iglXSvm4G9tXJRTYxsnFC/GmPT5BOvIwn9T8v4Mkjh90Yf2+U2jyVct3PwFlm1qlWEwMbdmJbeCwXPxvkE92p7e+h5KQj64IriIeqM0sDJXUAKV/KJ+3+jllXPZsN6pscpiU+l0+ZFaNZBphXJyS+MeOXLVMvy6uvAvTvsyWM6aRym/yBjp0p5AmxjWfMnckz/9jxfvlN5sQYYAytsGFctxRJaWmFdvcho8= X-Microsoft-Exchange-Diagnostics: 1;SN6PR07MB4398;6:pkoy2nF/+jP7JtNLZxzToDq/gO2+H1vFfTwUR6CkhuP+KOgLqUqgqG7gcmQZeJckHVmsxjwG2Yq4s7VDyeSIeLwpbve3v8GX2d7FODsgVNi83f2iVboEaiaAoajb2UrMQ5wJJwkjsa3eAnMWQGgUJacsk19AlfjT+H3VVLY/Jlxw4MUB8BqK0wkeuNzvWI0DCDBp7Zgx702KUDN6y69DYXxOJFLCz5AZojuWOUzPnMCq5x2BDirzfIvYRNOB8MiPKJK6k4qo5SnNahMjgE36P4Q2KdA29VRpbXOe/jYxjyN1DOMORQZJlxupSIcYpenbonKWr89GXWrHuACG0NZrnAhhU6hpgjS5JVfF//+W03ATdVC+5frFPnnfRNslKavXNrZe0l+rwhfgltViLxk7QltdicBTC77cEDjRb9nxoQGTeA2JIo0lTkbwLEDMK6F90saRQ2KiHuzjEQT2aCeo6g==;5:8gDBmDof75Zj0aCMIYOuxS1hfn5LbTwrnWeOeyrC4eGARxO8jFDTdATkMcloKONlwcswAt606IoQkPVyPZAzpVdCkii9oJ7FhRBBGi2k2uEwDKsf8LNAuFAV1uAu+XnWKa08MX18bjXYSSzv6CxC1YQWSTsYSJ8wWo5wjRCN1fo=;7:3Nn58oAbaFK2L/EVY0ARb9j/vEhX3iVw/ryXDyHDXkaERR0POKeq5ztpebQxt3JXPumatEPaWIX101DCCa29fyPf7YcjJ6evHjlO0PZJnpamPzjrwP61WaaBcx9cBu+kNpnu1dtsm6LfABlaOjJtCnS6/HwJ1L+rr89092Iiu6uLcl0cMkUsxxc4Gs38r6hm22feSmISnaWNHfzaYL6Ct3sliPkhKVQdb50qSXNcpAh5uZk0FWFRVV4XgRA1Newv SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Aug 2018 18:24:50.4657 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a796ce70-de77-4f71-a291-08d60f6f0a45 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: SN6PR07MB4398 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 Turn off IOCB timeout timer on IOCB completion instead of turning it off in a deferred task. This prevent false alarm if the deferred task is stalled out. Signed-off-by: Quinn Tran Signed-off-by: Himanshu Madhani --- drivers/scsi/qla2xxx/qla_gs.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/scsi/qla2xxx/qla_gs.c b/drivers/scsi/qla2xxx/qla_gs.c index 6e95ba0d3c8b..1cb27eb46731 100644 --- a/drivers/scsi/qla2xxx/qla_gs.c +++ b/drivers/scsi/qla2xxx/qla_gs.c @@ -4175,10 +4175,13 @@ static void qla2x00_async_gpnft_gnnft_sp_done(void *s, int res) return; } - if (cmd == GPN_FT_CMD) + if (cmd == GPN_FT_CMD) { + del_timer(&sp->u.iocb_cmd.timer); e = qla2x00_alloc_work(vha, QLA_EVT_GPNFT_DONE); - else + } else { e = qla2x00_alloc_work(vha, QLA_EVT_GNNFT_DONE); + } + if (!e) { /* please ignore kernel warning. Otherwise, we have mem leak. */ if (sp->u.iocb_cmd.u.ctarg.req) { @@ -4307,7 +4310,6 @@ void qla24xx_async_gpnft_done(scsi_qla_host_t *vha, srb_t *sp) { ql_dbg(ql_dbg_disc, vha, 0xffff, "%s enter\n", __func__); - del_timer(&sp->u.iocb_cmd.timer); qla24xx_async_gnnft(vha, sp, sp->gen2); } From patchwork Fri Aug 31 18:24:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Madhani, Himanshu" X-Patchwork-Id: 10584343 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 404A2112B for ; Fri, 31 Aug 2018 18:24:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2F1E72C535 for ; Fri, 31 Aug 2018 18:24:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 237A12C5B3; Fri, 31 Aug 2018 18:24:58 +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 A90D82C535 for ; Fri, 31 Aug 2018 18:24:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727589AbeHaWdi (ORCPT ); Fri, 31 Aug 2018 18:33:38 -0400 Received: from mail-eopbgr700053.outbound.protection.outlook.com ([40.107.70.53]:46796 "EHLO NAM04-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727557AbeHaWdh (ORCPT ); Fri, 31 Aug 2018 18:33:37 -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=LuJJb2PCV+imqraTASxzlvv7bmhE0B6g3Ct+gK2XVyg=; b=WaRL33RL5GUfe7ql8O4m8C/qBtTFKCANO82LQXZfAMSAkF+YCfmZKe/b7/7Bk8bMiwZ/t1RMcKHY7bdM7K0mElMmMgVkenmqFjgQk5H4S1tKLIjActVnGfW7Zl+Wg7YHsuEAmUFAGDTwx8VsOecO+dBaH2aI+GxxgcDScIFzmFQ= Received: from BYAPR07CA0005.namprd07.prod.outlook.com (2603:10b6:a02:bc::18) by BY2PR07MB1442.namprd07.prod.outlook.com (2a01:111:e400:515f::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1080.17; Fri, 31 Aug 2018 18:24:53 +0000 Received: from DM3NAM05FT013.eop-nam05.prod.protection.outlook.com (2a01:111:f400:7e51::204) by BYAPR07CA0005.outlook.office365.com (2603:10b6:a02:bc::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1101.15 via Frontend Transport; Fri, 31 Aug 2018 18:24:53 +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 DM3NAM05FT013.mail.protection.outlook.com (10.152.98.122) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.20.1122.2 via Frontend Transport; Fri, 31 Aug 2018 18:24:52 +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, 31 Aug 2018 11:24:41 -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 w7VIOfLa024253; Fri, 31 Aug 2018 11:24:41 -0700 Received: (from root@localhost) by dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id w7VIOeA2024252; Fri, 31 Aug 2018 11:24:40 -0700 From: Himanshu Madhani To: , CC: , Subject: [PATCH v2 09/14] qla2xxx: Force fw cleanup on ADISC error Date: Fri, 31 Aug 2018 11:24:34 -0700 Message-ID: <20180831182439.24182-10-himanshu.madhani@cavium.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20180831182439.24182-1-himanshu.madhani@cavium.com> References: <20180831182439.24182-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)(189003)(199004)(5660300001)(6666003)(4326008)(106002)(47776003)(69596002)(336012)(80596001)(11346002)(486006)(1076002)(2616005)(126002)(476003)(2906002)(446003)(48376002)(356003)(106466001)(50466002)(76176011)(305945005)(51416003)(8676002)(81166006)(81156014)(36756003)(186003)(86362001)(44832011)(16586007)(54906003)(110136005)(316002)(14444005)(50226002)(42186006)(72206003)(8936002)(478600001)(87636003)(26005);DIR:OUT;SFP:1101;SCL:1;SRVR:BY2PR07MB1442;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;DM3NAM05FT013;1:bt5L3wuygNeOn9QAwb4+irFI9YO7oheHqP3r+Z8eaGEda+HaDATWWf+39vg+/8GaWwwc3GQZHBjNds4aFxV2kmN/Sahs2v7vUXCQ78NwRbYfBI0iD4GqL6qw5VQSrS1c X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a8bb1410-4466-4984-b31d-08d60f6f0b95 X-Microsoft-Antispam: BCL:0;PCL:0;RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(4608076)(2017052603328)(7153060);SRVR:BY2PR07MB1442; X-Microsoft-Exchange-Diagnostics: 1;BY2PR07MB1442;3:rEICRTjRBFH8sGqeKXGTBrVZg2KNtRZGj/O25+TZMW4vPie4NwS5oRlcFU9EcbtY/2Lmt3SAPreZUF27i99s/CmryIImOv3dx/kArKzpp7h7mjJUD73F5mqP66p49EC2p7DvqHIWBdwHZ3ARqh047HyOKxNQ+oZlBpciW9sjX/kBko9X9IP8I9awNKJ5u9bsp7lAOSyQp3Fgs8BBga31mOxLKgTNWDqMItAtnE4wKFvkM+pxVz0GJZmW26eG7HYBuB+5eV6LsIv6DxVi6FrXVZAqUkk12l1XNN9FtHZiw1Im2MW4CO/eZqbrGn++CLNyWzKtEc5hA2fe0YdeTUA2hsnttpaLc8Pqumi1y7tP0W0=;25:9iwGTCj7tR7KJ65tnQHmb2MP9h+n7FRxozofv/KyIjO/gUJHDKuD4ipyO/BaQIYtaGyrQNf2W1hf9+XkQ43RKvlj96zHR6ArOCdppIEjdSSCbenJmwAs2P9OFIMIkEBm0wcppdU5BiB2fSU7nJ8BEoWAxWbYCf8nMYejYzYp7oR+kWL7KJuvnWXH0Hrx4FT0/eZu1Mn1XI4OTEKyZM8LBm4re1JXkfMw4j5TvJikNEpaTJZexITDMqQ+uDe15uQj3ZXcnLR1arTZiN/+NwhZXv+DJMBbGDxUXoxcBuhj6Gs9hox/qhTk5qV5+7Q7+XnR5WifmPtM6pfMkLEYF6UZbQ== X-MS-TrafficTypeDiagnostic: BY2PR07MB1442: X-Microsoft-Exchange-Diagnostics: 1;BY2PR07MB1442;31:lTZJoBo1vmMrhXfLxuADSlY6x3yrmQflxab5gaHBIvCtH5eyhnHinAazwOPPJOYYfnMADpklf3clVmT8h1cfHEtQbX6aKslxteqlzcKBIxoo7nNHKkvEtGSS85dO4915iqEdSLnSaIMYRRmow0dbW5DouL1ohCX1DyLfNOZBPcGXB9S1EyCG4CpPnSaZEn0m5tE/2wt3yA4wjaGWgSwt78+xraZd2rsbD2ozeHRd5l0=;20:hmkUVcltKpplIgTdI6eZM+vULCT7mumEzhMZVIwfeIF62T5WzMqHzaMECaTQZ+9uBwZtYRvw2rZDj50ZgfXopkNvyOXbIO2v4NpGkX08vjQtOtAF9YA0rXfL8nOIZkD9hNkPkm+ghX+ZFxCvmt+i+eNYksERt0zBIl5R8RdOZXXayT8k1CC+lFn9N7Pe6vK+bApUolfzv/7w+Zcsa3CFyfh62IXrNqiaLteBaJxfKhjVCd3xkDCQTyFNLztRwGRmz+AYa9dSocJMFe6y3w0iPGKhT9DLxnAUX/wZrxWA1/uBWolvx/K5jKXWdM4pj6/AgNzAkJ35vGykBCslfx45E03nFpMF0qtyhVRxKBVYA1cgrBrJkDQnaTtTZpO5+7xzy9xpaWHBVeBpvehEp9RBnrORKtSK6g8k+xiwZ9UBaj9ETglTi5L2LAAEeF39GR4NEKIIuKSqXACPaw3WkKOXYspb/d3hLPrXhlRp1recY9IlHD1vH/bnXDg8Q+39NqCy 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)(93006095)(93004095)(3231311)(944501410)(52105095)(3002001)(10201501046)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123564045)(20161123558120)(20161123560045)(201708071742011)(7699016);SRVR:BY2PR07MB1442;BCL:0;PCL:0;RULEID:;SRVR:BY2PR07MB1442; X-Microsoft-Exchange-Diagnostics: 1;BY2PR07MB1442;4:ZJL1j/zrMjSicq4hjKl3+i80/EdnxFSucYBEj/harYof+rMMbdyiqYGE1HLyleZp/zG0yrGUJmuZP4dfpMSH8amT8sWJzebmqhi5r4Z9WGphsFGLQklDlz4yuxtwLCRO5ylDPqQCzABjFlAsTZdi9BYfoZReYTBmyM2QHKRAzuBPtd4uLthHbmXnf8EfoK6GfeiUyLyH4OWXHjV3RujyAKSDokRrjlQPjcurBLax0vh2eN/xPh2VBWQQQvpaSUX1NAg8M+EWI9WUHw3iOmeCOg== X-Forefront-PRVS: 07817FCC2D X-Microsoft-Exchange-Diagnostics: 1;BY2PR07MB1442;23:z4ayFvBcKPS1jRXzq0euT3GWxaZvNgJLUkCGl+cIo53K+j9FGpnze07x6YsY+fYNxec3bCUk85nMrkuQw75RssW30F9Gv3hogru3bQit0RxHktn9yVFRWZc40XxDSp8U+8A9nA6QcFgsfbtNhZCkSwIAQ0Eh4ZTHDk+db/eeguEXyTXs3j50BezwrbdbMEhbJoThCgYSprlNyu2mh8b6eNAcCZ3YMKV0aIoJ2TUDfZcWWI7xCl519Es6MoUumWDGpdKIilcyCeVEnd4968aQB+X1fEdtzqZOjebGyWKS4XYq+z7m+KUwbuA8Sni0C0kTrTO6L40V4OSykJmc67K9nu4ijaznyIU2JxziKgXO3dToYRg4YWArL9WqA+fkqsmZDF2Yir34PQ6VrSajX9LFMgbFhzVKLe09ra8PG4/FzTCf1rNEc9EYcdxfcsbAJc/InqADYpYdHU80J7wALMGgsqtRZj6S4XXda6I1dSkw5bj8uW2zIsd47PfZO4/Uag/lVFie8z3N54DOKtOeSeUISb0o/tf/vjhOWtQ0bS78XW6j9NgLfAUhtI2DcbeeWdS15T/kx1aKHNMtP5/W9SYxkjEhf0hkBfomEjUiPyAcLWezWm/mlz0ChP3V0b8lnUHnBb3YZzMA2DYOQAiolGWZ0ULjrjqpIKLOJWcDcmCKTa43rKrfYFAyr9R2m0I0vBTqHWVVT4Ujo433dP0WffHobFjFJhvG0njPm0ebQtDP5J7o0lYqp5an8IaZu6RNNhfPAbDH6fc53EVFFh/FpD/G2BmhZ1x5rCgBT+pLz5EvbuGIbfmC0S2DQiDj7wbWDGJXzVIGmAIADFzwVyYIdgcRUUXJHGAKkvL1tk7PD2pmlopiXd6hL4KesdMh/uyNsy3Dk7rmC8qZMWr+XMtLgwY3lIPxXVaa3S3zrUC5mJLLP8k0H0hIGFFdrZlAf3VJKzuOmwJQ+gzBOKj6TSHQ35O2MoTBaApUDIf2AIfMClEVCeh9j9KbL2GGVnqo1QKhUgJm1UVmk8P+KyZFBihbe4az63HASSBl8hDojNo/LMsV8egKcF07RCZKCFXuwi1zkcRhH6WSuZEgnK2fxcIjMWc0nA623VSCj34HsbGjnumGI2SqJ1BssHHrW/VpsKfILO54 X-Microsoft-Antispam-Message-Info: YY9CzCJe+QtUVp5jIBuuQDxfNyqMuTUJrbNHM22PD1FL3P3VZKIg7MRleNkDnq6mE46gNuQjdet45N3n2x6sDnlvCK7DZJWAdhUvUaX6k6nZLpghf0IjnluSDIWl6oG6w/GkOKcXxVW55HsYiaB2hpY4Zuk9uAH7TqJyjdh7DjPwQNca2sfCYwXVibK881NpLdP7TjzWPKpPJ3TWFfIJDSSW85DiyxOOwAqx3PRz6PjgBaCoKQKkBy64aivoQURb55k11UHpZz7JDwC8PwfNZbpcPvDn+kLIHcy/qdOUhGXEtzM17GlLnMsLj5a+Gqk5R6LMdtS+33uUcZfj6QcUR/3S6eHeJdKDg2fyfrWIILo= X-Microsoft-Exchange-Diagnostics: 1;BY2PR07MB1442;6:sFNzWiFroQI4KkqeLgn/3Va42oi+e94gxy/D6oFXbxFUQtP7+5xQiCw0cJW+5Sqab5FU2pV78M6wAyY4rwL9hNh9flCSef9GTjgxo64gMckcsTOBQ+CkBlgbkADA7aYcOHtWAYEuU+HUU1Q8wcaS4/tVH/wyvbYr60Fzrngpp6fAH7/bmMfu6k6/018wy2rOlmSca3JVUynJtRaCDCoszUUJTAe6dGQrXHPsvE+h6peuhoQmWN09kEVi3NucIPN4HeLSu4vCRzzH3gmvBnfYqkWANI65olPkuOdFyL2q65W4houf5yOZN0CNyMtyPdu9crXMgVIr04ZQElxffqnHkFzJr/cHQixIna1hcdPJG3BFCxTK3Lnk/tdyh2R9ZGEqZwSgusvE2VZDrc7i6/fkJELIUu83xW6UOV7KQdNf3Pgzk7FXg4ledygzlE/oow0g+lIOTq2wwt/YdHC89cuXsg==;5:8/U+jDQwslGHo5LxUfsbSQ3UpJ3HbbzUNQzicAE/RcYcUjH6/WTJC1LQhej4TBY1mSWzhikPCVoLzaRQ9lBJVydf4UqFHpZ1ukrjNyf8/mh9raQoQKXAxgoe3uCAKErIxbOIlom0qFw4VgdYfplaBiLFUngbe/TALGpatKpM0U8=;7:O6WUWZZEfWldVguH2BXdBMORs1/GbILN0bdh5ePg1vtGIiuA9LlIg7dAOzMKXR1y96tppXfcFJptQ5hoCs0eIeBZPESEs5BIWWA5mujgsYyTswcJIY9iPJc0Z/xC3eZQC/YNBd5+FXSWqyYejzgtFsFdJnaXVV44p5B5+Z3WwSkZHLbBDv1JYexN1yJZsvFERxAUEgHae+X18ZV9QiFEU3xif3OixeEJZH2f39rri4DunOWnRjjuquznyMK3ZOMR SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Aug 2018 18:24:52.6681 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a8bb1410-4466-4984-b31d-08d60f6f0b95 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: BY2PR07MB1442 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 Turn ON logout_on_delete flag to make sure firmware resource for fcport is cleaned up on ADISC error. Signed-off-by: Quinn Tran Signed-off-by: Himanshu Madhani --- drivers/scsi/qla2xxx/qla_init.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c index 0f069eb06d8b..f8f55184f542 100644 --- a/drivers/scsi/qla2xxx/qla_init.c +++ b/drivers/scsi/qla2xxx/qla_init.c @@ -396,6 +396,9 @@ void qla24xx_handle_adisc_event(scsi_qla_host_t *vha, struct event_arg *ea) ql_dbg(ql_dbg_disc, vha, 0x2066, "%s %8phC: adisc fail: post delete\n", __func__, ea->fcport->port_name); + /* deleted = 0 & logout_on_delete = force fw cleanup */ + fcport->deleted = 0; + fcport->logout_on_delete = 1; qlt_schedule_sess_for_deletion(ea->fcport); return; } From patchwork Fri Aug 31 18:24:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Madhani, Himanshu" X-Patchwork-Id: 10584347 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 70CC05A4 for ; Fri, 31 Aug 2018 18:24:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5E0562C535 for ; Fri, 31 Aug 2018 18:24:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 521E82C5B3; Fri, 31 Aug 2018 18:24:59 +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 AA1482C5B2 for ; Fri, 31 Aug 2018 18:24:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727593AbeHaWdj (ORCPT ); Fri, 31 Aug 2018 18:33:39 -0400 Received: from mail-sn1nam01on0075.outbound.protection.outlook.com ([104.47.32.75]:48576 "EHLO NAM01-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727533AbeHaWdj (ORCPT ); Fri, 31 Aug 2018 18:33:39 -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=CWG8HQFSOfyy4a2I4Y3pWjla0sIctTODaukZHxMh0IQ=; b=SVzf7zQAzgX66Hb5dbur85ugk6aZXwH5pIm7F8iTWsDW++lhcZmlOMtU/M4H9k7FTlep5sa20jjGLzDcK9V6goNUW4DbgKK1wEfggEBMRvh5DAM8EdM4QVBJyylcDe7H4uqA523hm6p5nAr1I2aR4bDXhbO9zUKAU7m+rTtfMO4= Received: from BYAPR07CA0005.namprd07.prod.outlook.com (2603:10b6:a02:bc::18) by DM6PR07MB4667.namprd07.prod.outlook.com (2603:10b6:5:a0::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1080.17; Fri, 31 Aug 2018 18:24:54 +0000 Received: from DM3NAM05FT013.eop-nam05.prod.protection.outlook.com (2a01:111:f400:7e51::204) by BYAPR07CA0005.outlook.office365.com (2603:10b6:a02:bc::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1101.15 via Frontend Transport; Fri, 31 Aug 2018 18:24:54 +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 DM3NAM05FT013.mail.protection.outlook.com (10.152.98.122) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.20.1122.2 via Frontend Transport; Fri, 31 Aug 2018 18:24:53 +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, 31 Aug 2018 11:24:41 -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 w7VIOfTK024257; Fri, 31 Aug 2018 11:24:41 -0700 Received: (from root@localhost) by dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id w7VIOfH0024256; Fri, 31 Aug 2018 11:24:41 -0700 From: Himanshu Madhani To: , CC: , Subject: [PATCH v2 10/14] qla2xxx: Remove all rports if fabric scan retry fails Date: Fri, 31 Aug 2018 11:24:35 -0700 Message-ID: <20180831182439.24182-11-himanshu.madhani@cavium.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20180831182439.24182-1-himanshu.madhani@cavium.com> References: <20180831182439.24182-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)(39850400004)(346002)(136003)(376002)(2980300002)(438002)(189003)(199004)(87636003)(2906002)(50466002)(8676002)(6666003)(305945005)(478600001)(1076002)(54906003)(51416003)(76176011)(356003)(14444005)(72206003)(316002)(42186006)(48376002)(86362001)(110136005)(16586007)(47776003)(106002)(11346002)(2616005)(126002)(476003)(5660300001)(4326008)(36756003)(44832011)(486006)(186003)(336012)(446003)(26005)(50226002)(69596002)(8936002)(80596001)(106466001)(81156014)(81166006);DIR:OUT;SFP:1101;SCL:1;SRVR:DM6PR07MB4667;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;DM3NAM05FT013;1:CM69GjvSorBkZ7SrxOeQf8Eh7oSI6njkvWYTEtG7muRxErsgWXXStHZ9H4f8TKo7Y2F/xWnF9a+EtJP5LJfaUbNkn+wVr5sIvKPLACnNwq6Q+io69owArSfT86cCCK1b X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b6cf28ff-de35-44cd-5ec6-08d60f6f0c22 X-Microsoft-Antispam: BCL:0;PCL:0;RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(4608076)(2017052603328)(7153060);SRVR:DM6PR07MB4667; X-Microsoft-Exchange-Diagnostics: 1;DM6PR07MB4667;3:NoXJ64DwtvxQhjFHpBZJR35/Qf82oW3kX1qFGeXp+JO+Xdb9T8AWbdDDBzN14cma42Bg2ZmCYtEH9j826d9GbSroBwuP5IIhYwc2mb+2eFo/HVln4mQfGV8y+2CPcIN6tVNvMdtriJoD+Bi92ng5dcJa+ThWCi2zDLd1AnZJQx4SqYtPUy1LzgG50BVLu+RRdnhcBzelNDJbuW6ZHGtk1aVDqQ6r5rcy/jd/J1wbHh/ClBzHVw2L4pTcq7WflDzuIjz+r6AmBwai5hYMzbglqV7HacVpRJrjonw/gIdYfhLJH+CjdGq6VwlmKaW3bAsyiuEDCb71pmGJQjD4Syst+7v9IeDgh8Puw324vE+ADsU=;25:21aATuHljZcNZxARUMWMeLRQI+8JkHINo37sZaFm+sXhq83IEdNrgqrZcRvjyVPPiHZOPCZvobRVzTxfUD2n8HNIhmLS51X31I5rNVxznSBQofcLcOUEpdAJ41dh5ONdEwkw/GjDGW2Yqne3xDkngK0PkRWw79Oj0BC96JJ+5YVd4CNddOZ6AKA7CbYiXFE8ig+qJ9B3T5Aox0FE9vL846KYa/YadUzukZMgO9I17p2QkmYA43xsxLhU2vb6JxnflQOm++LFLNMb/md+YJ9GvVZFcHYkHPragaTUen/oN7TPbmQkjmiw7pod6j7GF6gwEB3SJD/NIg75KsyIMWoRxw== X-MS-TrafficTypeDiagnostic: DM6PR07MB4667: X-Microsoft-Exchange-Diagnostics: 1;DM6PR07MB4667;31:7o0FAq5UajglUdbRmYuSTBJkgCbcQg35hZg5iHQKmxPJHwjskeb97BmJREC83VczKNrNpjIq77bunF7wYdca0Cji5EfW5jI7Va+2WEgIvtTCh8HtwjxUEAUUeegnNQKuypLCs07ZQWPneKv4rAgqFPnoKnI61d0xJZb2JzFh3R/4AtwV+Qm9sHOYQyjS4mygieDlgXVx5gTMVtdXT8JRAtM1+ntyn4FvjG4lZm3s0LY=;20:dYu2Hrw0svgsP33NwnS3uoZv1B4hhD/FjPHoJdTw6FXNrKPEUhiUK5mSv1iBbgSBY5q1Kc9CalalTDURp8jzZ34+7AzFsLEVyfQBILqQkMLRob4Yi41BMpmQiz2lu8QIHy37PErgkW/mYGJAyqy8PsUj7vpEkH8QN9kUaNKK8pIhbAtzJIBSExMiWnSCxUZqXAaH7xtrXZ1ZcAMXWRqdVXTMSz/X7Qp5UYv97915s2P2m9W3ZbbyBwi+8MRQEk0Py5iKWA8CgU467o6lF1cj5crD5v5OmXkTATk8V1H8rsA/t7lLKQ+VUnRuYc+ZsF7jGZ0hhV0ocExkmkWjifevXscvjMLTNv+kW0SBjley+39GInZ9Iafpmw/Chjum2r8bPiFp9LEWHWbuObNUi0CTMdUpnQ7RDOxMlCfhR7psDhLtSlFi83E4747cArsQdGn8GORE4Yp2i80sXQCOHCAsKKgQvWknfQUKZDG6uF0LXlNvD2ikungHl9vooNIQMmym 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)(93006095)(93004095)(3002001)(10201501046)(3231311)(944501410)(52105095)(149027)(150027)(6041310)(20161123558120)(20161123562045)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(201708071742011)(7699016);SRVR:DM6PR07MB4667;BCL:0;PCL:0;RULEID:;SRVR:DM6PR07MB4667; X-Microsoft-Exchange-Diagnostics: 1;DM6PR07MB4667;4:663Nbyz7E4c6lbe3Qt2WS+pRxoZHzI1Tae5zAa2RZpoztge51IXKEH7QFareO7rULwCmO5fi2s2fU4bvLskC1f4FE/7JcGn3aA+1q8cZbpCExyKv67vPHkYNTwzCQowaA3KAgVXbR4TiV/m7qpCSDd3c9PQ3vExxMRHlZGWwoaS850pRzoEBJl26+GhiOuJ5Un2xdqaOF7Zd2Di/n2vW8jkYFwIKVzIV4Qc4MOz40MVikXJgG+/SFPF3Si3LYpBNbdZpbWQ7qHgJKvteeiXW3nheNZDcT65O/5vj/V+dXeBYt2wnkITlOxTqB8tOC/Q3 X-Forefront-PRVS: 07817FCC2D X-Microsoft-Exchange-Diagnostics: 1;DM6PR07MB4667;23:CG9pRaz+KiccnNlR6SCYii2lEaBVbBBfVOwa5VTsOjoezCs+f1k1pChb6IwGK3nI1AqHVGNej2YlmBr2sM4nybA4xdWH9TYwG6KM78C5ewGFSXUcrFndRMZgoNjZzGifuosFIyLVCgfBy362Crfy+VnodPO1TvlW14/XzlvQCAYavr/U5/froeSeYgxP7Al+MELSYhpyseuaFTkIWnkna7QtbZk7SpsACgR/OeSa/H2tdLOOv7ZbCz2CYex8bmEpITTNqNLa8QGxbOFqNbMiabRUQiJSWIajZdvKJn0CGosMENPusG7lu2/V68rYTDLRZ4p/QBqMJXssqcZPNCGcMCeuyz1Nr3D2S8m7VQqDNUshsdNOBaBN/um5asA5lN4nNIbUVf3UjA5cglv2dj0DjC5HW4ZpXrJ/RI8KjH7ZBNhpCpUHyCwyLN+rDv3gIXAKS4pks/rP0MBHJDx+ev7ptAH7jN6nB49uX9BfoUjO6mUzqzKdEBCpD5aBvXeXxvtUc+hcTOZ2wrgTGFxU+LQJp4VpNCScT26bb7A3JwcgPOBCDmKZnZDJl6PUkpkMwnrQvv0WfXpf9/Or17H8rK0v9osePUp0WDTJxHLWRNcFXUIim51cr/fVULJ8GcSLeclF3FYrDMD7v7YOyEiH0g0Px0KLkt4qgHfE4kgOF07prwuhOImXs/l+on7Nr/NY5zED2Xt0vQdd+oOj/UDPko9tY+oym5VcKywpNudbTQI0ZXYAgWQlZ6314z+8XGDOUYES9IMjNZxMDrLLxq2MenYXZ8L7KYGJw4kYuucu415ITHRLsOYg8EkdPSunIQ1zyaAHvyHq5/gEuYfDrTzz+4ZbQfZBJmeVuC50FpFV11dzegY/5kP31gVEjWkq+K8YZUOfBcZhGBexF5A1wqGVdrivo1KsIYqWL86Vxsfbo7aYKx1eRcefCsTihtBAFGgmYDskbgzpiDmOd7qfclKbEsT4mIWis+sr0AKco+Z42tvN3nfTxw/u/WTJkDUxTZKkI+qTpDpiSDR0qRMmDBc4838WAsoK3/YJ48hE2AYCnxEbjy1dM98SS1RnRx/r31Q3iZIVspSdNVBXkklrpUkoUEINFzApLsl7wD/vIAwCA22JZVUF8zMPk7QBZm8777ca2aJb X-Microsoft-Antispam-Message-Info: ftldFjwIrJMlz77ywEy4x294GS37UFbEVcH2uB9UjQshdsmAi7fjZPQV7lAOWc9q17xy8gkiBZtPq1AXt3gsr61B9Sm3I/wkXuFq+LlnwWFSXSaXlVCyXLHvLGE7z5QjEulpVlXCa4YObtDyU6HLo0WvPFG9cuxuXdXcLuKrG7bhnxNKIQyPXe8sxnbHXCj1RGcdRFVr3s/0XGXIsreuGkGBDGRKhTs8iWK8zhymFC2JjlvEpkQ6wF5iM9JvE2v1tWHjEHUzbF0iyElyGOCVWCgXT5BbQXZNEYO58IJmySvzXhkfAGd+558ou9LOUHwizRrWox85M0Z2F0J6IynyGOMIT/FTa1QtfYEKOLTF/Kg= X-Microsoft-Exchange-Diagnostics: 1;DM6PR07MB4667;6:a7HYabYzNxuM+Orndu4NchgOQHP1t6hXW6mH33fo87Jv/T9SHLg+TR01DoTfkoopjJyjDSJhM1o+7AegAyNmtwpwJo5s4o/KDmN5WD4K36Ls+5juzcne5eMLrYqhFfPuhYMmfIsshtUQ12mfVjtKpiSS8kaA8vArWEgTVev0vROV/jhnfzUzKyJkntxf3YECKhsHBm29AacQZZZ4uphYBe0LsgrjwoDM+N4vPmgV+tHuDiWzZBKDvBhJ+R2YOS5Bj0HDc9h34PcuUsccpY81HXywsOwjEu5t/cClC1haPq9YRz5hVkg1e8TDkIp/6th2NjkYS+5m6cTV5h71+xF4uXC375KDuvKXdWTCHjLE4WZLog9ZDDKWtjYGTdNhtagzthXkweWB8/YTKJwOvGLXddirJGrT0uaPQaP1y1nPld0q9q7XDnAAdSzr3tK34afwmWBwEKqgxRWrgSvM6T0Pqw==;5:DgRQZ487cdjg4CeCQaRtfM/YLMsBsHXYNeVo9MFCAnvhgeQGRblC6eDDT4FPrxtNwt1SnkuNk4CD+8gegNmIgOduAh5ulJq6U/fWB58WCO2DJqmADVcMHLXq7KG8c1rrw5wTsN345wN+Xjshxz5i5JwLKOrxhAFNrNyIgiW3IuY=;7:1iJ1QhtuV+sYVYAeSPyi/HA9BsyU6OHHAwS0qlksMnXre9dXBqw8Jk+lirpk2oZ+uCks7Rgih7lyFrarL2mgcNNKKbydYgRsbMQxhaoyJVCYsSVh0DopC2ys02l+34T5ZBX5SU86TRgBSZ5uHKu1flXLuPCtaTOhRo5nKQtYuV5Hmmm4DWhcp90wrdUKU0+lIY4x6RpNl+nAlYP9O11zJd92F29QclYdFU/4OuJkD7koOi26B1J8bdGiDcQLU34o SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Aug 2018 18:24:53.5744 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b6cf28ff-de35-44cd-5ec6-08d60f6f0c22 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: DM6PR07MB4667 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 all fabric scan retries fail, remove all RPorts, DMA resources for the command otherwise we have stale Rports. Signed-off-by: Quinn Tran Signed-off-by: Himanshu Madhani --- drivers/scsi/qla2xxx/qla_gs.c | 128 +++++++++++++++++++++--------------------- 1 file changed, 64 insertions(+), 64 deletions(-) diff --git a/drivers/scsi/qla2xxx/qla_gs.c b/drivers/scsi/qla2xxx/qla_gs.c index 1cb27eb46731..85cbe59b4f58 100644 --- a/drivers/scsi/qla2xxx/qla_gs.c +++ b/drivers/scsi/qla2xxx/qla_gs.c @@ -3995,6 +3995,41 @@ void qla24xx_async_gnnft_done(scsi_qla_host_t *vha, srb_t *sp) } } +static int qla2x00_post_gnnft_gpnft_done_work(struct scsi_qla_host *vha, + srb_t *sp, int cmd) +{ + struct qla_work_evt *e; + + if (cmd != QLA_EVT_GPNFT_DONE && cmd != QLA_EVT_GNNFT_DONE) + return QLA_PARAMETER_ERROR; + + e = qla2x00_alloc_work(vha, cmd); + if (!e) + return QLA_FUNCTION_FAILED; + + e->u.iosb.sp = sp; + + return qla2x00_post_work(vha, e); +} + +static int qla2x00_post_nvme_gpnft_done_work(struct scsi_qla_host *vha, + srb_t *sp, int cmd) +{ + struct qla_work_evt *e; + + if (cmd != QLA_EVT_GPNFT) + return QLA_PARAMETER_ERROR; + + e = qla2x00_alloc_work(vha, cmd); + if (!e) + return QLA_FUNCTION_FAILED; + + e->u.gpnft.fc4_type = FC4_TYPE_NVME; + e->u.gpnft.sp = sp; + + return qla2x00_post_work(vha, e); +} + static void qla2x00_find_free_fcp_nvme_slot(struct scsi_qla_host *vha, struct srb *sp) { @@ -4095,22 +4130,36 @@ static void qla2x00_async_gpnft_gnnft_sp_done(void *s, int res) { struct srb *sp = s; struct scsi_qla_host *vha = sp->vha; - struct qla_work_evt *e; struct ct_sns_req *ct_req = (struct ct_sns_req *)sp->u.iocb_cmd.u.ctarg.req; u16 cmd = be16_to_cpu(ct_req->command); u8 fc4_type = sp->gen2; unsigned long flags; + int rc; /* gen2 field is holding the fc4type */ ql_dbg(ql_dbg_disc, vha, 0xffff, "Async done-%s res %x FC4Type %x\n", sp->name, res, sp->gen2); + sp->rc = res; if (res) { unsigned long flags; + const char *name = sp->name; + + /* + * We are in an Interrupt context, queue up this + * sp for GNNFT_DONE work. This will allow all + * the resource to get freed up. + */ + rc = qla2x00_post_gnnft_gpnft_done_work(vha, sp, + QLA_EVT_GNNFT_DONE); + if (rc) { + /* Cleanup here to prevent memory leak */ + qla24xx_sp_unmap(vha, sp); + sp->free(sp); + } - sp->free(sp); spin_lock_irqsave(&vha->work_lock, flags); vha->scan.scan_flags &= ~SF_SCANNING; vha->scan.scan_retry++; @@ -4121,9 +4170,9 @@ static void qla2x00_async_gpnft_gnnft_sp_done(void *s, int res) set_bit(LOOP_RESYNC_NEEDED, &vha->dpc_flags); qla2xxx_wake_dpc(vha); } else { - ql_dbg(ql_dbg_disc, sp->vha, 0xffff, - "Async done-%s rescan failed on all retries\n", - sp->name); + ql_dbg(ql_dbg_disc, vha, 0xffff, + "Async done-%s rescan failed on all retries.\n", + name); } return; } @@ -4138,80 +4187,31 @@ static void qla2x00_async_gpnft_gnnft_sp_done(void *s, int res) vha->scan.scan_flags &= ~SF_SCANNING; spin_unlock_irqrestore(&vha->work_lock, flags); - e = qla2x00_alloc_work(vha, QLA_EVT_GPNFT); - if (!e) { - /* - * please ignore kernel warning. Otherwise, - * we have mem leak. - */ - if (sp->u.iocb_cmd.u.ctarg.req) { - dma_free_coherent(&vha->hw->pdev->dev, - sp->u.iocb_cmd.u.ctarg.req_allocated_size, - sp->u.iocb_cmd.u.ctarg.req, - sp->u.iocb_cmd.u.ctarg.req_dma); - sp->u.iocb_cmd.u.ctarg.req = NULL; - } - if (sp->u.iocb_cmd.u.ctarg.rsp) { - dma_free_coherent(&vha->hw->pdev->dev, - sp->u.iocb_cmd.u.ctarg.rsp_allocated_size, - sp->u.iocb_cmd.u.ctarg.rsp, - sp->u.iocb_cmd.u.ctarg.rsp_dma); - sp->u.iocb_cmd.u.ctarg.rsp = NULL; - } - - ql_dbg(ql_dbg_disc, vha, 0xffff, - "Async done-%s unable to alloc work element\n", - sp->name); - sp->free(sp); + sp->rc = res; + rc = qla2x00_post_nvme_gpnft_done_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; } - e->u.gpnft.fc4_type = FC4_TYPE_NVME; - sp->rc = res; - e->u.gpnft.sp = sp; - - qla2x00_post_work(vha, e); - return; } if (cmd == GPN_FT_CMD) { del_timer(&sp->u.iocb_cmd.timer); - e = qla2x00_alloc_work(vha, QLA_EVT_GPNFT_DONE); + rc = qla2x00_post_gnnft_gpnft_done_work(vha, sp, + QLA_EVT_GPNFT_DONE); } else { - e = qla2x00_alloc_work(vha, QLA_EVT_GNNFT_DONE); + rc = qla2x00_post_gnnft_gpnft_done_work(vha, sp, + QLA_EVT_GNNFT_DONE); } - if (!e) { - /* please ignore kernel warning. Otherwise, we have mem leak. */ - if (sp->u.iocb_cmd.u.ctarg.req) { - dma_free_coherent(&vha->hw->pdev->dev, - sp->u.iocb_cmd.u.ctarg.req_allocated_size, - sp->u.iocb_cmd.u.ctarg.req, - sp->u.iocb_cmd.u.ctarg.req_dma); - sp->u.iocb_cmd.u.ctarg.req = NULL; - } - if (sp->u.iocb_cmd.u.ctarg.rsp) { - dma_free_coherent(&vha->hw->pdev->dev, - sp->u.iocb_cmd.u.ctarg.rsp_allocated_size, - sp->u.iocb_cmd.u.ctarg.rsp, - sp->u.iocb_cmd.u.ctarg.rsp_dma); - sp->u.iocb_cmd.u.ctarg.rsp = NULL; - } - - ql_dbg(ql_dbg_disc, vha, 0xffff, - "Async done-%s unable to alloc work element\n", - sp->name); - sp->free(sp); + if (rc) { + qla24xx_sp_unmap(vha, sp); set_bit(LOCAL_LOOP_UPDATE, &vha->dpc_flags); set_bit(LOOP_RESYNC_NEEDED, &vha->dpc_flags); return; } - - sp->rc = res; - e->u.iosb.sp = sp; - - qla2x00_post_work(vha, e); } /* From patchwork Fri Aug 31 18:24:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Madhani, Himanshu" X-Patchwork-Id: 10584353 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 4C8075A4 for ; Fri, 31 Aug 2018 18:25:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3ACA92C5B3 for ; Fri, 31 Aug 2018 18:25:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2EEB82C5B4; Fri, 31 Aug 2018 18:25:02 +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 B061A2C5B2 for ; Fri, 31 Aug 2018 18:25:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727597AbeHaWdl (ORCPT ); Fri, 31 Aug 2018 18:33:41 -0400 Received: from mail-bl2nam02on0058.outbound.protection.outlook.com ([104.47.38.58]:40512 "EHLO NAM02-BL2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727557AbeHaWdk (ORCPT ); Fri, 31 Aug 2018 18:33:40 -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=Bz8tKx1asbp/u40hzfPZyiwl9ImTUMDy/6nav7v5PsQ=; b=g90QtQkSpUQgxWDiaSP494ilMNuSFpkd67J6qPXoTFqzivhumC8fL2Ze3fEHZNNIpqLhc5F82LCxqgRM8OJBilpdMNY/X3o1e2CXxZUdhM/fh8bBGzGlcw3dBpXbE29Xdhcnjg7KZ2dNeVFW1XMFU3iUYx6hPtkN6MAYjzCaRrc= Received: from DM5PR07CA0113.namprd07.prod.outlook.com (52.132.138.42) by BYAPR07MB4389.namprd07.prod.outlook.com (52.135.224.20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1080.15; Fri, 31 Aug 2018 18:24:55 +0000 Received: from DM3NAM05FT030.eop-nam05.prod.protection.outlook.com (2a01:111:f400:7e51::203) by DM5PR07CA0113.outlook.office365.com (2603:10b6:4:ae::42) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1101.16 via Frontend Transport; Fri, 31 Aug 2018 18:24:55 +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 DM3NAM05FT030.mail.protection.outlook.com (10.152.98.142) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P256) id 15.20.1122.2 via Frontend Transport; Fri, 31 Aug 2018 18:24:55 +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, 31 Aug 2018 11:24:41 -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 w7VIOfMq024261; Fri, 31 Aug 2018 11:24:41 -0700 Received: (from root@localhost) by dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id w7VIOf6w024260; Fri, 31 Aug 2018 11:24:41 -0700 From: Himanshu Madhani To: , CC: , Subject: [PATCH v2 11/14] qla2xxx: Fix iIDMA error Date: Fri, 31 Aug 2018 11:24:36 -0700 Message-ID: <20180831182439.24182-12-himanshu.madhani@cavium.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20180831182439.24182-1-himanshu.madhani@cavium.com> References: <20180831182439.24182-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)(346002)(376002)(136003)(396003)(2980300002)(438002)(189003)(199004)(2906002)(305945005)(106466001)(5660300001)(42186006)(26005)(81156014)(81166006)(54906003)(16586007)(316002)(72206003)(356003)(186003)(110136005)(4326008)(47776003)(8676002)(8936002)(50226002)(1076002)(106002)(69596002)(11346002)(476003)(446003)(44832011)(2616005)(36756003)(80596001)(48376002)(50466002)(126002)(336012)(486006)(87636003)(76176011)(86362001)(51416003)(478600001)(6666003);DIR:OUT;SFP:1101;SCL:1;SRVR:BYAPR07MB4389;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;DM3NAM05FT030;1:ZGdPKeT5DjIbf03LI1aPfp/uMmNnqqYq58XBLNXEEIm8/cI7gBh0WffYTyvG1vAngk10+0KM6fe03wonakQgXcl2qgAH77iUrN3GL4tw6cMsOLpvdzmXgPzyXs5GpsUO X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7c8da201-d355-4317-09e6-08d60f6f0d43 X-Microsoft-Antispam: BCL:0;PCL:0;RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(4608076)(2017052603328)(7153060);SRVR:BYAPR07MB4389; X-Microsoft-Exchange-Diagnostics: 1;BYAPR07MB4389;3:6iUp+CKzXAkQBbUel6qhiFIYZtg8f9QvEMXI1pYN36v48/7kuuepI4lkG6aozuX7z2rPYiTYeCyx1eYpuZDy96NW+8s/l/UnlUP9WFeRvx3vEvMaiQVM2e8w1lA//EEvZ6mbN1YtCykx8bfHNZFNd0UhrdbftanbrkPAtD3BLu5fSgO70Ge+4jvxoa7QlMdSSKIMpfQfPplprnqyktbwhxvM8wb43csf4UukNM+9qufjIe6fjtqFueuS9ulYs4Asv6BtACuJeC3i78OWkdhJvL/zAhNpp2bucjqtB+hSEriNUo6KBignC59N/QPOf1rvo6ur0Keu7mFgARlB1QUxxbgBIM08WctxIejvl2pv0dQ=;25:pUjO8I7tft9kPCWysQb4cM9GeqeNUVVP6GnKWzcWEvaVBvDOK5vPMJ7YgaAO/5fOvOspPaEpZhScIXo4CxjKsF8fN9eEq4y5xIYM9znFyQdwZsC0MDw/pQTOTWdRvlxwfvlEGFr35TAFr3UHdfiABuJCHWg+qPJdMoWn+/ZVPR1flrVBgoL4ckfWG4t1LoqUd1MHKco6v1k4U6ZyWLdM15yrYZKSOCvx5yH3tbjAXgenby9p1ZkqVSj4FhmyCMYdKDTtQC8s4X4oszgyVbhurtlspU6zxUUhg8YB8DeVfNYi0QtNlolefyfGJ3HqBBuOWSPQu23v73Ny/lcsq68TXw== X-MS-TrafficTypeDiagnostic: BYAPR07MB4389: X-Microsoft-Exchange-Diagnostics: 1;BYAPR07MB4389;31:FLoAfTXMErOEiO08GkcjC6uUGOwdtxu3WPg9pkJ7TgD/87EcbYsMitdzcP12p8bGo3NpJTtPVETY0oPBoECwIOpHNX4n8LQm5jrAni13eaFINfxBk3Y+UQZ39VrcObqihSSr8nNxEfQ0G5ZFw/r4UR99YPoue67NctzbipuMDdF/iGQbmX22e9GGRPsi6x0PKxlJ9nHlhNso0+9tHGIVLQlh1VO6+3hlVZcZujZyx28=;20:SE7mZnRhStonSfPiITSI1UkMlnY/j5ktwHISO3bUz4hUwTZYP3TB+IVIC6WjvNp6QP9njYfXDjTBKPKazTsHRu/cl4rm3sey/3y3MzEYYPTIUzdxD5xJHo3DGmxBlG+P8GB1cexpHWzGaiGpgLmf7xNzxtGlU4UnXoqjngmNInHC5OlxKk4f3IUcNBZN2RBtnnSLjnnF1IznyAVcfxDr3YGDuxjL4HREpQ1eRZn4Jl3M/cZkGX0gjcD9RwgRL147AGhdOOfHyoekJz6rxh4ZYFb6kKCdtC43XBOyZ5v6AcnMCYnK21gAYjEhdVWCrGMAhowrxB3DeHShE0yy6LcIII7Brug6Rs6FeFePXUk8JqUDV+u22/Pkgj/JcmuxWQIq41hM+ju9lw8w42gNZ+5495OvErCkFFa3J3JArWmX9wgEucc+vad8DJzIN/1ivd4pV2lFtx7wDGvkfqaAxmQ+WW9/q0WOafq7d25leAAqn7HXU5RIIZmkP5X9YNIJb4Fx 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)(93006095)(93004095)(3231311)(944501410)(52105095)(3002001)(10201501046)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123564045)(20161123558120)(20161123560045)(201708071742011)(7699016);SRVR:BYAPR07MB4389;BCL:0;PCL:0;RULEID:;SRVR:BYAPR07MB4389; X-Microsoft-Exchange-Diagnostics: 1;BYAPR07MB4389;4:Lpfsp25TEDpMHgFvGoZn9LF3Kuk8ub44aQFv0ZJwjW5c7VLsCGBbO7kKzKeCSlph3PKIDQfOyvndARM9rCteIiPpCEc3fGzwL2tMrYDWfHoeZHRwUPfB1tkH0i9gu8peYL90WTrv6K2zPQh9l+XXjeyjSNxq54u7ELkDdVnNQf+XDi3JZm4gTFm5WdIWNjrbLvrqifuiNQWvlpRddLBlYThvEw+pS5v+p0gAJfb1FhWZ49pufV4taXOZJie9XYBSP3254Y1KOxhQ1yIXGjtYag== X-Forefront-PRVS: 07817FCC2D X-Microsoft-Exchange-Diagnostics: 1;BYAPR07MB4389;23:eHHhFWZ0W6ki0cClZ7Ik7CHYZfuRQ5ASxUBftYOfJqtLLh9ITDW27j/mQ6ggDPYERhOKDGOWwOYRkyIqEw+jex5rLRv3omFXjdgwUuD4w8FHvLk31bVC3vNYDlGxjQfaahVIBFJlVF7gU27cGUrHuheuBnTHcv4wI4ibp89MgW+M1AV/l+8mNqWRmfItIBMkeMfoo/J7g6xUMi323pQnkhXvsXuEOWRLOO35qxY5Po6h9IEo1e3x3T6cSaQ4njj7HFEzGAZGN0juccf1Ek72U+c9KyAfYNv27HSV/p+g/kJLRmV5BW7qIM1jvXJpOWERaKxaPD+CtwuC19s8EZhsylHaxdZ3JuzhW0A6QmJJ7hfZsSCUX7JAyXtJxBcqw+mslIyWH50b7YAHyE6pOvQAfdYiFduO0Pe3Yuiu/TTXVh4pGq0BUbEFQ2wCFe5Ibky32A8OjlerIOzHVwJ6aWGj71YCu+QD1rtSMy2yHKWBFc23gvz1jqEl0DjFnOkPPTt+BECUth3HoyH1smq0AVVCTh41smpsuh3ihAArsNuL97HfR4c7DfuIyWOzN5eaR8ak8uT3Qe6UoqSOF6se9DoMeKHdLEMsCyBL9OXToEaJBY0p3A/p3gyg56XJkiOhYqEROJeIt/UBEsX9E6FPnhegn9nfmiyV8uMlekD1RFJI7vMyK2VbJlC/WgxjtfuGX2asxN4H4XjedEgB8dbvUeQzMB19u2bG06fYnPo+HGLTfenFDJJB6GDIkoqtCDhf1WSwbSEdH5tisCUOl6S/RProLst2eZD5cvnGC1yb0CUn6PM98Db9c4Nb1eSdxj04oSrtcDHajEkjToP20w7OIT34QOYPC40+G3AoEbfBTp37Wdsg6GIzoM04yISbaWtXA8smsApdJwW8ZtBTbM84bQP9JYFbq/IVwm8Ay5KmkokIjiPiRBhf/xLQv6L9b8hApM3xiZYhuX7BGzUtQcpVAPIm0jhUW4o1/kBckApJfxDGbvhsN1ylBCg52JuDdCK/8q2Hw4vHDckoct1QlaqsmLYIAJCaAdkMUMtFIIQEZ67WcEyfvXa8OYM+iDJ/MurppjgSNWcPUm014hMUkNXlHDngGJeT8lJeAcli0CUCteuA3l4= X-Microsoft-Antispam-Message-Info: MF6yXjZYBjrawBEMDSFI20dYlvM8zt6riJKvT53Z2MVo7lOCh4jfjrMjeZyIY5dWBRX2QJZSA/mJ0q1WEUNaBzMyie8M1ZscgcN0q5jBsyri0duLbZVMCg/5rPVz5BWlMuLYEQ4UMY3Ixtity0/IScB3ZfhOJrh5NjFQhNjfzhhdEQWKAen2GnFxTj7xOu1OyEqBTLIySFHUhUXrdImqC+QtakXWjHyaMKeYUfoEtu7XOL9zbAw0z4+Z6txPJsIUNa7r44xb38Ph7cK8K73WIE/mZDsLlB3hlDQBWo0vkUVbEH4k9QEQPxx97I3fe9cHitfhlt0kKQ9o/u0uq3qSr5U8v8ajOdfrcu6eA30QTQQ= X-Microsoft-Exchange-Diagnostics: 1;BYAPR07MB4389;6:C1iTt7sRUKgYusP4WFe5mExOUXshgVqbWYnyHWoEmPl/ZltV8ecOr3yEtXvvbUc1By4089Wos0buJD4k5GUtcHnw15ZBEITxBioFBNJxH0qORvNw2ts96pIjQL74NVKTVd7pBYntLESHTMd1+0LLXJGJH4yKyfXE9IQMA8ubwYCfr7YMnIy41tLn0H+w2vVAT+dThZgcWIg2eGsEdMZzfWSyXXMDDKv7JrwK470Bv1rvRj5YMhfKl0t3IoIUpOuHFoW+tq2gNbFfeFYoFhWD1rs0DJPYDeuhprjqvC5zGQdmLgYT16z/WfnXyOPkazzDEJd8ZFvwC+0GlvnGRdsnnZTnfVdWI20R3TBs8sbzXC8wRahYRuvV9yu7rRKzB/R2XusQCV6T9aS6O/A27iAy09cEyupiN5CI+Yr7NExS9w1fj9E3QZtS6LMwcX6QJuZGO4Rwl3uQDgBABvdJ8HSCpw==;5:9E2gJ3uiPMBP+DB6kViF1TqM/iv8GI46XGeZlz7++OuAMOb9mcjTaWj+W15ldFvW2UlsQVEhV/zzE1jXvJBfGgsxY1GYkiEIF69YZ2iiyPGlJUr/PbdBySLbk6eb2H8G/D2WrDzIQOoscC9IJZY4ROzoi2iHgjNCG3tynn9EWto=;7:aQmI3pw0PhvE3nCTxg98+8Slee9p0RJH8oxuaE2IZJK2ItT2w9JWP99Tveu88pJ/5CK8iuUTsS6DJ4pRYKhNik8p86H31TiszBrCK7nOeJ4JyDmfQvF+QFd09LYSCvyetORDbc60FprmUM66BRN0Xd7RRktSwSDnKmutxVTYj3KCc4cHnU2WAVxvdQQPBqLfn4bSrjSpOEoO2udMKtuLQBnA4H59YRilfhKonzmfsZs0+H1cxzouTjSorddIH663 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Aug 2018 18:24:55.4818 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7c8da201-d355-4317-09e6-08d60f6f0d43 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: BYAPR07MB4389 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 switch responds with error for Get Port Speed Command (GPSC), driver should not proceed with telling FW about the speed of the remote port. Signed-off-by: Quinn Tran Signed-off-by: Himanshu Madhani --- drivers/scsi/qla2xxx/qla_gs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/scsi/qla2xxx/qla_gs.c b/drivers/scsi/qla2xxx/qla_gs.c index 85cbe59b4f58..902106f97020 100644 --- a/drivers/scsi/qla2xxx/qla_gs.c +++ b/drivers/scsi/qla2xxx/qla_gs.c @@ -3272,7 +3272,7 @@ static void qla24xx_async_gpsc_sp_done(void *s, int res) ql_dbg(ql_dbg_disc, vha, 0x2019, "GPSC command unsupported, disabling query.\n"); ha->flags.gpsc_supported = 0; - res = QLA_SUCCESS; + goto done; } } else { switch (be16_to_cpu(ct_rsp->rsp.gpsc.speed)) { @@ -3305,7 +3305,6 @@ static void qla24xx_async_gpsc_sp_done(void *s, int res) be16_to_cpu(ct_rsp->rsp.gpsc.speeds), be16_to_cpu(ct_rsp->rsp.gpsc.speed)); } -done: memset(&ea, 0, sizeof(ea)); ea.event = FCME_GPSC_DONE; ea.rc = res; @@ -3313,6 +3312,7 @@ static void qla24xx_async_gpsc_sp_done(void *s, int res) ea.sp = sp; qla2x00_fcport_event_handler(vha, &ea); +done: sp->free(sp); } From patchwork Fri Aug 31 18:24:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Madhani, Himanshu" X-Patchwork-Id: 10584349 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 92AC2112B for ; Fri, 31 Aug 2018 18:25:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7F8792C5B4 for ; Fri, 31 Aug 2018 18:25:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 723932C5B5; Fri, 31 Aug 2018 18:25:01 +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 E8BCF2C5B2 for ; Fri, 31 Aug 2018 18:25:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727598AbeHaWdl (ORCPT ); Fri, 31 Aug 2018 18:33:41 -0400 Received: from mail-by2nam03on0076.outbound.protection.outlook.com ([104.47.42.76]:54897 "EHLO NAM03-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727561AbeHaWdj (ORCPT ); Fri, 31 Aug 2018 18:33:39 -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=94UoFnRB5YFTLdcuKrHjLii4pjhcBfnB4NKXOjVfqAI=; b=lXPpI/8ievWp5mSB3QOpFeFtLoh9M/imtaMT6JTwF+Wq50+AMkpkxuHkFmOg196vYmR579oUNre0LoEtvSoYby9JVI2WETlnSSOBcgs7xCrsi72xB5jtZX8IxBet3wQAYPRTJ/VFe3V6+J8gXZSbGL8PfSEzH5vCjpuAsFVU+LI= Received: from DM5PR07CA0086.namprd07.prod.outlook.com (2603:10b6:4:ae::15) by CY1PR07MB1448.namprd07.prod.outlook.com (2a01:111:e400:50eb::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1080.17; Fri, 31 Aug 2018 18:24:55 +0000 Received: from DM3NAM05FT030.eop-nam05.prod.protection.outlook.com (2a01:111:f400:7e51::209) by DM5PR07CA0086.outlook.office365.com (2603:10b6:4:ae::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1101.14 via Frontend Transport; Fri, 31 Aug 2018 18:24:54 +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 DM3NAM05FT030.mail.protection.outlook.com (10.152.98.142) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P256) id 15.20.1122.2 via Frontend Transport; Fri, 31 Aug 2018 18:24:54 +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, 31 Aug 2018 11:24:41 -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 w7VIOfko024265; Fri, 31 Aug 2018 11:24:41 -0700 Received: (from root@localhost) by dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id w7VIOfHl024264; Fri, 31 Aug 2018 11:24:41 -0700 From: Himanshu Madhani To: , CC: , Subject: [PATCH v2 12/14] qla2xxx: Defer chip reset until target mode is enabled Date: Fri, 31 Aug 2018 11:24:37 -0700 Message-ID: <20180831182439.24182-13-himanshu.madhani@cavium.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20180831182439.24182-1-himanshu.madhani@cavium.com> References: <20180831182439.24182-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)(376002)(39860400002)(136003)(396003)(2980300002)(438002)(189003)(199004)(126002)(110136005)(106466001)(54906003)(80596001)(16586007)(44832011)(8676002)(2616005)(42186006)(446003)(316002)(11346002)(476003)(69596002)(14444005)(486006)(4326008)(87636003)(5660300001)(72206003)(36756003)(305945005)(356003)(2906002)(478600001)(47776003)(8936002)(48376002)(26005)(50226002)(81166006)(81156014)(1076002)(86362001)(6666003)(106002)(50466002)(336012)(51416003)(76176011)(186003);DIR:OUT;SFP:1101;SCL:1;SRVR:CY1PR07MB1448;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;DM3NAM05FT030;1:UmNk293uEm2VHlhWeeeAGXSid8txDjsba8r21DPZ3lFm+m5zaweO8rh4J2ONhdK5lvMVP8Gt+SIb3gITac2uWkxYwPbAzcfBAx/E/YxPWiJyoQoihbUki9ajrch5DSgu X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d4c8f25b-84e7-4699-8543-08d60f6f0cbd X-Microsoft-Antispam: BCL:0;PCL:0;RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(4608076)(2017052603328)(7153060);SRVR:CY1PR07MB1448; X-Microsoft-Exchange-Diagnostics: 1;CY1PR07MB1448;3:Pqf5Th7MtQjPRokuPI7yhX2BW4N7MmhY2yiIUcaejIEqnUG2mtZb5cEkmKDfQGK90WFIFZIGjKerBL+zQl/aWhLX93G5x1H46Va/4zExIML13jw1zX+oLgntQWYHl8ebpygxjTapbOFHDLuoBLYCCTRCu/zoMrvXPstncszzGFndtAtHLkge2m8INHKiCRg1uB7GPWJzzoYSlPZGsYjTPImf8QXHqM26I7bnl/eJin2eIgB/da1uUuDNADMUe06WHP0mlOIDbi8Sw1+E/L71X9kejCTR617cqtSWMOxgqmDZnFZWh6CKEKDMdZ/62rkfKa/2JHd98f83DA1SZjfc+G3+iPPjY/TxGY3aEz1sGRg=;25:7kWzYIxTKHyOUTdKFJML/YC/U2zecXfDfzYnWF+qISDMLyOcYukvWCFLzYQFDV7Jhft2UqOM+bAc//JI163VvwFj8RXSKdMzMC5nY64LnVrMblHGuXDoqQzsEnEcKguV6VI4AgZnOfffsUvGOJgKpHx/bhOV6zM6AYFAVRYi7+FRfs1knlxskzPzKq+6eTmEPdHQqjhqxWdQ/pbjMq6EW8R/IYwp0CeNW7sOXhRSMKb5HhbAavvQJ/bzvvKC4GPSDFVoPm9U++csH+p6NAF0nKybTuNThx3vlMaMMcsZOJT9Mjgg/sBGY4QWq5sU0dJashxVnxM1c3K/v4c3mKnrEA== X-MS-TrafficTypeDiagnostic: CY1PR07MB1448: X-Microsoft-Exchange-Diagnostics: 1;CY1PR07MB1448;31:nWxhBpFbERGzZVsu57CcYq5ZJ3xtuGcBIHLwQRJ3+SQCcY1LzVKHB/Q3D1BNAsEK9n4+0iOI+kBChaaMglrmxt7inwyeMmXFMaXnw6USUGsx3737qxTZZnwNOev60Sgk42a+P4dKA504uuC5aaoj8Xi0oQ7DLmjHOKcYR0GzB5xCb5Pk+NKdZN31xCUXF++QWa6VVvwug3oYEUHB0RNprb3D4C2f1aGPOxeExvZqaPE=;20:dS4cVT+fgY8IKE8glP7zWAFOk1OVVYheoIRFPpLOqmUxaCIDIVy51r9maoLa0N+WtX7U1xVSsPZWGuW6LR9W1jFZWoQnMXXsok1Q/dmekyyxqqiOtjpTZloP8vT2bp/JHgg3SQoxEzERha7fTiFZWnffELKC72yyTR77bhxhEq/Fo2Kps3A9eX2xBMprGPkdedj1jfFKrdTJtGaQOMEuI9FeEJz4iJuF7CVDz9gF48qQcuHSKLhwhHBpg4qdb+NpVQosdmTJy55U1El64rVcam8XkV6XzWhWzS0CIL8MPg9V8tqR8zGKZUqlhJlnytm5WMN+nF+w8FAXCef/gMUW2nCyoAMzhqHXdyO3YDg0ulwsuBcD4ZbfUHvU+/3Ko6MMV1y6Wne07KR6TpzsgKioPz6tQwuaBOMEIZDsM6gt0EwOSKe+IVuUyaTEewrHERMrMPxw2LNiq4BW6p1J+KwOF2J861x6OuUN3XlERQh7IlL2ew0yKuqAoxHbtid/u+Ug 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)(93006095)(93004095)(3231311)(944501410)(52105095)(3002001)(149027)(150027)(6041310)(20161123558120)(20161123562045)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(201708071742011)(7699016);SRVR:CY1PR07MB1448;BCL:0;PCL:0;RULEID:;SRVR:CY1PR07MB1448; X-Microsoft-Exchange-Diagnostics: 1;CY1PR07MB1448;4:03QZFKe7FrgDhYRaBb8dVjGNW7rKANRW9Bfdyni7TG5e6lPhWz5Wk5TupshKQnHvTbUE037fo1rI5Ff6nWmhdMuCcTIsPtIyg2LkAzda922mXe8F21kkEY2/jadomwHx9iZr3d46YCpe75VqvW0CfDR7+ZrZ/BUuUbYmpQ+rUWfGyTj60rcu5lDDQu7AIYNt13KZRpVW6Mf615nnsZrozwvYlgEv+lCKBufF2bvn7t03Zr/ILYiVeZlp6aJT3waqQbP+nKcZFKg3yroma2Arug== X-Forefront-PRVS: 07817FCC2D X-Microsoft-Exchange-Diagnostics: 1;CY1PR07MB1448;23:B3CFMRp4YKr7qEpXzHGGXXyP81/WgePbsVoH8pMFW6NUfwo/tPcrSDsfsZR+uYUl6jTJk4JZdYQVF1r7AIvHtaQuLs+i4dhRzMpwH5ewli/t1mO6vO350yu0HW3agPDcexDsp0X8rZuM/KNX4E9GVrJ1rFeykW6LW2DHLRu2WqvJLskNupWfJGnyojJsACTplC2XOB8jjFS/YhpA9aMBrx3Tfc319vbYPkB67hpSZegKM14RHXNz9Kj343n9OqE9pFEoOapzezqVwvfZdJ/Wt397BQ/dl/3OSiBp6WKrQIM790T0vDgeqJw0Pi1Nh9Tplom1P8yGpyiePf4UDyXHXK02hVlEtpWlWQyHwT/N5mdwWrZbl1EZepsZx+mziH4CGOSNVUVT33OO85ChinNNJKo/JwLLkny8MPGk2obhnEuUyyG+2zg2Ks7bMmSSGJJIvUfldhdckkwIlKdmmHqY2IjOuk4FWBYyZEC+5NcIiyhpSIk+PRHPUTATXDviMRssWics58tCnhjDlHZcPN7PHeTaUcpJt6qJK5Y8ITddUVjf8SJ/BT7nFOZO94KkwdY/QPNX0Z9ytrQgitIRi/m454ViX8CfND77Vn/2eLss65nEOPR7L6D1FeJCV7l8tirhyItey2Xh3F9YS0yo/FADov/lkn4OhXugTq9OBE44SJ28CvOASH6aFei83d8Z2L8a8fNz8sX4ns5f60fzeeMGLebB9YI7MwafR9pWeYu+X9fi+otl+yedCB7VtgPg1N2Junwu5PIbpMFT5nRr4p4EKbeITAYJHKkekP1F/KwAS+3BkOt9qLziJg5vHOKnVKBxbPuBJG1vZ5kklMGSCCG4hLg4DHfPwLdDgbHXSV969KW5BQPN/dp2LOJ5vDW+5Fe/x4eFGzbxQC9iiKVJG9FDITmROfsEHlV/jKTcBJlRqp1MK7jHH/6GD7HB4yrRG9zedv3kwk+SPP+Aitwm7wXgZMpmwSMMBZzIQlg8lGPp7kBaJakWfF9fIQcQ+WZTRuJAylOuCIZWi1XJEqad+vIsOg3CcaUY/sWgkqrLkEAqI2BUqxX8RN7erdO8d7R12XaVFhBTkVoZ1nm+/F8ZFgBSuBCgxks4X1XwfLM/tqoLUeddriYHtUD+DzVmh6iaWgmZ X-Microsoft-Antispam-Message-Info: ISKYe0ODwe7mHxJSO8XSP8bp5/QjCkNQkTIdBPae5jrcTbqYfDsDz6reMNXOIIS/OUhtiBH7Dn0TzTeEux471aQ4VtFDVnu+oKOcnwQ0N9SETtF+hq3ZPM8Hi7VN2Hp2f+UEzF9acLy0E4Pr8Jvuws1EDNsLm+N1XkIfFL5kZqiCFB6yhPsT5Zr2EV7gT9jnRUvy639zBTPaopM2T1mVnZb/ctyAG5fOR4/zFRMDr1JqiMnAoVfGqbe/lB0enSDKjyoflzOhEY0hUU2wXYZD5Ky3qaE/JBqVowe1SmAoihFdOpvIkxNviFDZoj5tALmpmYHMOr5lGO7OPRQ0cYwB0oPoZ8ywpElbvrI+duOPSQE= X-Microsoft-Exchange-Diagnostics: 1;CY1PR07MB1448;6:eFVXSF45oNKaAhEUyKyFnFPTK+oZQxTFhC4iHAfA7eZHxiXVXZQrU6Ee7m0LD/FnBB19ZenqNRIBmd1QSQFSQ72+EzetPCkWf+AIhnr/0WqP+zPBsTsyl7rGg31fD/URClv4qtaSdPBByCH13K7B1ZvKCtV6i0p+A2Vm4S4cqumocRmFaN5p74Tqu2es+sR10NHFJ0acHhzhY0+pZHyPz+SnCXQKp1Q5xVgxjZ6wdUSZvDioa3dHHJPE+bXa750aOZdMrX/OyyMmGz0uPF3BUbNej/hXIEyHJ5z15agd5yEkzPvbdj0j3702QukH+ppxYP6Uc3mPtnzAjifbb1GQ//OH+TZFpkCYrHQydny+RETTI35Kk4nfDWa1fab+3rKjAxeBwCC+ZAUpVKeMpSVDwWpfJ7u90Xi/wrEXD4TOjLGWtnTILTdZkdgUtLavP/uWVrCdTAw63xZ/g67R6qx1dQ==;5:HyQvINokB1+pHIj4DxbRzOG6se+OE+1BM19fZcalAhGgLkXxv9ZahGYgk09ak8w4KkXhcEPWnKeV4wvj7cqEjncIV9jGvaGSaZtr/TnezKH8Czhzm8NpCbCtzmuDIhmDZ+JDNs3zQiP2zH3HR0R5CJKOawqrU8Ja9krIXg3FvHI=;7:Mmv6XaNrqD1wEknKmb2T3o2peE4sh3Ml7bVIeXuH3AUMDCDn93Nmv2BEU6DA3eSi64FUUw5Po9ASqLkSxEAUonSihgIjnj2/i5GQ9qdJDMl2Ph+AH8MsJbzSK+1AakCaen85/bJjjhHJcsQvMkAvY+2NijOAPUchoh0Y8bed/Etgq0iNysnF53N3yWABf7oELDp4QkASzOxuOzcov5DEQrbaQQZ6j8eDFWYP316PhlNUljr3juXodMA91KynEXfy SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Aug 2018 18:24:54.6068 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d4c8f25b-84e7-4699-8543-08d60f6f0cbd 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: CY1PR07MB1448 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 target mode, any chip reset is triggered before target mode is enabled will be hold off until user is ready to enable. This prevents the chip from starting or running before it is intended. Signed-off-by: Quinn Tran Signed-off-by: Himanshu Madhani --- drivers/scsi/qla2xxx/qla_os.c | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c index 1ae31a119a37..9628fe4a967f 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c @@ -6047,12 +6047,27 @@ qla2x00_do_dpc(void *data) if (test_and_clear_bit (ISP_ABORT_NEEDED, &base_vha->dpc_flags) && !test_bit(UNLOADING, &base_vha->dpc_flags)) { + bool do_reset = true; + + switch (ql2x_ini_mode) { + case QLA2XXX_INI_MODE_ENABLED: + break; + case QLA2XXX_INI_MODE_DISABLED: + if (!qla_tgt_mode_enabled(base_vha)) + do_reset = false; + break; + case QLA2XXX_INI_MODE_DUAL: + if (!qla_dual_mode_enabled(base_vha)) + do_reset = false; + break; + default: + break; + } - ql_dbg(ql_dbg_dpc, base_vha, 0x4007, - "ISP abort scheduled.\n"); - if (!(test_and_set_bit(ABORT_ISP_ACTIVE, + if (do_reset && !(test_and_set_bit(ABORT_ISP_ACTIVE, &base_vha->dpc_flags))) { - + ql_dbg(ql_dbg_dpc, base_vha, 0x4007, + "ISP abort scheduled.\n"); if (ha->isp_ops->abort_isp(base_vha)) { /* failed. retry later */ set_bit(ISP_ABORT_NEEDED, @@ -6060,10 +6075,9 @@ qla2x00_do_dpc(void *data) } clear_bit(ABORT_ISP_ACTIVE, &base_vha->dpc_flags); + ql_dbg(ql_dbg_dpc, base_vha, 0x4008, + "ISP abort end.\n"); } - - ql_dbg(ql_dbg_dpc, base_vha, 0x4008, - "ISP abort end.\n"); } if (test_and_clear_bit(FCPORT_UPDATE_NEEDED, From patchwork Fri Aug 31 18:24:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Madhani, Himanshu" X-Patchwork-Id: 10584351 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 AB9D51709 for ; Fri, 31 Aug 2018 18:25:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9A4982C5B2 for ; Fri, 31 Aug 2018 18:25:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8E1EF2C5B7; Fri, 31 Aug 2018 18:25:01 +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 2DE762C5B3 for ; Fri, 31 Aug 2018 18:25:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727599AbeHaWdl (ORCPT ); Fri, 31 Aug 2018 18:33:41 -0400 Received: from mail-eopbgr680086.outbound.protection.outlook.com ([40.107.68.86]:26328 "EHLO NAM04-BN3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727545AbeHaWdl (ORCPT ); Fri, 31 Aug 2018 18:33:41 -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=U2fJ3yULDJohEWWnthJpxbTiVMkyN9o/t+Fv9hg8+pg=; b=QF+YsLYPtGWb3YmlnfbBTGgwQZapNUTfs3q0RQRdLYzDhOuD3Z8fcd9CLmGmIZFz484A+y7Zp4iWis9S5PIaDRstr0Jb2gODXhJ+by7HekZWF++lg8HpP36yYw9ZmA3rDEDDqCYlR3bRAZfkzQ5qgE7KS5Ey4hKjR9m/vhBDFKA= Received: from DM5PR07CA0113.namprd07.prod.outlook.com (2603:10b6:4:ae::42) by BN7PR07MB4385.namprd07.prod.outlook.com (2603:10b6:406:b5::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1080.16; Fri, 31 Aug 2018 18:24:56 +0000 Received: from DM3NAM05FT030.eop-nam05.prod.protection.outlook.com (2a01:111:f400:7e51::203) by DM5PR07CA0113.outlook.office365.com (2603:10b6:4:ae::42) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1101.16 via Frontend Transport; Fri, 31 Aug 2018 18:24:56 +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 DM3NAM05FT030.mail.protection.outlook.com (10.152.98.142) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P256) id 15.20.1122.2 via Frontend Transport; Fri, 31 Aug 2018 18:24:56 +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, 31 Aug 2018 11:24:42 -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 w7VIOf1v024269; Fri, 31 Aug 2018 11:24:41 -0700 Received: (from root@localhost) by dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id w7VIOfZE024268; Fri, 31 Aug 2018 11:24:41 -0700 From: Himanshu Madhani To: , CC: , Subject: [PATCH v2 13/14] qla2xxx: Terminate Plogi/PRLI if WWN is 0 Date: Fri, 31 Aug 2018 11:24:38 -0700 Message-ID: <20180831182439.24182-14-himanshu.madhani@cavium.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20180831182439.24182-1-himanshu.madhani@cavium.com> References: <20180831182439.24182-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)(39860400002)(396003)(2980300002)(438002)(189003)(199004)(476003)(51416003)(44832011)(14444005)(2616005)(356003)(69596002)(72206003)(478600001)(47776003)(486006)(106002)(126002)(8676002)(336012)(1076002)(26005)(11346002)(446003)(76176011)(186003)(50466002)(110136005)(86362001)(54906003)(42186006)(16586007)(2906002)(48376002)(316002)(5660300001)(4326008)(305945005)(87636003)(81156014)(81166006)(50226002)(36756003)(106466001)(8936002)(80596001)(6666003);DIR:OUT;SFP:1101;SCL:1;SRVR:BN7PR07MB4385;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;DM3NAM05FT030;1:JVFQ2ttDYKkhz+eIQdJIm/ExmQAggFIo1h/8aBouHtInPaXHc9fAcAzi5Mjh5wSMSKau5fssk3ZKFQRmYlrvDRb3JoeFUJ9EVv0KOeK8oiHkIEiJTnBWhNvUgeti2+z3 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0e2916d7-2bfc-43f9-8e89-08d60f6f0dc8 X-Microsoft-Antispam: BCL:0;PCL:0;RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(4608076)(2017052603328)(7153060);SRVR:BN7PR07MB4385; X-Microsoft-Exchange-Diagnostics: 1;BN7PR07MB4385;3:Y5a4/XFSSMhNZK3ALXpgVKVwmdqPP7pIJUMKRTGziaXCQEcgrSk5hjzyIFBKanr+au850gjEHe6yGLaangCcLrp15wPXlhaWKo6lJuPLYlJgUyfK6xBI9abOcXaRydq/zCwJDYJ3m/T0+TscvHS8Gr0kqcVc+XY2a7EeZ0yw0pHuIjQxcN+XYdZhuV7AXi17Wx/x68bfFzQ+ldMcgdF9xqYulGemwzn0wsKBSeLTi4Po5G6d9xQKt8krxvoleNnIPz76SQkyP3sB57yM0C+4Jm0k4mcoqD/Y7L7jaI79f0TOhpR0JesNYLH57LB18pZGgzUFwvSSDLw5fstoB2QedwulWVpCfUnVs0nk4W6YXmE=;25:g3S++Qp1uncw/EWWKpHg2NMT32tRPAzVK9i1/BP9aYUuqBar0Ez4/LI1DwpuoUn0eP6XhAV0zeYq5BEfPnT3I8f1FujHNnvHe9iRyigQzzhi2wEy11z6JFXrQ2S7Y8Ccxvrz8ISXE1SgmWhC0ybL3ZFuy8aWxUhcI0UiA537rIK/UuPMfoR3bYaj4yztHPOYtNAwHVzvl2J6TTt9iXHdjd/X46wuofHv1ZxJVjoLLXonsVZayx4AuLzt0kRcmlv16xY0LHIna2e9sQv3kKjqA9b0NSKtlUORQFgcCoB7xaZdE80ECiYv2ioWwtJiPFWRxsumAEqwG7pbnBIR+D2c7w== X-MS-TrafficTypeDiagnostic: BN7PR07MB4385: X-Microsoft-Exchange-Diagnostics: 1;BN7PR07MB4385;31:FTaN80dJZRMaaOJ4150q25FuMjmMJpEY78caPKb9jhK0VXB4vi03XvWUvhTjzgSOL5S5Sxczgoy16fqKBVS/BJ6rDq+9dMLwaTKkQl11XtEC1lU1cVlPnDMzNA89OpUuMwiyFrvGzj9xRVhTjGnpB96wfKaZwt7kG+wTjpnlMTHxCsTQfW3AkLapS44KQ64WJqYy036qCSX28mpjl3wRLVZHFOPHOgUn46TKpXPTTqs=;20:eQuULHIogunLjwyvWTQFWHSFdYYpW3+0g8PkLjNgIqBIHC2Tn29dkOPde9l9TIjPQ9ECi0PlHGtRt1zLziZy2olx6KF27QE1KzrwcVWl7y89QOu6DqtmsHS72+nn58LeCAE+eBDJJJScGMN9/xVYchqSnUFaYvB1j63yz6D0ZQL0p8zvEaVVUSVt04ff0HWTF4SgYzHKl1n/ydYWlhkPFYtMGLb0+GgT5scXbyIFGQCAXGT279wo7zqW82LMxNmQMp+xgH0Nprl3Q1N6vFRWNxnR0bDP3KbLVraycVPJEsYG8UFgNs23EYWubN57r9e5CV3rK4/fgmFQmGvLv+T0EovT0uUmq+42eEAue9lRSQVQ7AdHHRuU0q6u5Z8isjoGuqtMwIn81BmUIpLk27X2Bwpju5JGvhPXlQVTS7RQp6kHcUsfFFMfC69DPojmWXTro41cypiY+tAz6stUSH8kf1ErXBc3vOHh6RnB9QpIxnKSzNRv6dhVaecGRhQQoluQ 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)(10201501046)(93006095)(93004095)(3002001)(3231311)(944501410)(52105095)(149027)(150027)(6041310)(20161123558120)(20161123562045)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(201708071742011)(7699016);SRVR:BN7PR07MB4385;BCL:0;PCL:0;RULEID:;SRVR:BN7PR07MB4385; X-Microsoft-Exchange-Diagnostics: 1;BN7PR07MB4385;4:ratGNRmVq/8sD9onR59Em4BIbw+qeUobSqbejvFO+bmRsOexM5+hoa5pYnfDjaXVw2pbAEIF696sq4/8Kg2jgPbyTTFfDPNcF15/YiSribsLPp5KVsIAa4b1rTCq79XdFTrXyIzZAoNNRUjYYAdFKXNTjw+YeRGjuyomvtF0tkib5woXSaeJsD4KHiFJ3OJV3VgpgCc+c9s/56V6f+gKL5avL/OXBSVD1cGqORj2mr6/mp7Jgol6UN7LfC7rpxuBY4zstr9fAjk9YU+RIaohFQ== X-Forefront-PRVS: 07817FCC2D X-Microsoft-Exchange-Diagnostics: 1;BN7PR07MB4385;23:DMfTGO0KMKRiGD+IYT6qzNa7RZccqGqYbZQIPmmQZbr8aoJ3G+ouitpA4qgB7KnGyW843MF/gurf0vU2Jx2edNO2wkSqrc8FZDh2iovfqoaI9L8GTf8RGKAGvYCIZJvGqa0l1LJy95vD+KeWLZpHUmdD7Ek7U0y/8fBi/jX9NFJZthgSNc+ifpOkrlB30KW8oSZZqeRLYMkhK7cmoAuCgE7pkuDKG38WWrE31kSnMZ9P1AvpEbndhRRTyimGTlVb346f0wlUh7tKAETZz4Km43kBj9Owx/4u88ENUmwyuWLgyIIfpYXPQdR0wWUpjVpfx83xP5sAMBNdctds33D8JAPo+7Xt+toT+YSvUMMDHmjqVds0MBISk010O+G8cUv0h9wqGKVAc3Lx8kDBDZOcPVKjbuviGeRWostADaVjmazwtwCRH8yTk60BdIONXy2ogJDJlrxmfFaJT78vdlIRzAkbDr/tc3DSXHgreWRiCZqPwSvFSf14CNfGurJPkgBMbwZAjyZijcN7wZ28wNANewWSoWY8Npg+6BxWg4QBzZ7qzLWVFtUWWSxm4zsLG8UhnlXaLRE3ZhEh0caS/usuwgUGGiFaoSJDYg3nKRPssEaZRcw84ETaEkUaabA38MFO4KQ8SM6avvYYNUDxFOMkl8ElNrB7bCGSr9f9HCxtISE9UGEqg/gHmf76HgaSZwBi1xtLH0gZQZn6gIZdQwDSN0D6ybk8lIIbkhcgz+PhfcYrzb57qxDEHPUTtee3aCl0q320HUcz0cN/Z1mP/oAvks/yzb7YVU9PoedqPASPUgK6rECh4wcDke0cmj20X/3/c5OqaoNlenVvkuS/5cJu++YQrwza2pMVb/zYmJvBTE9MinijQGBzSEZcLXntTkqeEO6Yb12SqX0OIH9RZlmSs/ny/9MXP74GDrekJKGmsLZvF1l7XIPCkRu9zoeqC6aKlFR8jvu3M6DUP5GvU8ORdgjytyFs8Oc+m3oR3duITC0lBRi6ITJbnqqBfv5cpgDj6HdccVnHG8BEXd1lX5x1ZrU51DFsdcrvISHuUohvF8xo5t3alMPBW6VDSGtXHy7+MJA3KAhFGD35lWOaQU+cTtRpKK1KZ2PJeEUwZFi1Tm69Ep2aji1ujAcU9JXCElRB X-Microsoft-Antispam-Message-Info: ttZMpBSKR1aUk5wrbLTj0JgsgsKfL0CvbPco18l6ilOgy8pJ7qGF1ob/6xYk3qObRREI2kiDNnalKAFvyvGK8WEj0yZHYQdavePALibzgMuSF90I1mfmhdxkRZUPBf6d4uxzZ5G1d9WX/hn1balmKIwALt7GOMbcbsES2ZNPEETr74vbISnPF3k9ZXslKQ/0BRSCH8Du65qnVapm+rB6mthao+XygVG51o4PvFM2cLOn4sqQKz2W+XpEFThIQoNxJKJkFESfOH+/DBZeygAG6x+Nos7qB75yZU35/JWgrfkv6zoq32xRVvYpYzOygjKVk7ayn8BnPPMRg0H7QTR7A7j/ZBVAdnrnl+37Swlv21k= X-Microsoft-Exchange-Diagnostics: 1;BN7PR07MB4385;6:khBdUTGJ2sH2+bupbjMe+5B7E/kwEYBhwKl8ujBqKVRweUamB2N8VIzA+o5GUO9yQU13spM2NM015NHQo3bldW5Q782RIyMscw0VuMY33eJVaUwtriGDiMUqoF+mhlRDsebMiyUkhVmQh5RA//FkCsfBY5CkLWrcLBNQfGE0aB1/mZ4CVVw67dnoAOWvon680G05c7JkogWjEY+GRYoS6v4lqK3dJ0oScmD1myC9BpG+0nKe3rQu2GILW7ebMgoF3EudHjYcZbZIGayzTlRhSSDWN50s37pnD8qP7pfDzMzwEyxW8OMM+apRmEUZezFNmVTDFZgz67kPibp3b3MruGjuZMuHJOaTRLKZAbmpxfWLAtBciGrN74+oZWruGr5Lx1RHv3+9MfuN/B8VExgkMxd/HM1DrI0ENcBaDZTILsW+UiGSjiRgbOgdyNNUwCdbRRGqtQNRHF6aJ9Qaid9osA==;5:w1fS51azfzqomHpErCqFDO3SzzVu1qSxKEqEWAwuYf8loWJxUmQnsALc/DsDzli/twsyevYLnLkzkhZnWxcRLoIEnrkTyoXbntkC6rMLSj0lADAN6cXQO4n9qVP4RpBieWWSKhLyRZeJa2Hn+aYxNBWcYiQ6QEfE+6iUdLI3MlI=;7:gbYnH6GReTVIJGqk7mIcQjggX1j84oh1fwCPtKfshsMSb8q9l/j+LLA+/wMYRYvpxgn2gOl5nWg2/wsDpQmgFkKEbi5oVzlVgr5CpdGI3HOdeMNXFfGNm4eLn5G4hfKmvHx5nITSeZGcrUIsxjkXVrfOi6tCKvDgm7GfMEe5SYq0BVVUjsYoEkagadhWyVfMKSjXvUenxu8XKGVdWAXyT//VSiQGzkoMWg0tX6nY37ZQEbVZ16YwHQGOdwOvcIru SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Aug 2018 18:24:56.3412 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0e2916d7-2bfc-43f9-8e89-08d60f6f0dc8 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: BN7PR07MB4385 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 driver receive PLOGI/PRLI from FW, the WWPN value will be provided. If it is not, then driver will terminate it. The WWPN allows driver to locate the session or create a new session. Signed-off-by: Quinn Tran Signed-off-by: Himanshu Madhani --- drivers/scsi/qla2xxx/qla_target.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/scsi/qla2xxx/qla_target.c b/drivers/scsi/qla2xxx/qla_target.c index 34fadd320f55..396c8a6d502c 100644 --- a/drivers/scsi/qla2xxx/qla_target.c +++ b/drivers/scsi/qla2xxx/qla_target.c @@ -4723,6 +4723,12 @@ static int qlt_handle_login(struct scsi_qla_host *vha, sess = qlt_find_sess_invalidate_other(vha, wwn, port_id, loop_id, &conflict_sess); spin_unlock_irqrestore(&vha->hw->tgt.sess_lock, flags); + } else { + ql_dbg(ql_dbg_disc, vha, 0xffff, + "%s %d Term INOT due to WWN=0 lid=%d, NportID %06X ", + __func__, __LINE__, loop_id, port_id.b24); + qlt_send_term_imm_notif(vha, iocb, 1); + goto out; } if (IS_SW_RESV_ADDR(port_id)) { From patchwork Fri Aug 31 18:24:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Madhani, Himanshu" X-Patchwork-Id: 10584355 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 B116F1709 for ; Fri, 31 Aug 2018 18:25:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9F6A22C535 for ; Fri, 31 Aug 2018 18:25:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 938B92C5B3; Fri, 31 Aug 2018 18:25:02 +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 302692C5B2 for ; Fri, 31 Aug 2018 18:25:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727601AbeHaWdn (ORCPT ); Fri, 31 Aug 2018 18:33:43 -0400 Received: from mail-sn1nam02on0053.outbound.protection.outlook.com ([104.47.36.53]:39188 "EHLO NAM02-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727533AbeHaWdl (ORCPT ); Fri, 31 Aug 2018 18:33:41 -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=KXZnp7otjRNI2gnBZ6bcXUywCh2E+xNeE4Fmqm/V6lg=; b=hL5xEaGWdhWsaHVE2TyV0hq8tjDstuLjCx/KxmolTM5MueMEXTsB4zgJR6F3mWfRikJrgRtI1N16jlCxhfHFMbsHImxMw22L8IHEU9r4vOnwuKAzH+BDrmWk5MYlJsVFTWBpC7MiUczKsFSfdVWLrs21VAVTw93FHQNdBnG1dQ0= Received: from BYAPR07CA0014.namprd07.prod.outlook.com (2603:10b6:a02:bc::27) 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.1101.14; Fri, 31 Aug 2018 18:24:57 +0000 Received: from DM3NAM05FT013.eop-nam05.prod.protection.outlook.com (2a01:111:f400:7e51::200) by BYAPR07CA0014.outlook.office365.com (2603:10b6:a02:bc::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1080.15 via Frontend Transport; Fri, 31 Aug 2018 18:24:57 +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 DM3NAM05FT013.mail.protection.outlook.com (10.152.98.122) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.20.1122.2 via Frontend Transport; Fri, 31 Aug 2018 18:24:57 +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, 31 Aug 2018 11:24:42 -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 w7VIOflY024273; Fri, 31 Aug 2018 11:24:41 -0700 Received: (from root@localhost) by dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id w7VIOf7J024272; Fri, 31 Aug 2018 11:24:41 -0700 From: Himanshu Madhani To: , CC: , Subject: [PATCH v2 14/14] qla2xxx: Update driver to version 10.00.00.09-k Date: Fri, 31 Aug 2018 11:24:39 -0700 Message-ID: <20180831182439.24182-15-himanshu.madhani@cavium.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20180831182439.24182-1-himanshu.madhani@cavium.com> References: <20180831182439.24182-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)(50226002)(44832011)(4326008)(476003)(5660300001)(2616005)(446003)(76176011)(486006)(36756003)(126002)(51416003)(80596001)(50466002)(47776003)(11346002)(81166006)(81156014)(8936002)(48376002)(336012)(26005)(69596002)(186003)(72206003)(87636003)(305945005)(16586007)(14444005)(42186006)(110136005)(316002)(86362001)(8676002)(106002)(54906003)(478600001)(356003)(2906002)(1076002)(106466001);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;MX:1;A:1; X-Microsoft-Exchange-Diagnostics: 1;DM3NAM05FT013;1:VPw0zmJw1Lv+s423lmfjhl8V1VpfgqMje1r6YTdUYm2OwhlN7GroLBrQA4VROA/oDQxM+gNg13hmHeo9EARyARINk2bPzNWvANUGgwa9OgEF6iv+epVAmGV94S9VTNaB X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3ae5ab20-9683-4a34-2194-08d60f6f0e49 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:FBoUp3Sq4WOv21tgvAilo7ban4cFy1093fhWPQ3Nl0Nc5untqUekQ3hbNFn2LElaDraVKsQ2W6+AjlOyXV6FM79HYPbQHhd1R/dCBUs3YhdfK1Sx8aaW1rUQdMJghhZcAQhhsJrZOl7MpTSRQPJJ9GEvF69vUD75iF2kBcjzdZ080hmVnaYGeqTgVEYkukNaBNYd4/FEgHspAH5rBRFe4O6YP3VDvn/L77TMrkdMgsgR50DzlHCUCkFgveFHSNxU/W7qjtCp8WABMqQ//4JvPUYatTokH+LpsU4TBp8p2F+Yvai3b6yJnptxaK8Kvkj3zx1keb+8y4AdQzbSu6o5oOWDgw6EAxLIraMgh/cY4i8=;25:NMOCFA3/zTgSN+d9Ajj07+vP3MZQtDSGRXALiu1Ix8qjhFYw1zBjEsNFMV+YdPdWtojj2XV67fjqFp7fMq6hh8md3woJeB3r/WFR/6biX+KEhCglW8FAyMi2vY3yvNj6MxKyFgw4gVT+feOC8AyGhbiU45LGpuxker7S43rzUVWR+5oa5xR9b4PdFIv4dAw6bRQ425JNN8JwPqkj/ZsZSJxq1mhidUN5/DQagMWhECdn11tfnyKkBQd3BTqXosuBf18Ks++OjThUBiWxPId9thSyfllaMoaISMGon9q3sJ3Urwunvxf7sQnZCLxeXMDd7PuRjaDub6wtLmEySRKP0A== X-MS-TrafficTypeDiagnostic: DM6PR07MB4395: X-Microsoft-Exchange-Diagnostics: 1;DM6PR07MB4395;31:N/cqBJd3+ybWGYz2NUSjSGSsD36YJQFwG654uJ6Zza5+y/t0R51OOmqepjwPqhIhX192eWBECynjNVh8rgXP+nETNtZAOShdNyHAq/ylyvi/G0UR9/JX2nwNdLUZQa7np5rNxo2gOaVB5ajBZhBmiaIIQU6kwhC0u7a1dN6+7mjKHQGjxx/xtTzk6xSg6Cu4VYB4UminZnpbvPb3ySAzCHfeLLuwIgBNxkw7wXqWPUY=;20:A4Ql5wi6fRiwUpBk7auDpzTNyOlNzDUwYZ3P0rMeeo0RhdqUG1GGB6PV++QHGEqcp2oz+PDu56JByvbmPWcWXJczsLRaDe4CPvpGp/6XUV87gGM3J7/P+1f8SjegV4vlDNgzizikNAgYgpAuOtq6jkwiD0qAXkz7QIo3hYTa4IpmRVUYHAaij1Ywr2+nAvTZ8/9jlTVz8bKDFtedQOePwORKUJTfBGk8nBiyYisz2HHEP1/k/1TNvRa9tZbt41zDrNDj9uKGZ/Gn4/vFlINnXQXecNpzSNh5RPBASAZBwoVn9QETX3qkVCTbNi3hJtnlgjiFjGk4LnOMQOucHMReHr9pwhscZrtFIqfyEDJx60IU5Ubburmc0ynWOZE9ix9XUiYoGiqRdJ1JPG2+YAhk9YQl1+5K4FV1LW5TFmcSjX+9Rkn93zO/GivUGcAJazwP1x/N8EwLSarF+AN5cinYzDZrjLQ7g1rGLYd0s+foCU7RU7A0L0OQx07ugQVxG1/1 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)(3002001)(3231311)(944501410)(52105095)(93006095)(93004095)(10201501046)(149027)(150027)(6041310)(20161123562045)(20161123564045)(20161123560045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(201708071742011)(7699016);SRVR:DM6PR07MB4395;BCL:0;PCL:0;RULEID:;SRVR:DM6PR07MB4395; X-Microsoft-Exchange-Diagnostics: 1;DM6PR07MB4395;4:mH2pWBKUeGaZI/vMPkgYkwEM987xudi52kXZqGq7VwIvq5ZEKX9l2F2m6+DFleZIxKxxM1gasm2cxqzUAtJnyP+7S6V5OLoIqrXVrxWWzDW10n2BmGuAOgxf2Kb8Gd/j9ABuVXuveTUMp13AtQKGNlxYhklL7ub0CAv9+YkQfI8SykaewoWcnj9mfOP/sfsvQRGHWzSGlXfm206yohvxrN/aYPZ9c26idIco/r2KsqUHWDb6DAASY4h2zYV8xf0VsHVVhRSMcpYAn4d/fnsalA== X-Forefront-PRVS: 07817FCC2D X-Microsoft-Exchange-Diagnostics: 1;DM6PR07MB4395;23:76Xgm/GsAk/nn1Oec/oRLI+UlLI5pBmoQUZu8SrIv3DwCw/j5Z312/XB+9QYaBPXshKAIPMo93EBeDzP0v7Df6xl7wS7oULFe41RMtdhY0dWSOlPPozmtI5xiHTpk8IvpNVjqEIA+Hgl9KTYNESsTYYPGkIqPxb56zjW2oN2WrBW7L8OlVmcd2RVamvvCxDGB8O8OE/fJTRrtHmx84AfX/IenJh2OpN9Pq642kSqeKqCBzm39SujRNBnVzirmrrhPABVGX2EnfQyAgHW6FuLZETPoSg0DH/tteSpe5qqLoDoleaP9HtUR/xA3Jl/3JoxzQOK5xm+eAIfCmvAUJKEqzYpPt+jNcASx6oq7N82YKc4ukWuDGCGyiSZ6c4gCMNaMPt4pe2XGJOpsp+KsGCwoOUsM9hZ4cyc8+6+wgZL4neXYt9XslQdZF36El/x/0R/raMhQFCz+VANRqiHTxnJhr7MW0KW/iQQJvcSbhpyEwNdyE3gyU07oH61OTeHpeUzU8454U0InX7rhEhZF0v/OV+eXNeWdiFCgFAMSAle//AMI/oTq8C9HYgBWn7GPxe1fXOUOWMDvC7V8nyecJYBlcQ/KRJDTEawdXA+QMpT2hvnVT+swuZmvLuKc5gcNCtT3SndxTi00gOjy4ij2FwzVIJyAmkkdb3P8SCcQ5EfCUVUPI1JhrPX7wXia4nfFXT3Wt9gn0auGRPFi+mvNsOicCXCOpLPnrdWB9Pl92NJjjRKhgdkDRsuatMO4ATG3SGk0Gnyz49FayxKm4SWzXfHEIaqhVOnqiC8gkkKHolI9aVZNgWTuo6/87gqEcvszpm9y3mzi+khT2xA8hT1MxOpYHEsqIFbb1xT2c6HCzd/T+HVhpqqNDWyyLaPLcoEQNlgnvJfFNNzVyNz29H85u13M7HOQjp5rBAFfIYesyUFO6KrbnwbDHe01V1tciedQ4TJbOHy+yk8FfNbLV+NuL4gPUgz88gq2JNlLatLxjbnyA1B9o6miBSHnMdlkwOL06FwtvhuoeZ0199VzOQd2MfdOvXMv6fIww80XvxIJc2ZlQtpyDj5xBOE10LmjAGPXpr0Fm5BBoFpwoabKBY7YJNayahVI7k3FRr3UOCdlMtKWZc= X-Microsoft-Antispam-Message-Info: jpLIDQwrH2kWwVtr8vzrTjNCtMkru01DPczW5aw7Dh1r/QUe2sNlMVQmPJFVy7m08LWD7sM/e+v7Z+5enqMpsgNe3ZqREoFtkMxY9NEO0VSEqNos6JYsEolpsCSlS1vytdJwjf1t8TfKUbITwOY3Y5wphwRlY9pnwx1DpVFb10mQj8irVdehNqBpvLER41AePXxjonlkq3pI8QHpeFQ/5CWWJ5PQr8GaQjsZz25ZK+F8eStQWekznt2ruQ1sZe3G045hRBMFRz6ZFsBt1RkNqkvLtK0XhF1jDH9Sn4JcaFinDvwpj38TNmN0/cvWyEhDFhYFz18AP23lWqqBu28Mfk99dhLQEyp+DSs97OjAKiI= X-Microsoft-Exchange-Diagnostics: 1;DM6PR07MB4395;6:PW9Q5XyO40phlVyp2aHkhjaBlWHOJ7HZGOD5Wo3kK5wD0XkusTI3lt6k3jF3VDac/76rB9kGzxky1qg+IQ+RW7Kh3LRULv7YsOZmZ/pd4QBIKDk9fgL6UAUTKzrpGMjXd7sp/AX1sUclyPteP+yFQI4oSUKEy1AYHsZVIzTJpOwEHrlLL/irmnrwK2HE4RouSgXLT/RRfPKD1EpZAsxuTXo6a7Zi3b3KFlJTBSbkW+ML42nERRmRzlyqiF4yNGpMeMd8DjAYSoRXRjaKisGX0Ls4iSAD5z05P9Bvu43odFMQRWT9Rebd8E0KUIaPrC3EqzYeNUknC8ioHM9dHIi/BSgWJnbC+GiI5oYSUvgwVqBEr+BOEWPQ/SfBKyRh2pmCii0O+FFfLpFlj5783i3aMy31Si89w5T/oky7vszUO+38kVNdOBGBLU1i/M98BXo0Ds+nJKibVNURrCLlpi7+cA==;5:pfpdpjS85pFT/G0ebuO3WX0uA8SuLKSguXP/CIo4ttW9p+g7LbDVZKddb07LZtA62Y5R5J3yWxEnPgBW4HuJyVf1EatW9gG3h47NlFmhxf/b+d7gwHhj+HsmnmYPvB3lRLMQ/26yPwutMn1hzDuWSW4fa41wCs7LSRnLZG04nlk=;7:uKfBapvxH/dgfdAZiP9/SaJa1rXrVKizMgwIT3cLJ8giVnV8UpxzkgLUmAvpxwCHYbJ+Ebjcj03s+tshSEckhi4AVn5b1rJwlSVddMEWfvTBqnEEY+yGHc6JzmVh35VrOWasrgfsne9NSA5ngPlPbD2Yh/vb6uGqsb/+6NCi2JVfvIGjZTe9H/8d5Pcrz9XyJhnjjgSRaC4BWlwXXcLvIsXCwOAXF5Fu4s6Fu0+rfLnWAZhT4hP9E2ZcWwzyfXa+ SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Aug 2018 18:24:57.1839 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3ae5ab20-9683-4a34-2194-08d60f6f0e49 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 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 3850b28518e5..0dbba38c408f 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.08-k" +#define QLA2XXX_VERSION "10.00.00.09-k" #define QLA_DRIVER_MAJOR_VER 10 #define QLA_DRIVER_MINOR_VER 0