From patchwork Thu Jun 7 05:19:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Madhani, Himanshu" X-Patchwork-Id: 10451147 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 3AF2260467 for ; Thu, 7 Jun 2018 05:19:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2C41829653 for ; Thu, 7 Jun 2018 05:19:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 212102973D; Thu, 7 Jun 2018 05:19: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 AFB7029653 for ; Thu, 7 Jun 2018 05:19:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752565AbeFGFTq (ORCPT ); Thu, 7 Jun 2018 01:19:46 -0400 Received: from mail-sn1nam01on0070.outbound.protection.outlook.com ([104.47.32.70]:63520 "EHLO NAM01-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751974AbeFGFTk (ORCPT ); Thu, 7 Jun 2018 01:19: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=8YI3hXdEP1LYlPHwcFVUZUXVlgngiVRqsDAz7ZV6tJQ=; b=DhcLTRfLCCBRJHmlgP8x1V1XzgR/vLhJyHOD8nVQIY7EzRR+HBoQs+AInMyb5crl5b4WAXECHjUVeg2fNBmWzhH/G20q1EI28x12+AhpJmopBpj/hAomPZXu8STvBjvn+hN+U+etI2/igxCpy6HEjOU4DxgkmF1TTbhbQpfphrU= Received: from BY2PR07CA0090.namprd07.prod.outlook.com (2a01:111:e400:7bff::43) by SN1PR07MB1519.namprd07.prod.outlook.com (2a01:111:e400:5838::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.841.14; Thu, 7 Jun 2018 05:19:38 +0000 Received: from CO1NAM05FT042.eop-nam05.prod.protection.outlook.com (2a01:111:f400:7e50::203) by BY2PR07CA0090.outlook.office365.com (2a01:111:e400:7bff::43) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.776.11 via Frontend Transport; Thu, 7 Jun 2018 05:19:37 +0000 Authentication-Results: spf=pass (sender IP is 50.232.66.26) smtp.mailfrom=cavium.com; vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=bestguesspass action=none header.from=cavium.com; Received-SPF: Pass (protection.outlook.com: domain of cavium.com designates 50.232.66.26 as permitted sender) receiver=protection.outlook.com; client-ip=50.232.66.26; helo=CAEXCH02.caveonetworks.com; Received: from CAEXCH02.caveonetworks.com (50.232.66.26) by CO1NAM05FT042.mail.protection.outlook.com (10.152.96.155) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.20.841.6 via Frontend Transport; Thu, 7 Jun 2018 05:19:37 +0000 Received: from dut1171.mv.qlogic.com (172.29.51.171) by CAEXCH02.caveonetworks.com (10.17.4.29) with Microsoft SMTP Server id 14.2.347.0; Wed, 6 Jun 2018 22:19:28 -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 w575JRlE028003; Wed, 6 Jun 2018 22:19:27 -0700 Received: (from root@localhost) by dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id w575JR7w028002; Wed, 6 Jun 2018 22:19:27 -0700 From: Himanshu Madhani To: , CC: , Subject: [PATCH 07/12] qla2xxx: Fix session state stuck in Get Port DB Date: Wed, 6 Jun 2018 22:19:21 -0700 Message-ID: <20180607051926.27940-8-himanshu.madhani@cavium.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20180607051926.27940-1-himanshu.madhani@cavium.com> References: <20180607051926.27940-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)(39380400002)(376002)(396003)(39860400002)(2980300002)(438002)(199004)(189003)(44832011)(11346002)(476003)(2616005)(126002)(446003)(486006)(51416003)(76176011)(42186006)(48376002)(50466002)(54906003)(4326008)(16586007)(316002)(36756003)(106002)(80596001)(47776003)(336012)(69596002)(110136005)(186003)(26005)(59450400001)(72206003)(2906002)(8936002)(305945005)(478600001)(5660300001)(81156014)(81166006)(6666003)(106466001)(1076002)(50226002)(86362001)(87636003)(8676002)(356003); DIR:OUT; SFP:1101; SCL:1; SRVR:SN1PR07MB1519; 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; CO1NAM05FT042; 1:fjB2N6f67geLvX/AhNLsmEO4zI7YdDeegsvxogKZNGfMPGM/lPM4A1eZ1WU5DNWVYwwAmJ5OO9r9hHlFhpUDC2TMQVErPLuh0Lv+Gpud541lLUhhe/ZK/+EQ896/G/4H X-MS-PublicTrafficType: Email X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(5600026)(4608076)(2017052603328)(7153060); SRVR:SN1PR07MB1519; X-Microsoft-Exchange-Diagnostics: 1; SN1PR07MB1519; 3:OhHFRBEGvzKXurE6KYnUYxzPK/KVTtA/o32EZpq8wuXMIZ87lduE9K8GVIi8h7cAkEMtnoe3BoZfl/MgK7vybmICGFm+BcB+NmbpKPRl+rscOyw8N8wUjOtVMQh7uowIITepZcFW/21lL2XJ90NKoF8ezJZnKCR5nO1lmMENkV+DrnEnYYBOkxUY8qLLHGhalEsBdHktHb/crwZN2sV5c0CKLDy3K9ncMOTXPl5P1Oz1zbT9v+vzSMjeWo/79b0YC/R1EoVYK+7H8pUMW7kYXw62hR12WGv/kHgdwMgvLSbYu5r+NZ2VAJHFTibxc3qpMoyqMoaYP9dFuwF8ZbYhoMF6/DWghqWmbqXLwRN5Baw=; 25:a2+0YY/cAHpPrgkhxcmDgWhimFstsuJ56a4YrLvKs+YrI+sEMhUrU3iUV2HwDT+f2oy0sefShm2XT3rLEATsAZ7xsKEc8tWIp11XIb5KniB+YMOksy+1Jf66SAkrdcQcYnsycozJ2ttXs7cy5mKJkP/NgYUzedT76Wt/kql1D1JPoHKqboib0jFv0/SSE7e7sw0Qh821iJIR5d/VSviUWTn5LN7P8aFy4C7M6QLj8zVxufHvCVn3FqTiLQuo/m6LsZlwWlJBG3BWTmFq8PQmiTH+ILeRxoLS/yZOV2qIws3ljZXRyhqmsjAB4FmZXgbeWsCHm9YpV0bXgLnTy2tYzA== X-MS-TrafficTypeDiagnostic: SN1PR07MB1519: X-Microsoft-Exchange-Diagnostics: 1; SN1PR07MB1519; 31:EmhgyZY6rVTleyfbsw4E0+PByv18vG7Mb0kheu6kXxVaxiEtYNbSUWjxCP48r3oqE0aIPDCs1TVpEMUUspg8enkJ2U6FdLQVPslqKsebqpBDHVM+7u+XzeBdoJyssGSQMRt+bxyEf7uMYLvMXDQKSBSWbufUH9rvAmOXsnH1ldDkCw/rA29+j4iZSHrpjgtGLl5F75H3elvvL3OdySchMCCVn0hAsX9uFbaDsWUFCKo=; 20:jl68XIsWyuIzaOoH3augb16cgNcgn2dS601f33JYUaF5uwueIzN5NKPi2xkZI3M+tEA1IkjwffwroBW8SGhQkinGmQl5yLXtn74NlmT/dyXrryPDERaEHP26ui57PH9vfSi+yQRKAGHpLysWPpno8oSsTC+yXDhQ6nOocVbkLAYjC9hZPCedgXaG/bAlxM2nMV/rUGSPYdVSamzs1+vMBbGH7vawfHljxAjioo29v9tTaEhSuBwEJD5F/ue+oicqXhu51yA5ourL+lmrwfSf/4ltjE3i8itZtFFfBQGwlLaQBAF3wc7/qlCxAGnn3G1P0M+t35yj7ippCWneuBr8JAocnKnohOBop6YE05OewzhyY3KPX3sa3wPHOF128qp872gZ850lUhen/fkRLF4N853zSYiOlpplaw+IuyN7Hw3Kx1Kt6vyt+axHUiTS6VjIi7DMyqGOc3Fw+oJlJri4K0oe4dd3nNcBrIsi1Etk0WBlGbWCrNCw7gvsWXVNJtph 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)(3231254)(944501410)(52105095)(10201501046)(93006095)(93004095)(149027)(150027)(6041310)(20161123564045)(20161123558120)(20161123560045)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011)(7699016); SRVR:SN1PR07MB1519; BCL:0; PCL:0; RULEID:; SRVR:SN1PR07MB1519; X-Microsoft-Exchange-Diagnostics: 1; SN1PR07MB1519; 4:VrAXn699aFhDIgPsfa0yigHW22pSMm880mQ/KVPdKtec7WakWu24Z3czehpkLUYia82MGNvJkh97tAoZ3M18x7NtILM1t6aG9LjSCGKNHvGeyNCUSc4xiYW/9LbpPDNe6dMelaJNeUnSGcV7KxsD2reYv0FqgWrKKtMPW6h1uZvqCMl1GnBhJuuAXOUOUKqHhTemv5sE7DPd5eCcffkkx6GRSawakFCEbfysfiYHbaY2FpTKE/bdPXqSE5xUhny1iypuq4k7uOM8k0agVdjgAg== X-Forefront-PRVS: 06968FD8C4 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SN1PR07MB1519; 23:wukvCkEguEJMFT4N1NaGQNszKDkKppt4/HbyPm3MD?= =?us-ascii?Q?Nt2LC5Mgv3gIjoj6Qfe5HiaYBBGvpsjspK9GrXGAabJBKEq5FTFH7zA0ojWW?= =?us-ascii?Q?UG7PkD5jyHzsrgqAjEn+MZJG9rOzDSKWL008eGL6/UKOyErExWT+PaAQ6IEZ?= =?us-ascii?Q?UYSBmn+aqaXvzZxQWtQ8GF2ZLAm5X6AXeEgG7feGG6xejWZA8G+7nuTvpr/2?= =?us-ascii?Q?02X7XlJbNol5a/BY/YS8bSWthmDjhGLww0qOda1EG3sapeAAdgygtNhnxGLh?= =?us-ascii?Q?U+tDd6k0vI+oyX4uEQ7uVzHqOS7BfqrJx6ZrFU/JoCatDN6SFnD76jF8ta3M?= =?us-ascii?Q?3Gi+v7jyLeGuHDkNFFsZXfuzJjnRdk0vx3rDyfvglkqaYKsfBtLz169FG/+J?= =?us-ascii?Q?yUNWOHa1x040GFi7jIY6AJEosLDePFTLJ1vR88PGhWyEarh4CGRROMwrOw/O?= =?us-ascii?Q?1D37K2JarG6ZkxQ/bZWR9km4eiAr9PkuLfWlvTkqVh8sqgq6iEmo8z/YNbke?= =?us-ascii?Q?g9kM11Hlz9B7BnXtETkgeK9HfgViiGnC3+jpRxPNs7XkArvb4fzW3HB0dqrT?= =?us-ascii?Q?UQ7hecQ8Lk1CGDwI7eXM7jXpSnss9X+nuXV+yfxcvE/mxASrtSIxBe0Inxhi?= =?us-ascii?Q?xAsaxqTmIW3nqt/XM5GdD+7la8EwN9tTdY8pYgPZXGEkhMqZsW0caUj/DVuI?= =?us-ascii?Q?ocgvwF7G4Gpm+k+kLEQh0bo3IeVSDKOY23r9UOQm6WkNrKX8mCISbVpNsfYK?= =?us-ascii?Q?aIFCJ6Vh1mxwgLfyXFF+O0v3B/XH2klVldceEsxQjAe/iPHMAvBPxSBeiO/b?= =?us-ascii?Q?aaRlXNghpw1o5eAk9QY74ojU4jDSN4GgKGMnL8DdspzYRKGEyHNE84imA90z?= =?us-ascii?Q?9+h1H+Ibk75YVUr2cYL1VEYS6WGHeiiYcOy4S50viSDtCKEvS6zz5qJaHFlD?= =?us-ascii?Q?WnDgrWIk4ma6gCPLnGZpy0K1N8KaAvvoNIzjJqF/xd6HFFh/PzobNKu/sFo9?= =?us-ascii?Q?Cl7fG/EHNKCkY8CSSbz7yfgp2IATQKCIFFifOc2WMGg93qKLBDUUc8AjPTId?= =?us-ascii?Q?kWloDLmSw5nSv5sysk4k+wne6xf5UDdLA4J67NwLqszVfgiMwicoi2lsuiUU?= =?us-ascii?Q?uoIPEE+vgsYXXFO9lUU8y+vWwPDA050?= X-Microsoft-Antispam-Message-Info: DRrDHmmV3Z7P8Hc61jmz5q1xoSQ12ffll1BK7mW/I4u4XX4pOOZoTW7Wj0EggBZYz/zFTTa2ryDpg30NUN3kFFffACEXG6TNZFWncHYPYm1kD9BSaINC7GbN4wbtQjV1UruZdFViGwTvunoVE/wMSGhGAIwRFgo8tan0q47Pq4qG0Hwjq8YX6VyfV8s61Xit X-Microsoft-Exchange-Diagnostics: 1; SN1PR07MB1519; 6:WwLuCwpZGXBrpUMgOeADbfRUqUEfkhG5dWu4a4UU+BYPmqkgufeK6B5RzBYnJ/czpWEvErVjCGKZTN8mtVM+h0mjJzWgpeX/e/oRbn9lIWwb6CkDLceTvtqYIIPoABIvNryP+tY70aVmTbOTF3tIP0NOWwrB1B9lZU15Eg5DCqOHEOr5e63NpiNhjoV1mtV2s/+lZaZvq3zR1zSpO/vCma/pbopzbj84NJsKYpkCcepf/9zBOmSKIsRPi8o681dvWXrUeSZKizJ+7T81gfr5ZKRrN0HTSbx5yQz5hEq0WMEyXIDpBk7rdkrXAW81TtsdgfmzcaKvZVxWo/Qs/1kJ+vbOeModMGen/DDn+7w+qwcmMxjXkUAm78tHQo1UsUBKiw8h7Z9kkLzqQI166I12iceVyoAldeSrr4Y6EV6CvS187UhsKiQkpiZG+IbnZ+S/9Tlo7k65XuOgt7BY48bthw==; 5:yFlGI2IEi4fMSk8ifdeknJmm8VC+6FK/OV+TmvBEXJ1gMAWhVmAaRUkD4IB+xh65wKHoy6qzBCz73TAYY1EiF//Nvzgb9JodQLqGN+x3ghVzVV2MzoxhKkYdc/EnRv8w5il9t/KGJXKVbuy22P7l48th91MlVrlOUeY2pg+cAuk=; 24:J5mVR/JwCTfirjEzfbsOVsrhhfefnWF5eXfkdkXhS/mkEuBUW8gf/RIs4q6IY29BdLqUim59ilRm78Wvj1rDL+cEWHvp8ZAirmFchK+Q2yE= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SN1PR07MB1519; 7:mxanZFQghGvBHCC1rl+vadaHagPdC/oOZlq4iyJjFnaH8hQ/X+6jGHlU3/1ziI3Eyq4vNQshiwaUqSwsu4ffyj4d2s2GpOQuZNyRKCJC9/YKpMloEU1BxVLQar4Isvs3AhkDxSads3+U0qAoM7PxsFlsxS2EFLx4fTooT8KdsWEA8EdFv94aRCRxW8wyPd0YTFGPSqi/mhSidyD5t1XkcjbgKnlzGbl3qnwhomtJX3z1hQFajqRo+f5SKZGdzF+B X-MS-Office365-Filtering-Correlation-Id: a173844d-ee8b-4bf3-ce85-08d5cc364399 X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Jun 2018 05:19:37.4746 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a173844d-ee8b-4bf3-ce85-08d5cc364399 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: SN1PR07MB1519 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 sets discovery state back to GNL (Get Name List) when session is stuck at GPDB (Get Port DataBase). This will allow state machine to retry login and move session state ahead in discovery. Signed-off-by: Quinn Tran --- drivers/scsi/qla2xxx/qla_init.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c index 530d6e72d974..78d9c96ffe78 100644 --- a/drivers/scsi/qla2xxx/qla_init.c +++ b/drivers/scsi/qla2xxx/qla_init.c @@ -1155,9 +1155,12 @@ void qla24xx_handle_gpdb_event(scsi_qla_host_t *vha, struct event_arg *ea) case PDS_PLOGI_COMPLETE: case PDS_PRLI_PENDING: case PDS_PRLI2_PENDING: - ql_dbg(ql_dbg_disc, vha, 0x20d5, "%s %d %8phC relogin needed\n", - __func__, __LINE__, fcport->port_name); - set_bit(RELOGIN_NEEDED, &vha->dpc_flags); + /* Set discovery state back to GNL to Relogin attempt */ + if (qla_dual_mode_enabled(vha) || + qla_ini_mode_enabled(vha)) { + fcport->disc_state = DSC_GNL; + set_bit(RELOGIN_NEEDED, &vha->dpc_flags); + } return; case PDS_LOGO_PENDING: case PDS_PORT_UNAVAILABLE: