From patchwork Wed Mar 7 18:49: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: 10264675 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 D6659602BD for ; Wed, 7 Mar 2018 18:49:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C65CD2965C for ; Wed, 7 Mar 2018 18:49:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BA56D29662; Wed, 7 Mar 2018 18:49:34 +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 ED54A2965C for ; Wed, 7 Mar 2018 18:49:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754560AbeCGStd (ORCPT ); Wed, 7 Mar 2018 13:49:33 -0500 Received: from mail-bn3nam01on0066.outbound.protection.outlook.com ([104.47.33.66]:46771 "EHLO NAM01-BN3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754039AbeCGStb (ORCPT ); Wed, 7 Mar 2018 13:49:31 -0500 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=RhTBPOreRZ4AFVWAUAne8EvOnU7Jlc7IRe9bp4ASUxU=; b=FoF7xb6pUmPWkABsdTmc68KFIQypwsgKXF77pKo0YM9NbpCnFP0XU/QqWllddZOnlh58im60y1PmNj9wyvJsSEFNl1ovWtyhsWrYQ2r8ozt2viXahFYAA/+b6CCgIM5383I28p3eA9kqIUvgPoEQ1CtzshYtBhPoAF6l6IBCaN0= Received: from DM5PR07CA0083.namprd07.prod.outlook.com (2603:10b6:4:ad::48) by SN6PR07MB4223.namprd07.prod.outlook.com (2603:10b6:805:62::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.548.13; Wed, 7 Mar 2018 18:49:29 +0000 Received: from BY2FFO11OLC012.protection.gbl (2a01:111:f400:7c0c::129) by DM5PR07CA0083.outlook.office365.com (2603:10b6:4:ad::48) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.548.13 via Frontend Transport; Wed, 7 Mar 2018 18:49:28 +0000 Received-SPF: Fail (protection.outlook.com: domain of cavium.com does not designate 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 BY2FFO11OLC012.mail.protection.outlook.com (10.1.15.23) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.20.527.18 via Frontend Transport; Wed, 7 Mar 2018 18:49:28 +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, 7 Mar 2018 10:49:27 -0800 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 w27InRp0031219; Wed, 7 Mar 2018 10:49:27 -0800 Received: (from root@localhost) by dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id w27InR7O031218; Wed, 7 Mar 2018 10:49:27 -0800 From: Himanshu Madhani To: , CC: , Subject: [PATCH] qla2xxx: Remove FC_NO_LOOP_ID for FCP and FC-NVMe Discovery Date: Wed, 7 Mar 2018 10:49:26 -0800 Message-ID: <20180307184926.31184-1-himanshu.madhani@cavium.com> X-Mailer: git-send-email 2.12.0 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)(376002)(396003)(346002)(39850400004)(39380400002)(2980300002)(1109001)(1110001)(339900001)(199004)(189003)(478600001)(1857600001)(59450400001)(106466001)(110136005)(5660300001)(87636003)(8936002)(186003)(8676002)(72206003)(81156014)(81166006)(336012)(316002)(305945005)(47776003)(80596001)(51416003)(16586007)(86362001)(54906003)(356003)(42186006)(69596002)(50466002)(48376002)(36756003)(105606002)(4326008)(1076002)(26005)(2906002)(50226002)(6346003); DIR:OUT; SFP:1101; SCL:1; SRVR:SN6PR07MB4223; H:CAEXCH02.caveonetworks.com; FPR:; SPF:Fail; PTR:50-232-66-26-static.hfc.comcastbusiness.net; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11OLC012; 1:YQrDdD7RmxiBOhDq7jmxLQlo0U+o8uICeCRURdKiT0OUCtjhT57VTEcewqgwZkTYZzhpl8EP7OCs5N88gLVQKnfD5Z84y2uq0sgGWvElVC+LTW2NVY94oRsALvFmbSxR X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ae8562fb-3c53-4f09-01cd-08d5845c2858 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4604075)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060); SRVR:SN6PR07MB4223; X-Microsoft-Exchange-Diagnostics: 1; SN6PR07MB4223; 3:2hg5ymzN85ZItXhAfH3z9vh7EOyahTaeZK1QkgmGqGZPNMA3bvTYovi3swqH2IXcJd59gsRYe0BHmLzLyVPRemoJY1UI4RU3yDPZ8izcDGSMkrutxJYcMd9nJbG9i1oz5Dld+zwvlAGVdeK53kDtQQRxn+br8IOhhhhKoqJOY+Lw5IUXrJJhGa6rYyVWeH+eXvGNnhjItAf9qP+bMaV1XRe2uosY1cFPpIU3Cp6Rd9EA/7w3vLDxaKQrHtNgOS3VqGfZOY3yCD4x9L0Cc8FpyVJyvcMvD3RtDf+MsTYTJUU5HPhOXmaCL5lQmCa5LNqyzwUEozkbU9jxX7ACxK32509embO510761/VWcN7sC+w=; 25:dLo5rSdnK0kdF101g6tPop9Zqde5q2StwxxrkPT9FJ1IYVNtdxxZ6Kt+ej76BfoKYYnUv4sDQWmyYvJuE1Ybzcgztj4nITpS36JGnPl+8OO1yM1nB6FPz4/nfmcrTxFyiP6fGyfMmtrukYvABDRwkc1+Fcgmz9TVQTxiOIKMWMCu6gF6SEMJrcMMaEsAImFtPSQ5bpTveQ7OCFG970xzfWNnIVs89JooqWkS+asnBhKhDf0bnqLKd0/k7tAjptjYA/altdMSak+c3msW1KiH2ZOVTICmQFgheTPea+vub4WYbzzpfVBBzB8iqLHU5Atu4P1sF0AvVR3sZgdN05ZRfA== X-MS-TrafficTypeDiagnostic: SN6PR07MB4223: X-Microsoft-Exchange-Diagnostics: 1; SN6PR07MB4223; 31:U2zF9Kwc+dYST7k+RwnWrXhB/PkDvgRnsvra2AMoWwFVdZ9HRfHYVi28deB047EuTva/esihOcK0Kq55nLiWxndaqj+p24kFkpVocctI9HEDb+4PlLPgCIsTFADAQDV/S0IQiNqJskJjTu4jp7wcF/WjL3+QvJZ7ZREwE+2Fcl1FEpDW3pZjeGqzY66UlIEBCrTGZ232SCIZFSg8Fb7j3B38Ng0bC1v07JayhOZbzdk=; 20:lRnkVF93+ttLpuQnl7nwIY0CogpuygNQ+c919WneEc7GIv16CgJ5F/uK7PVceI46HW6YBfv41JgGbIGcAq4sdksQ67DYug5UTid8JcsWqDV94EJy/jtrbbNG6TSY0gJ7MXVTz3VhMXAngLxrzZUKvPKAjyH/Kp2hMmSQBf6VZ2Y9B5wwM+kfH3iWbdRN83B67/xChW3s4oXLFpXyp2BOWFveCDV0VL8WGcP0yTZwKmrM4rX64YEWBHpEkGqbPjzRrCVGiflXn9EP0W2zNVpojlPFmmLYSzUjkum+P/9SlY+TC/Zv9UROmPgqTL5sVioFw2XNkJgso07QLmPXsgf/x8KyMBrQ/WaSaUaJ4/MMxvRVIM6PI+ybOc9S9CrvTmN0KCF08x9PLwN2byRLBB2Okts9qIHOM9XaIVSAhXa/wOcyyUunqVX1My6dtCAH/JSfAW9JTnC3nblRsi1PRKq532XwWpAFqnbmknAxvfWVUrctTWskazNGjVwdyG2T6Rk0 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040501)(2401047)(8121501046)(5005006)(3002001)(3231220)(944501244)(52105095)(93006095)(93001095)(10201501046)(6041288)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123558120)(20161123564045)(6072148)(201708071742011); SRVR:SN6PR07MB4223; BCL:0; PCL:0; RULEID:; SRVR:SN6PR07MB4223; X-Microsoft-Exchange-Diagnostics: 1; SN6PR07MB4223; 4:eRTgKNdejObjNXOM4npXrKvR4xU002UQXmfqMJcUH/BHaU+Bb6AXgNbsBmdV6/K2GTKhBaYEacohsbDXWBHOWO2boe5RPJPcLYpThflYMrtXib4mDV76g1Cmwd7vIJVR1Kta2+Aya8BUiozOd3rcPElXBjta+CdUmbK8llFM6hnKiF//r/Nt1Vr1YMO6lfTRlCxqJaW44LBv/O6nmVDAmhtAa2sEmdmm/ZXFKk3IVmdGr8HeAqQGRftSYr/u36oedSmvvt9DY1ftUrgiJdxkHw== X-Forefront-PRVS: 0604AFA86B X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SN6PR07MB4223; 23:oPX0gvrw9pQan+EHyizfsA+fQH48qUY6BCNepwt6h?= =?us-ascii?Q?Y1tmNf08CckEXRTplJrocqAs2dheIhA0BXbLsA8LPL1KIpfNS2oFnv3emkjr?= =?us-ascii?Q?a1u7bN11sd2Z5TFlc1kTH37deXNzMT/PpZfrQVQZwkNLjjqneyNesUWPED7V?= =?us-ascii?Q?/JSE9Vdz2LtJ8CG8gBrGGqS2dy66LQ1He7t8z5brZhGxrL4uCJxHWlT4aStN?= =?us-ascii?Q?lpZEUXWiC5ADl1vNrEW7ierxHIeP3lJuqwl5Lw1F196IHuDSdieEQq+i3iXS?= =?us-ascii?Q?gj7Join9hc6wImoCIifjjsfIW4ox4O0KRs7Ei5dhD5HQRCncz0uHI2AtuioM?= =?us-ascii?Q?fze1inHIHUgls/Rwfkx7FeFfOydmWbQfJEfLfL86cStNDRS9L4ZCrNpn7LGi?= =?us-ascii?Q?37NlTiQFZ20o285pb8xYKpwppbg7EWhV/jk8vBPQHRGHisYb5O+r3V+kXve2?= =?us-ascii?Q?KJBQ5IM9zZa0NWRE52p7uod+drBaWh0huXPkE9/LGfGEDxmRRGVFKi5S1bM0?= =?us-ascii?Q?nsBuhjcqERkVs0eeuzSQS+0oy1FTY4AR44FLUyCFx0kbb3RrlN3fWWcS4xWY?= =?us-ascii?Q?IP2GtwNKL54ro8bXnREWf+9ZGhtZVH6WlGWdbbtvSEawTUk+Vp46Yenr2hHE?= =?us-ascii?Q?dW1TTSiJS3zoQlDTSbquzSyigb8gffza4NnrS6CSAOTV+IA27dQAzxtcCZK/?= =?us-ascii?Q?GRmYQrhX6K1lLJIhnnwm0zCE00ucnimYwVetbA4KiH6zqwo1wa+Wsou4tTzo?= =?us-ascii?Q?CMBdvBaXdZ5jcZCvQ5TxRKZLbWh2RSbSrlR3/MmmmTSp9HIWrmxWpegOEI/8?= =?us-ascii?Q?9z+igXrC1S+/VEVDyKPBf7o5fmpxu28VoTwBTU+2weH4Ki43vfXPlxmQLLhx?= =?us-ascii?Q?edwQv1bleLpqWHRzBVVsQOhDpFeJzwztVWN97X0dNxDMglcxMicqx6cNaCnV?= =?us-ascii?Q?q+cR2fhYU74ACV9rvQxHESuXzWeWsEQoL19W/vn8Kv97pozBmBIEZhGnqfD/?= =?us-ascii?Q?vlibpA4nOBuAHjoQQWoNWnELtHQ0IdlyPSNfz2MvJm9Ns4YdC6ERVxCObclE?= =?us-ascii?Q?VkkX5c90ikasi48EMUH578maDmD?= X-Microsoft-Antispam-Message-Info: rTszxnicUg3A370gtx4mYSNGPphuP0BPpz2rJ6j8UTITtHxfd3ZZBeCUs9BX3U1KwdnprQb3S9f9qzLOFFYZW9yiiFq9HZKrAmqjite6/DQ34eDaA+ev873uNnKZXbfqlKSxTCHifGoRLhxbrkKhgc9SATndnK6kmWK4GBhYpvyYAExnnuq2wlMadQOGh9+Z X-Microsoft-Exchange-Diagnostics: 1; SN6PR07MB4223; 6:6eKIaJSCg6/bZHlhooWfY0flTMJbIqrZDUYu4wvogyx42czMxmX8lZS0LCfq29cOqoSUnfFj5qxdRqk3TxBu0+ZdXZdLMuSgdTJr477UC/QZEArXwUCAZ6lx1L/jkA+Ci4oS0w8TSUnTLE8FWVB7g/409XmYTg+zDMJryRFTIQB/46h8ForPV0tbey9p4I4puSLzyaEiE8OA4UBn/XGyDqFeOo/5G5BBTwgAqZxIDOtk26lxOt2mRZWZEdsoaDjE875oc1zlIGPYQSZhU9vGl8F4Mt7HYN5zRKpxF3Ez+AD/KifjdPJbRQTyF3waRBTQynz+OpKCuU67a7wGmnuRAqn8/KzBPqu8Hj4XS3NiA+U=; 5:SNN9w+Luxrfw6s0Qf9RcT8xLw9EmWhWFo3HSyKQRGoyUF0IPQZe6CljWBe26QPXZu+r601Tn0L8H2r7AxmNnVPyWBR4xA3h7o/6A4ZAbgPwpaVXNf/olE0GUrsLkv6zRw5UAlfPaQide+To1+0Ew3OkO/OneIzlZfWl05rzRvX4=; 24:YxBbNJmd+f/qT1GzVH8ZOKZ1GBfhuGmFZcd3F8qVRJHFCWgaHEXUWDk1R/VE4eivGCeDiCacEC2daXlKRE1Pn1TrFZb3AVXo7Iiif1repvE=; 7:5I1TSUmmcgikCXL5FHCLawG/f3rwF/eGnZKMzdieOhP6x2I3CvrbZsvyF5nspRm/LFj12GApD0Ub3wYseGYGF55YtNvfInNaqUdXY7jF+tExO7YQZ2is2YAuGKud3qmHh+yFhiuHMvfnri7reQQ8P+TpeZJ/8vNNIXehqFldrfOZWWuR4knQb9VTPvaFgAqGHrIUoJ70x2B8dMTfH2DChLfSqkgKJgSL0RHgrgMwTh9zP6fl9TAisuRe6ITT0UVM SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Mar 2018 18:49:28.9323 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ae8562fb-3c53-4f09-01cd-08d5845c2858 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: SN6PR07MB4223 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 Commit 7d64c39e64310 fixed regression of FCP discovery when Nport Handle is in-use and relogin is triggered. However, during FCP and FC-NVMe discovery this resulted into only discovering NVMe LUNs. This patch fixes issue where FCP and FC-NVMe protocol is used on same port where assigning FC_NO_LOOP_ID will result into discovery failure for FCP LUNs. Fixes: a084fd68e1d26 ("scsi: qla2xxx: Fix re-login for Nport Handle in use") Signed-off-by: Himanshu Madhani Reviewed-by: Hannes Reinecke --- Hi Martin, This patch fixes the FCP discovery on same port with FC-NVMe enabled. Please apply to 4.16/scsi-fixes at your earliest convenience. Thanks, Himanshu --- drivers/scsi/qla2xxx/qla_init.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c index c4b04e807e12..cb182b102bfd 100644 --- a/drivers/scsi/qla2xxx/qla_init.c +++ b/drivers/scsi/qla2xxx/qla_init.c @@ -1719,7 +1719,6 @@ qla24xx_handle_plogi_done_event(struct scsi_qla_host *vha, struct event_arg *ea) set_bit(ea->fcport->loop_id, vha->hw->loop_id_map); spin_lock_irqsave(&vha->hw->tgt.sess_lock, flags); - ea->fcport->loop_id = FC_NO_LOOP_ID; ea->fcport->chip_reset = vha->hw->base_qpair->chip_reset; ea->fcport->logout_on_delete = 1; ea->fcport->send_els_logo = 0;