From patchwork Tue May 30 17:54:20 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Madhani, Himanshu" X-Patchwork-Id: 9754969 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 D898C602BF for ; Tue, 30 May 2017 17:55:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C3DE725D9E for ; Tue, 30 May 2017 17:55:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B6C21265B9; Tue, 30 May 2017 17:55:03 +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=-6.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,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 2BF4125D9E for ; Tue, 30 May 2017 17:55:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751109AbdE3RzB (ORCPT ); Tue, 30 May 2017 13:55:01 -0400 Received: from mail-cys01nam02on0055.outbound.protection.outlook.com ([104.47.37.55]:43520 "EHLO NAM02-CY1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751032AbdE3Ry5 (ORCPT ); Tue, 30 May 2017 13:54:57 -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=vrZZ7lArX0AJSJraekQ+SskqjSy4E2pdNydHOiU/rnI=; b=cQhK18JZ+FpEazpqB1CmPbggeMY8zexxqqmvC8PL2JYzE58CyQDP2TjmsczUaxY/V6PkZq/EIUDZz+o8jBffm93IIWUkVqZ5isf2EqBTAQx8uxz3U9heExb8jWFu14uQwU63bDaMfR0fxNfcj/oks0FQ/BdzfD2aBoHyTWRo5+Y= Received: from BN6PR07CA0046.namprd07.prod.outlook.com (10.172.104.32) by BLUPR07MB420.namprd07.prod.outlook.com (10.141.28.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1124.9; Tue, 30 May 2017 17:54:55 +0000 Received: from BN1AFFO11OLC004.protection.gbl (2a01:111:f400:7c10::143) by BN6PR07CA0046.outlook.office365.com (2603:10b6:404:a3::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1124.9 via Frontend Transport; Tue, 30 May 2017 17:54:55 +0000 Authentication-Results: spf=none (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=none action=none header.from=cavium.com; Received-SPF: None (protection.outlook.com: cavium.com does not designate permitted sender hosts) Received: from CAEXCH02.caveonetworks.com (50.232.66.26) by BN1AFFO11OLC004.mail.protection.outlook.com (10.58.53.75) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.1.1075.5 via Frontend Transport; Tue, 30 May 2017 17:54: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; Tue, 30 May 2017 10:54:47 -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 v4UHsXx4027039; Tue, 30 May 2017 10:54:33 -0700 Received: (from root@localhost) by dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id v4UHsXq2027038; Tue, 30 May 2017 10:54:33 -0700 From: Himanshu Madhani To: , CC: , Subject: [PATCH v2 05/17] qla2xxx: Fix path recovery Date: Tue, 30 May 2017 10:54:20 -0700 Message-ID: <20170530175432.26984-6-himanshu.madhani@cavium.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170530175432.26984-1-himanshu.madhani@cavium.com> References: <20170530175432.26984-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)(6009001)(39400400002)(39410400002)(39850400002)(39840400002)(39450400003)(2980300002)(428002)(189002)(199003)(9170700003)(1076002)(189998001)(50986999)(76176999)(5660300001)(81166006)(42186005)(8676002)(36756003)(305945005)(356003)(47776003)(72206003)(86362001)(2950100002)(6666003)(478600001)(101416001)(5003940100001)(33646002)(38730400002)(4326008)(48376002)(106466001)(2906002)(8936002)(105586002)(54906002)(50226002); DIR:OUT; SFP:1101; SCL:1; SRVR:BLUPR07MB420; H:CAEXCH02.caveonetworks.com; FPR:; SPF:None; MLV:sfv; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11OLC004; 1:H2T6HQqgMTAb/MjIj9CvejaIOOgb4u5TErDNXir1bVmXBarp7oqrY8OTmRnNKJUHoU2dI9oGkv0a2cO43OSZ13g8N7NnSvW5e5CzBJB+U3G/Yf84cHGXOEEab1+i1o4iaNrYOCd6NNjC57y4ZS+FUsIIsBuO0JTMqW2Kq3G4jdnjywROfwIgGlD0yGbqFf20cEuwG0cuA7z4fUsWVYFZ6MOWQPTDIniPbqnNtvzYPrRtSMA2yiVtRe4lbrHtGFdVTRilLJujy7vnTeQjgUbfWUttH5ZrqhdRMqRFSLBJmxZhoYN2YZvNBdWdvAkh6zhl08vub8hReYDj/KQOA56anRjU+12WKXAijs04FTV/y1ZwzKsiENB0OZR9G+Ya0Jh+oOkJz2i7kBBOnXBc+3uM6JEBJOjOTjRoJVagMNGRoPLT6dTweFpwi6sTmkRziT2iL/FttBsNITtRs874PVSbLYDy4tl706qM5k5YX7bqzFPSNQyK4gu5t0r8IXJqjGfo X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BLUPR07MB420: X-MS-Office365-Filtering-Correlation-Id: 5a1c3edf-0f5e-4f21-836e-08d4a784fb01 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(2017030254075)(201703131423075)(201703031133081); SRVR:BLUPR07MB420; X-Microsoft-Exchange-Diagnostics: 1; BLUPR07MB420; 3:sCNmafAOAbfXWUPuxpzRPffX59ywLa5wuKKP5IEVmf/YhhlT/Y3Xb9bol9GdDLbYU1Z75mt+71ynTUihjVrSE/eTR/9PD/udXOz8C5Gm3Q0l+MnTpF3HKy6FYwQ2ohuE2bBWcFzyhgB+KrAhGZJZ92H8tUTilQYYbOzfgqOQhtolbLMfW4ETFG6b8bVw/MJtteL1SJjRzzlPS/2DTzaPgWID+5KounRUiiFJoA9GQKIPfs8vYwNJMKibkUYwjj5icI5tE3GKLsbRefNEYqkSb5ZHTNI1VUYZ5wlUhEQJRl/713yIK9bF3tYxYR3xso0/hUicpldOngE/8MZm2m/eaVKJ9pgaI3qGDPSwfiMIO4X33tpmIagxRtTd4QFY5dq+91Kfx2Nxy5nTznrFIXoUBtgTlFgFUvB+IlSYxxLCXXkftZsvXcN6R4W8cVJlOVVRTlJZv4DE/5md3ZAXyZlRIA== X-Microsoft-Exchange-Diagnostics: 1; BLUPR07MB420; 25:xuDdoCglzaH7eqAjJg9fd/+mcJcJyV4649ly8PdSrksPbTqlGiVdpV5w6JAvmwXACmF+/4BNlC7uOBzKbOe3/kEqwtPOrjvOiTLVqikSdAiFl+W3kUbywIJD1skCyBPmDBSpFxHa42dIMTYrJrapqc6mv2Gv1ZQpNkPLGBWV9LXtuZSMm6MhtwlgghKi8lTint5zLJBktGL1utdcTO14CVyKPqo2xLr8dsHn+5d6j5hJ4xhDAWQI9jO4bRkwLS0ZtLmxmqdcydLzWjhaASHTEt3efwpP6dXboV/Ng6nnPZ0dcAMHaSFqI4Crg99XkfO72tD7P9UUjS4wN5ugDJbJWLE9X6TqX5HRXTqZ4l7Q7Dewc6hec5g0g4Kp2kti2SR2Ex5ttbiziHKxvkVgVALal6SSCnJkoEAwxgie7v5ztF96gWLqcfHn8x9JRcDImHNDfc1EigrJIhmj3i6UnfGYpf8UpHq51AwlIHJehOti8ng=; 31:AGdIFWz2VyFSTpdty0Aehi3O96Zx+pkjvliYi3OgA/O1LLN13wFJTA+IxXdgcvHoeQgh1i5Lm64jcL4Q3A2ceI94YjVb7+j4j8WzbUFiX2ytGcYvWf1bghcWDDdn8JGVU4Mj1HiChTDhxFrrixwJAQjHFx3/QEb+GUgBw3mf4N56wxTYRgO44k15cuMXPV+SSjLMgz4b4myL0HhcBxbZj6guz2UZIx6Vfb2uCud34NiXcO6lRtdTdUprceBIJPKLZfy2sqmzv5CacpxgtCWQJw== X-Microsoft-Exchange-Diagnostics: 1; BLUPR07MB420; 20:ibWeEP088jI9phRa9Qcv8/iE7BEwUQEIEJldkfTd9ODPkuXpWcvtkbzCfdC/AMkNuNacdLndTT2OesD76uuIED3MQJ4xFuTbCHMweBIv31h73PHpjbUoWfYFwqsHF8jsbc8bxT/h3Qktgmt/TAbkzgarBgxOBDpP4/WX+YwBbhL+555cnLqpMo5ZZwxgBy5AzHIzI6q8JsmGA5zrLwSs3z50vHukPpuoE74U7AteVWpe7yFAyCp8onRvXoeEozEO2UnX8xWoezI2EUqXTwx66HnOQButxiYE0rJ0zkv0jtbzPPGUZ3Bajw/c9HsuZLm3SqXAoyMc98zRtF7cYoDbHQFjFd9ipIue2fJJvqyp7tAKaZLKKaPoSVYZgh7v70bhxKuRTAXnnErheHx8YnK+II7PHoCK0RW3QRXdth/9tqTas91YvAD6k31E7gFKKMf9aA6q/sWWG6P0byrPXnkYmObYdaqABEj3LHA53o/Fp0RhyyC0RRuNU3gTUuzizU6T X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040450)(601004)(2401047)(13016025)(5005006)(8121501046)(13018025)(10201501046)(93006095)(93001095)(3002001)(6041248)(20161123562025)(20161123564025)(20161123555025)(20161123560025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123558100)(6072148); SRVR:BLUPR07MB420; BCL:0; PCL:0; RULEID:; SRVR:BLUPR07MB420; X-Microsoft-Exchange-Diagnostics: 1; BLUPR07MB420; 4:nPpPVO9kKE3j+wGIMGOA3M2vqdc3fi8bUAA549kDdNqB5h4PSfbhpPkrUcO8xy42Q3GtUy5oyxFAAr06lVME+qldrnBPJGoWRVYnRK/4vCk6tUYowrUxXjrvbfcJJSYY85HFg7a31jz2ahT6JUmDtOLogZogG1r3sb20KuKrzI4QQNHrZ58/O2n+2BPgl98aWyS+KXJSy62uNJDmONEXpOH5VE6OrxoHZS//Y+npcD7W6gjp1Zyycg4BEXqREq2nLVBPlIoBjm3c+qKr8h0mfLmBFfqL3R1Ji6A6E3UmdSWZHJ2SCW+m1bvco/U2fQHkdhPJVlsOFtBmzDPU3FTa1McscbQV0lqzUOY/utv5Q6qo8wUWXav/Nlw6Nfb+8lceND/GvTHNRNdiHUh231Bc0dRW8DNdEJOlJqAWXoDAOfyHvo+nypSFjEyKXM5LJeLLHDjccPdx6so/KfjAKMwrJGdI4fjGmrNIW1ngD/39q7eQUGGvQ5rgbm4MXUnPmGg5qIhwaJc8OpbRSeufryhJ4MXyaTnw+CUEY4EJmp9tQz90o+dpjEqflvbxZUIrzy+xzvAq3RyYd2NIn6UjHHROrg7oEyWtHwmGCAz/5iEkWM7BQTdIDj8l2iIpZj7mzdCgyfBuR/KrUK1W4TtT9QLw3zQsXXFuwoPCDeGI/O8X1r+i3pi6+Q0XACpk9SyX89eG6FCESsiz5CB+FNWBZnSsv7I0T+Ytg+eKY4R5bcALkSGyMn4hr2wVNJq5R6f8MXFIBx/VrRWCWeoraUTWF6moLo6N5iVz0Q0AfE6BrvtqlrHH6TcidsFlRFYvmGnNrd4v X-Forefront-PRVS: 032334F434 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BLUPR07MB420; 23:Ut4wD3Yf2TkXMg71m40Wb0IHyEwGD9x88ueo3ZtoTY?= =?us-ascii?Q?ClRlWBSMLiyiM6Ro8ekCy3XW9L6rAaWvtW18YNFX9knyx6SlU8gF3swE7x4o?= =?us-ascii?Q?D4pxhMEHc6gQbvqjkmGONxkZISe584Kb62SHgd2XZ6ojAj8IYLazScfN2IvN?= =?us-ascii?Q?AH4Qyo3iSRP9EO2kNsIFBWGYs5mmED1vdpjJGduFB1v2pKEAD7c+Tit/YrQB?= =?us-ascii?Q?XRnN9GldWmwlOjvYQabuqVfVirrKEQ4dKgApI8JyWmJG7OSgDDJaFRuAhAtB?= =?us-ascii?Q?C8XienWaWc2JkLzBjVw0Tffv/6yzwxnXwLRi380eWuu7O9fRiJuprdpNiGjd?= =?us-ascii?Q?MkeHtdbIdHS62IsSFf3AGIrX2/mz1/bDvH3kwlaG+2IZiUEVKfHskC7A00i+?= =?us-ascii?Q?1f2ru168eJwSpIdYFkwCha7kad7tMrhL06w0YrxvQAM4dTDe6WwPYmHRjGxl?= =?us-ascii?Q?sOC9FVQOXKD+k7FLhPmgMnF18lUMNX6bKtRl/vletLbpuZsRbmIgL6K1/CUk?= =?us-ascii?Q?cSiq2HW7f0mHAc1qpYVDqP2bkMHhl48gLR2jhvNB62131TN/wNXCuFwsfPhv?= =?us-ascii?Q?t/t8dNtAz9UUG1QO8zTcCYxyqCpSWnTzFzJMER9Ay9jk8UtaL1MChEGJscAh?= =?us-ascii?Q?3Rc1WIof9D+O/yoJPfJGIp0socjsGGLJ5d7PHncqaBDy3cCjcjozsHoSjMZ8?= =?us-ascii?Q?+naB8lZ7NKTpHd/+i/JA1O+25/XSxwTgHR+LfnIqj+t9ufD2PBCYSUJJtVm1?= =?us-ascii?Q?aTIGb2XCx5QQJhs9g6JJ+Rx7cbhnDLUh+A1kwegWHF+4F439KHE+Ohtq6w1l?= =?us-ascii?Q?A0U9UlIDbLYMPmq5YADocNSuNnnLzXJXPHOD90HKp3ISQfG90ppJwvNSkTHJ?= =?us-ascii?Q?LJauc2Z2HoKdhRT+5XY/7abhOFFSt6qaY9qoZ0MjFaiRNEp+Z4R5A+P+DOUe?= =?us-ascii?Q?ZkZdV/ALAOlYFlhDZn/OzCPkmvQUY2FhaO0uHoSZrIhmzvkwsyf9zyPSBCQx?= =?us-ascii?Q?uyyVBpX4XOtX+RxdRYHi2l?= X-Microsoft-Exchange-Diagnostics: 1; BLUPR07MB420; 6:jDSUF4KIinUPC47KLDd/D0mOvbgr1ufwCgy3Br3TdA082mDIrV4H6JnJQEzTHJkbVtDMAi2LTm23nx1fleiXFd9uhPq/3fcvUBaiMV08bs7b62pCPEQaqVXr3/paDTllTymH9bfjGbJEzwfDB+PBkcSkGTP1rjmoFDOxQ+bsovdj7vERKmLMkijSioNGRn1kYH+qxqbKBNRMndHrHg2KZTg5ItEFIzBtNQQhkpf41qpdyMbYELMxjFfe4l8wqkGVFg80qTPILV0ufoAC3ZtmvfoRujLnHpAgljDWr+fH/9tzFfDr03aHmnBVWt9Z75Jp+Qr5hjhwaP8j6qjeDuUQfgNqubW2VJL+FvSuCmUYm3wDyk5DURI9NHYA3TdHjyb+z3OQT007SB3TjaKxSbr+bTjzcll0UUflH+FeI0R7mO77BLosAqlEiHrSlh6+Da71j3Xiv7RZZyHidtfwdzN2RBmquvWVAz+0CLkOrHQLpHVvwRHaXq6V9+4yxmOmOw6XjY/xPlxknJSWSL9zAqMiBQ==; 5:zNOsAGOSLklYElCLB6kdsjojRyFulWmou3G5LeAYWBfYLI88k/dhCSePuQP76hE1gjVBcJyV6rfcyx7gVUOZCudXYp1w2NaH6sOBZu3/7/tRplgANnOD18hemO+ftl/wWBWLGpl6K0EtmlEBVrbgdw==; 24:r5o3++Lw4rKAFLFzxghGoBUlFC6M2lnfEuZc0fvGVXt5yuJOW1DDuc+OiCaFVeqNaI9RAFTCrxUayBL6uH08gVgttlBgXthSaw8YS/16qGE= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BLUPR07MB420; 7:lC9bYw8rgR0wkZIbsmyoyO8ZG9JefYNC+mpwTxqDwfbDW+UEOqC09YannT10YdGSI4ZvEmnAc2GyZQhw99OtlJjoSsKrxfeDmdU55T6sxTsQWXeUXsEZQW+eZ1Wsyp0kkiTm19giiYIlsCWu0YBsbX7pCdQhW7XZRt3xU4ahcXy3sNqRbucolQvBbGAKmoziNT81AeZzDrJhG0BHy6WzvZGeGcd5Cd0BQvSG5GZbIh8adpte7XZCmb72Zj6surXlr/Delg/C4e3K1zkpmylZT66BihQV/0s+ySp59/A6D2U/c7XSDUPfQyl5HrcEiuUecMf+1JpaG96/xaOrHHtnAg== X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 May 2017 17:54:55.1196 (UTC) 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: BLUPR07MB420 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 If the port is moved/changed, current code would trigger a deletion. If the port is already deleted, then do relogin. Signed-off-by: Quinn Tran Signed-off-by: Himanshu Madhani Reviewed-by: Bart Van Assche --- drivers/scsi/qla2xxx/qla_gs.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/drivers/scsi/qla2xxx/qla_gs.c b/drivers/scsi/qla2xxx/qla_gs.c index 9bc9aa9e164a..5acebaf57796 100644 --- a/drivers/scsi/qla2xxx/qla_gs.c +++ b/drivers/scsi/qla2xxx/qla_gs.c @@ -3118,16 +3118,27 @@ void qla24xx_handle_gpnid_event(scsi_qla_host_t *vha, struct event_arg *ea) if (fcport) { /* cable moved. just plugged in */ - ql_dbg(ql_dbg_disc, vha, 0xffff, - "%s %d %8phC post del sess\n", - __func__, __LINE__, fcport->port_name); - fcport->rscn_gen++; fcport->d_id = ea->id; fcport->scan_state = QLA_FCPORT_FOUND; fcport->flags |= FCF_FABRIC_DEVICE; - qlt_schedule_sess_for_deletion_lock(fcport); + switch (fcport->disc_state) { + case DSC_DELETED: + ql_dbg(ql_dbg_disc, vha, 0x210d, + "%s %d %8phC login\n", __func__, __LINE__, + fcport->port_name); + qla24xx_fcport_handle_login(vha, fcport); + break; + case DSC_DELETE_PEND: + break; + default: + ql_dbg(ql_dbg_disc, vha, 0x2064, + "%s %d %8phC post del sess\n", + __func__, __LINE__, fcport->port_name); + qlt_schedule_sess_for_deletion_lock(fcport); + break; + } } else { /* create new fcport */ ql_dbg(ql_dbg_disc, vha, 0xffff,