From patchwork Tue May 1 16:01:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Madhani, Himanshu" X-Patchwork-Id: 10374145 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id B226B60234 for ; Tue, 1 May 2018 16:02:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9F8E328426 for ; Tue, 1 May 2018 16:02:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9428F28988; Tue, 1 May 2018 16:02:10 +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 3158528426 for ; Tue, 1 May 2018 16:02:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755987AbeEAQCI (ORCPT ); Tue, 1 May 2018 12:02:08 -0400 Received: from mail-bn3nam01on0059.outbound.protection.outlook.com ([104.47.33.59]:62176 "EHLO NAM01-BN3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753851AbeEAQCE (ORCPT ); Tue, 1 May 2018 12:02:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=CAVIUMNETWORKS.onmicrosoft.com; s=selector1-cavium-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=8BUbOegtpIq/FSHDsKVEL1ari/kikDhgJv44y+LtyII=; b=BxFvCAPbs7OqiQsBmuge9qUfETlMiVEqJEEyWMRj3gPcA0Y/8t6IzJ+UoP3s3jtt4rdshI+zXZb7yZprRssUs8t9ADi3qY/90uirbrig68hqEUTGUhrxq6Tj5qBxJoddWwoxya71skdVX6SRKBwUid1Ofw0C8H5jGKRlM5qhxec= Received: from SN4PR0701CA0015.namprd07.prod.outlook.com (2603:10b6:803:28::25) by CY1PR07MB1512.namprd07.prod.outlook.com (2a01:111:e400:50ed::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.696.15; Tue, 1 May 2018 16:02:00 +0000 Received: from BY2FFO11FD017.protection.gbl (2a01:111:f400:7c0c::148) by SN4PR0701CA0015.outlook.office365.com (2603:10b6:803:28::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.715.18 via Frontend Transport; Tue, 1 May 2018 16:02:00 +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 BY2FFO11FD017.mail.protection.outlook.com (10.1.14.105) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.20.696.11 via Frontend Transport; Tue, 1 May 2018 16:02:00 +0000 Received: from dut1171.mv.qlogic.com (172.29.51.171) by CAEXCH02.caveonetworks.com (10.17.4.29) with Microsoft SMTP Server id 14.2.347.0; Tue, 1 May 2018 09:01:59 -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 w41G1txu027962; Tue, 1 May 2018 09:01:55 -0700 Received: (from root@localhost) by dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id w41G1tpJ027961; Tue, 1 May 2018 09:01:55 -0700 From: Himanshu Madhani To: , CC: , Subject: [PATCH 03/12] qla2xxx: Fix Rport and session state getting out of sync Date: Tue, 1 May 2018 09:01:45 -0700 Message-ID: <20180501160154.27915-4-himanshu.madhani@cavium.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20180501160154.27915-1-himanshu.madhani@cavium.com> References: <20180501160154.27915-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)(396003)(39860400002)(39380400002)(2980300002)(438002)(199004)(189003)(42186006)(16586007)(5660300001)(48376002)(478600001)(72206003)(87636003)(50466002)(86362001)(305945005)(4326008)(186003)(356003)(47776003)(6666003)(336012)(2616005)(486006)(59450400001)(50226002)(44832011)(106002)(11346002)(476003)(36756003)(446003)(126002)(51416003)(76176011)(1076002)(8676002)(81166006)(106466001)(81156014)(80596001)(26005)(316002)(110136005)(54906003)(2906002)(69596002)(8936002); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR07MB1512; 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; BY2FFO11FD017; 1:jDei5mKLTMRvpQLL3y5bZQGA5qfXNgxqpfEoQCslT+pfGhUi5fotnP4sJVtnHERP41lG6nc6aTLaljixq3iRsZc14Hezy1IzUMeKT2DxcWlYA7/OxTmlcjk7ILlMYce4 X-MS-PublicTrafficType: Email X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(5600026)(4608076)(2017052603328)(7153060); SRVR:CY1PR07MB1512; X-Microsoft-Exchange-Diagnostics: 1; CY1PR07MB1512; 3:LeMct/yn8tU7Gl5ezwRUroDUVTIZmnsY5NzZQ86UMlyvWA63ShTwAuuXtbYiWsY2S9UMAmgohM88a4Me4bOPtvnTcLdOoU8Afx8aZ11V8sfxI2QZJnlE3BF2df27PfXMiDvuv4TPlocvMGA5mD6BwQhJLU1xBBGePdfhPVHibcMpErxZAwvSHKtLpfzVhhphYdud9YUhgcTZllqm3Sgt9KeROAVN0iLD+PAHl1dSWdOM8qxNKqQexnhRMbJk/6AinaxES9l4H5KCa6wZmh5zS5SxIw/qNa0zX0xBnzeGo6Hqos63efI81/vsqR6CRBsav393E4xx37smI0w3bCYRqQ==; 25:VDl51t0HWj1aIJK9XHs1i/FgHKY628HzgrjS/8KzEu0Zug5QzCiw1R67qiyrN9CvViuvR0cCQCRp/qdhBtRbnutqVTps0yBSzgMgBFi09jYAkBVf7YEqcZxVFP/dFVgCS3Uq8Ei8j+/fLr+4aFpm2b7lYMSX4wMKsLoVxUm0SINBbDXOM13Cp6hbNLHi1Rjw8rJj7ttxVgW/dAh/nA2AXkw6/hUOZIKi8NQYX/xrFMQNRot6tTBb1uECtNTj2c8JaQ1+qkp+/6WDibyLzxKqktsPdB3J8Cfthp9RySXLgE098Wnzhgv40EKwlBUQoQzsUKCyA+sJ+H7EKOcUppN7lA==; 31:FsuydN732KA2Dgk6rS08oAXFYYvEeUska1eX82K4Z3fTbwFgOKovo/puHKuvH6lzX/9tlj23UW8TiAwsVXWieWCHQEgiSU6jAVcOr8QeRk8/R7z1ZRAjmB7EoUyFFGhqZx1M7sAtlNk5wAeG3CJU8jeavPNtLJDJ0VceUAOZk3K76H0y6S4tq1nb2c0/GOR1ZComTd6IcQ1F/MNJlYQkG89FTP4cGHo6MDxMac9amac= X-MS-TrafficTypeDiagnostic: CY1PR07MB1512: X-Microsoft-Exchange-Diagnostics: 1; CY1PR07MB1512; 20:bhl/10wxUg4qcu1N8NKIKnMmVx7b7WdiStMyxk9Ht/HUGxcDKR193YXc4YqkhReht+UWyBmKNEmratR3f8+ZNqO5H667bIEm/Gsp29fMwWK5FuZ4Q5MdbihR/wqRVmoYXfFGcYozYl/4ZaPEByS/Vkl8vrQp/9bUGw0rlKmEeUWVi1FxxrMKC+FioVvr97B3u5V2ODH6zcRgN5XscDjTclsvpKu3o0lsfzvOIs6KrR7bjiMJpcVpZkVWJ4UIksX+daHd//ZCuF3HLC1aOH7VaiEvR0C6sxLbsle0VQJzKIUxF8bVYFeW6ENoZ5sjZ6tuYA3LUjO8hxPcMNIlUwJsK8ao2QMnfztAGQISUOfX4yAlBzzA4HLErOBE1rB3cbbkKtQcgh+oxb1t71QTspShjuqSPbXPLnWIFKIdDtJC0A6MIfCtBLEC8PRAmuPgL14VNROHjSCdCvOZlI3KTwXlIMzwLbd1JPI3uXApmZPXc7uFpuLHRb0Yvhvvqg0SsNtu; 4:EBuIm+SVISE+eggrQox+VmBe83Ii7RoRIxfVM+TbLp6Kcnls3p8luSNxzej775mtj1rDF6f7w8Yjc1AIiCWyeCBbxNsWXWSfw3bB8hXOK+QmdDqDe4L+8P89HoXQNLiljter0tpMnsdEg1SuSxZS8V5wRlh9U9Iewrc9yfShIuwZ4JRLsITPTrB2J+72VDo9INNiVvv1lI/bRRlWEpBtO77NVK1L1A1v6SydoNa6mBCVbUhB2sVVSAHiiOLWH6fU/mp7Wd1PKyeb33zbpbOdlw== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(93006095)(93004095)(10201501046)(3231254)(944501410)(52105095)(3002001)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123564045)(20161123558120)(20161123560045)(6072148)(201708071742011); SRVR:CY1PR07MB1512; BCL:0; PCL:0; RULEID:; SRVR:CY1PR07MB1512; X-Forefront-PRVS: 06592CCE58 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR07MB1512; 23:WOXPfdL0S5zBcmRoKIbuIx2FTDU4C5PWdBFGn0wde?= =?us-ascii?Q?ri6AgF6aXJCttZuO92/K8JfsrDlV7Ze1ayA5DTp3mmbiLMi200OFXacBZGsL?= =?us-ascii?Q?28T/EYiPonFh2inBZhlsavwLVwnV3bjcSEFMExfOY0//H4QT37Jh/5BN2YcJ?= =?us-ascii?Q?Du8O9/2rSw4aQQx/FLyfY1b4jZ6OKZ3Fdg1JW18exj7TAs66PcrraBLi4orm?= =?us-ascii?Q?3NIQ90G4VEa8L6F31oQ86yt6ZxbKIKlxICNNewghUSVFEnXRZ1Etf4ZFNe0k?= =?us-ascii?Q?P2372C9EvikZZ98fAwif6+mstytRkaQROHTXy/YROObmI68rZSFIJFiQQ8rN?= =?us-ascii?Q?x8NXf3lgNTZsgM3NsIkh6b507VWfHQhjxcUoe4qkYU2yO/gjaIiYaaUCqQX3?= =?us-ascii?Q?iUN6UZuP0IV5XJFbQoN6c7f1d7TxmtyXQDxDljQbF5a5iI+yMZ0Jg/Q8Bv1a?= =?us-ascii?Q?mPc/ITvyJ1gVHNFhwt04eNcOkTXcYNb6xNQnEPvU6LzUTI8jRbFNcn68nhLz?= =?us-ascii?Q?j40pI4f84MyjaZNpaVhp+srPngW6Jwcx9WTwhyeeYk2KsuI/P95+rSQIKVB1?= =?us-ascii?Q?UiVeWKi5ZN5wUtu9PaukbAP7OnkIAOIvmDIT11Z0ak2+F4iGSp1ZKqszn4s5?= =?us-ascii?Q?PYeRqdihTC8vaDxIlVKeXu7z8D4YHhfhuOuEhWHPnOujEKATH/lkPnLBXNKR?= =?us-ascii?Q?2NiHLrlZuAp9UqFd5/Lv9XeQVVC5eqBFb8M9SpiWS7owmddaYCHBjjQZL0bf?= =?us-ascii?Q?cF8G5fpaSp/5iWmnRrBX88TIk11Wn9sW1sqcCpfSPB5jERn94VLfz5Upzr3/?= =?us-ascii?Q?vSoQwu7tzClOkJ7FXIZTfRO3er7JxzOeZTF/WopzDKwLaAbm+g+Zsw48znsI?= =?us-ascii?Q?LAlkKRwH8zTU9Hjvlm2VPlbn8o9eOW5XC1JAXVmKmYDJNe17jkMfGaqOTS5n?= =?us-ascii?Q?eUi0gjI/T6iSP6hgEv1bxZIsgz7/DDl8AmkACKQnOBvPCpUKmnB29AtWrfz4?= =?us-ascii?Q?2xNRoJ15CBXD0QAbhokENkRTJjSjbV/SmHc0anHy73fVX4OwS2b6YUyAPqUg?= =?us-ascii?Q?K0ePUIv7ZZdWoWwGW5f1nJPSc1OFSBTwP1DlHS4DhBjxZYK38V7p70qBDGv3?= =?us-ascii?Q?ISmYYde6T6W02dUgr6gRKA9xxU7WMK+?= X-Microsoft-Antispam-Message-Info: J7zniefkTFYGgOwXyLCH5LoeobkCoAjCLO6Ls/N5qAtvPn4afDrvSIOQEnFrRYJis5OBLv33k96wNN6pnbnpYU9g3ewSyr1LmqLyJ7rRBCHmhWb/UmmQG8IjHOV2SNXwk2/s3EDsukZt0hlkbEtjIh76JyfVEZjc9dExXWCq71FmxEstF6G9t9nfeKQTuVI2 X-Microsoft-Exchange-Diagnostics: 1; CY1PR07MB1512; 6:klo8Xps9YjNcXl+j2LOplN5kJNsoWJNxLXA+0qTChpnznH0KDUM+vV0o6aigcyM04UBK90UEHD58BDZNaD5RyL3Efg2BjwG7122MTGFtfJS2DiNImMi2X+u5Nq6OFEb2Iw/3EeEZku6Q6cH4xYe6XPgmfxrzl2StIwWmceNcJfOT0Sdj2lpghi53SN+CmlKb1tqlrlT/ADm7fBdsH+WChKzprjU9IG466q9dlwAN0kdBGBNNfUgvJ1QOrTyRI5JNHnGvVFiCAN/LXfpxf8giUoWG2ExNzRP78w0jcyLfSz8gH5YU5YWNRLPqykDu2qKgNfbOgyMrjk9fQE5ufbmjBZteH7yQMluPKz+QAH9a3VP3kf954t3Ac4PyNVxGfE7B0swspQ7YbgJgqJEdDKa21kQ7hnODJE9y9Mc9I6uwZ5kcQmU3Z3L1R0n/OQClbQuHLZ2n7nHWBGL1IObiDFnINg==; 5:RRhaUmM8S8gGBZv8iag+0rDJlIJamHGz4sbRX/GBtldvYwPr8FP3/mlTFIMvUF3kQQ8Svehjn/pxN1tExpt8YQLDpdJdB1MNPueMzsMdG60o3T72hpEPmOnnYWhzWjscB9Jm/Ji3XfEL/Oz0GBAOj5xqLjfgZLxup7NIZ6Hnb04=; 24:lXD0wMG8CQGfoDTqcZ+AQrO8ZKU7JVSbsU3nClbGrzKqA0LtQ/+dd/A6OrVet51BnmI7KAz6zaT/HfiqMdHGN+IISRz/4FBpNZGs7vjmaDo= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY1PR07MB1512; 7:d0wsB7iNjpbh56cq28tO84eKN1DqJEK6boNV4o4QsHB+FaqT7qIkuxqmKPQ45VYEoxNoNSdZM6VUccTiC/yxwslr7D4vlXRbGz0RA1vODH71Z0XecjFrllnlqJtxgkZ2ENI2VMza3eh8klMkgbssYEvRD1aaIY0GF6Z8JkCxI8nnTpoPPwo0cfxbvvg+Ejbq/1O0DX00KE2zhNLvHqV5RVItB/J6PfJJJoQu8IFu7rS5druOVKU1Rd5b4V1KhZmj X-MS-Office365-Filtering-Correlation-Id: 39ee304d-6c51-43d2-9db0-08d5af7cdfa9 X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 May 2018 16:02:00.4005 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 39ee304d-6c51-43d2-9db0-08d5af7cdfa9 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: CY1PR07MB1512 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 fixes rport state and session state getting out of sync. Signed-off-by: Quinn Tran Signed-off-by: Himanshu Madhani --- drivers/scsi/qla2xxx/qla_target.c | 30 ++++++++++++------------------ 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/drivers/scsi/qla2xxx/qla_target.c b/drivers/scsi/qla2xxx/qla_target.c index 025dc2d3f3de..85640707cceb 100644 --- a/drivers/scsi/qla2xxx/qla_target.c +++ b/drivers/scsi/qla2xxx/qla_target.c @@ -601,24 +601,18 @@ void qla2x00_async_nack_sp_done(void *s, int res) vha->fcport_count++; - if (!IS_IIDMA_CAPABLE(vha->hw) || - !vha->hw->flags.gpsc_supported) { - 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); - } else { - ql_dbg(ql_dbg_disc, vha, 0x20f5, - "%s %d %8phC post gpsc fcp_cnt %d\n", - __func__, __LINE__, - sp->fcport->port_name, - vha->fcport_count); - - qla24xx_post_gpsc_work(vha, sp->fcport); - } + 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); + } else { + sp->fcport->login_retry = 0; + sp->fcport->disc_state = DSC_LOGIN_COMPLETE; + sp->fcport->deleted = 0; + sp->fcport->logout_on_delete = 1; } break;