From patchwork Thu Sep 27 05:05:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Madhani, Himanshu" X-Patchwork-Id: 10617231 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 4FD94180E for ; Thu, 27 Sep 2018 05:05:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3DF652B199 for ; Thu, 27 Sep 2018 05:05:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3221A2B1D7; Thu, 27 Sep 2018 05:05:31 +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 950A52B199 for ; Thu, 27 Sep 2018 05:05:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726629AbeI0LVu (ORCPT ); Thu, 27 Sep 2018 07:21:50 -0400 Received: from mail-eopbgr710083.outbound.protection.outlook.com ([40.107.71.83]:48384 "EHLO NAM05-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726469AbeI0LVu (ORCPT ); Thu, 27 Sep 2018 07:21:50 -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=Xursu58qjXRXkdS4VB/DTH/vjn5dLHgMkAYBg3Ejwyg=; b=A2wcCRCdrqcrb1mWq5s8Xz5SqdwyPi6nDjtNOuEpWvi8Cyre2z0bAet0pgOklnrnlOTRG661wmMd2tTWy5F0eQkZnwQW6iuDGohI63PMgs+tKmvsIy07GsCOXfQ/JhM+0EOiDn3NeQqcQ/nX/+jFv2ABaX18iZ6YIcTNQn5QMZQ= Received: from CO2PR07CA0059.namprd07.prod.outlook.com (2603:10b6:100::27) 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.1143.18; Thu, 27 Sep 2018 05:05:28 +0000 Received: from DM3NAM05FT007.eop-nam05.prod.protection.outlook.com (2a01:111:f400:7e51::207) by CO2PR07CA0059.outlook.office365.com (2603:10b6:100::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1164.22 via Frontend Transport; Thu, 27 Sep 2018 05:05:27 +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 DM3NAM05FT007.mail.protection.outlook.com (10.152.98.113) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.20.1185.5 via Frontend Transport; Thu, 27 Sep 2018 05:05:27 +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, 26 Sep 2018 22:05:20 -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 w8R55JDR007190; Wed, 26 Sep 2018 22:05:19 -0700 Received: (from root@localhost) by dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id w8R55JHN007189; Wed, 26 Sep 2018 22:05:19 -0700 From: Himanshu Madhani To: , CC: , Subject: [PATCH 2/8] qla2xxx: Fix NVMe Target discovery Date: Wed, 26 Sep 2018 22:05:12 -0700 Message-ID: <20180927050518.7147-3-himanshu.madhani@cavium.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20180927050518.7147-1-himanshu.madhani@cavium.com> References: <20180927050518.7147-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)(376002)(396003)(39860400002)(346002)(136003)(2980300002)(438002)(199004)(189003)(44832011)(26005)(186003)(87636003)(4326008)(47776003)(575784001)(86362001)(51416003)(34290500001)(36756003)(1076002)(478600001)(106002)(50466002)(48376002)(72206003)(69596002)(486006)(80596001)(50226002)(8676002)(11346002)(316002)(446003)(42186006)(8936002)(2616005)(16586007)(76176011)(5660300001)(81156014)(126002)(2906002)(476003)(81166006)(6666003)(305945005)(110136005)(356003)(54906003)(336012)(106466001);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;A:1;MX:1; X-Microsoft-Exchange-Diagnostics: 1;DM3NAM05FT007;1:oeiR6HmeiTL1LB1ouJj0whByUEjvOpK4Zn5F6crMwQcSctVD1hCafNTNhpkAiIWbCl9POWRdBHfY/kS6l9TQldTzFyho/eY/8vSo7UnD8t5Oi3sZTfmUdAK82Yi3XpUc X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 969d0f42-f934-499b-368c-08d62436d759 X-Microsoft-Antispam: BCL:0;PCL:0;RULEID:(7020095)(4652040)(8989299)(4534165)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4608076)(2017052603328)(7153060);SRVR:SN6PR07MB4400; X-Microsoft-Exchange-Diagnostics: 1;SN6PR07MB4400;3:7/lNX3SY1VUdm5P8yNaToqamQfb3Apdg/bZL7/JqDAroSYRFmRmWTNLHW+NM+5ixglhRyPY1JokyNYQueKZXclZXgqfVaHu2CmFghM5tBGDethuKT9XV1vLnl8jj3IdIx/RtpZ3FKMJc2Q2m3nCqpJNAJUGXcZzW995YKY5ZXxak6sarUFrXswQqcGcHXFCf63bCzBxsT6HFL9FBLTuywB3r2FnGcwnUO9wpaI/ak6Bv2ydlBOZCLIs1iW/cB+P6eZGxm94Rc62geq0tL6Bq93tbcsknvbTP8UOjlHhEmzSlRfzP6x1zppFmgmJOSJr70l0frY9Awv6cvEOfpYdJ1nkJTqYxkiR4dZK8UCRDY4s=;25:eWFBHKYqSm/jFVvrfoSgJkPotY2FnS4bYn2WySI8zSbLtaj5tYfu2hASggd1vrDoyM6q37+t7VGkW2sPFy5xiWL7l6872vbSyafJFEaKDsTIFuv8ZA7dO3mYBbFEU622wq8abtRXtcrzZppxhpE0z02rI70jTe/wmcoqTgU0THyXXY+NeG9w6Naza9/RfWkwvaPgV38cesudOG6w7jrZCYhdxduiaNLHueMiC1z38Jo4VOABvJk0Okuo59h7rwk4SZPwi+OjecsEm40FWuxrDs7podxYgP+XQsuLj4NVYmUGC9FM7nzKe2veEe27wEhFs1NADO0RBBIwwUmDpIlrRA== X-MS-TrafficTypeDiagnostic: SN6PR07MB4400: X-Microsoft-Exchange-Diagnostics: 1;SN6PR07MB4400;31:0CrNsPgVEXte//LSJNmBo8O9a1nMPrkxeoTb5mVLyhCcI+oXRkZhNYc+OoLEr8KACWBwC/yKN0yRVSu0muFfVXHqKVWAA5JHTHnuoUjWdyIlEyDbH0y9zL1HrDlL3uHux2uN0qVq97keUgiKTpJY1lXDJHBixCRg/rmkp64igALGC5PRmZHTPH6qznvwe7U6W24P9WsnXOsMVgtS471aIMocWXc7cXj0sEUFbOFNJtA=;20:wi2RaB5LMObv1SsrDxAsmRULwHNVjMdWiJ2QMv7nvuZFIV+774hjLu/DxoY5iLWIcVedlbI4XojNRjBrZ362Qg6MnXFcgY/1jwIXyjZjteYHw1gmClKyBIPuDLZYsu1M+iYNmEfvefeFrC07eMlm4cWw4z5uuf3SDTo5MF42ZzsaaJVt1wCk1Q4J670e790m3MhY12fVtRBwddGSTjfHFXNI4FUYxSyJcTcfcnbbTPbJqcg/L4jrHaZEKX+6Apg2xTGRy5VK4e5ZTaj1g4pOmTWqkgBR3+92GPuusZ23Ga3aobYZT0Z3i5SgaaFTH9Y2eCXGoa4hQk1MaD4fyir4g+KAq/xX9PhSzVnatoEOfUtYAXA63euIqqBuuqJHYxXTubwPM1Nry009KIz9TD2SLyrjFA7+y82ArT07IF4F3UeOZ0pmUTPP7Kr0M7GIhyLMKMyquYY7tyW5ffwirkMFjWmzLPc5oX7OLydE75A170hj4qgE+PSWh4xsW5mLPBnG 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)(3231355)(944501410)(52105095)(3002001)(10201501046)(93006095)(93004095)(149066)(150057)(6041310)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123564045)(20161123562045)(201708071742011)(7699051);SRVR:SN6PR07MB4400;BCL:0;PCL:0;RULEID:;SRVR:SN6PR07MB4400; X-Microsoft-Exchange-Diagnostics: 1;SN6PR07MB4400;4:LpZyMvZCgN9ZmFjzMrdEhHgKmQrg9oHVIhXqMmqsJ90GNodFXF7gl8iKVUKsBcfbbtG69U9l1uLjqDcN3Zp87pJPUFt67PZXHO4jg+1OmTILOmPEHVPawGkfpOBcd4cPMd+d4eDj/A4f0N0bwjqB+nCKHtVUdPyc6Sj7zeUJC/nWKrf/rIVLS/sQRQ3ajQGRtn6pXdpPcwnV+EpeWISKB6NEimCZSson8zcXMAjbdfQMs1IjdSqXhplxDHt3/BdXtHQk23Ralt8IMskOwnoQkRnTeI6z+1K3+RqtDc88seOthZ+m50p4yd3EUbiTuC2F X-Forefront-PRVS: 0808323E97 X-Microsoft-Exchange-Diagnostics: 1;SN6PR07MB4400;23:0u7PtFih0IPlLyX9rmzW6a/7ZQ/c81xQfrnrHEkIqy9/0Rc8BR1gUq8gdk7aKeuVgIGkjbbjI47bQsPptbXQWXi5pwV9U3BYTNxgb0ZlK2fZ1BeeElmiWcDq3lDr3rwVx7GRva4Q4NkvpWRnyAG0CnDATD62hBGc6H8MZYpr4NaPh+5uAWa2VHTMvykhUA/GFSERZcEzeaBEa7q/iUQGCUJyJqalFx3XVqartxct0NDTZIJId2TkEQLouHLR/ZB9aISMVS9IOKv/bCAWRvixArKYFeG0T5AH9lus8hvCwvZjGn87k5VH1g3LQ+ov+tbiuR8Wd23IbBaB47ZtcXzWY2Ay1J4kD+DQO85Zr0FCE1W/zAtOUq3S/qVXd/NlAg/CF2/AL2k/XEAUbkhrfgtOrYGlcp6jfvwFoalx+30PPDLyVfIOiUOXC/iR88wtJ8esfCG+fW5fIQ0YlMTnldu3NE2b4e395moxxg2q2hrgZSNzaADVkhcD1FJ0aH/LyhBo/DW/xnsSBQXRbWCStyxJJkmoGVqQsSgSLfykFtQAjnu6qYQXKzXkgHh2s3amYgKXXQnik9YFuJbkfasnnkQTB73epUkRPzuMWyILTsqUZVvxumM+oq9s+vqsRduHpKiLIVEnZokgcO0KdpFMXeINVS1D8sMbhu7FZNuqUhRgxM7WMzvALwuRhlSF15mtzVXo/Si8YQKA//QEXP3vR1c15b+WOLUWc1L0okfsWIfZi8qKCs7LtZffKb2SFez+9P3HuqQSXhBYV8Tvd50AooqKW/jqVFh2lV3vv+Zh+x+n9P2hQFHuJCDrJ/imBrfeWdjZr3LNFMJnz97M+tlkZH3D9xFYxRlaA/pGVn7O6LT12/CSfnAdyQWbTE46ua2ai76PdoeNA20sYHNXmpN0cjCalSzY3rfB3Omq2oEj3bYjToVKW7BdiW4MqnRqHxLesVm/IwBtQCTK1UX4CQtsKAlbRPaR7rYKe+IswtsFZ4lMhjA04UMKCMuvg0h3SPPrGGE1gR1HWhZcGhuQuvYeqplgx8ZtFEIFALl9qdWt6vqYqxuW4T2xjadSRy91EicoA0rZKkk5pXvMHfee86YycveTz7H2Uc8OuyOPns0Gpc++ab/S8Ol4XLSAkqs9R/J7vcNjPkvDmemNQOUYAJG76A4Oqw== X-Microsoft-Antispam-Message-Info: VcwC8YdbB47idvjA5fxLhopJCN0P9j6GgO940U/pwf68c1nwZr2LeyiJ4UtHi4kmf5rQgr6cXbqJ/XsjVNH+jf3qY08w3wuepm4oqss/0IsJ9ZkDbVXikh0c9/ljCzGOIhdz45O9d4SYfemcOfLNWpwFz089W1TKb6hV+HZ8ZL+l/cK5sLBgWif/Fm2ZQuQSP/2N8Zk7v+8bEmHYFgcEDiPZoW5F6IZWQbdFVx5qwj3oR+sA8fJ09vniarn+9X8Ki3hV3nrprUBLMM5K9UZJben9pFjWnOvcvXO7BGFxH6OIcGgdJKiT0ua2cvI+w0CjLfK82EGjX/MpkydD3VPXo48iuOejcRLOPl3cmdFp/6Q= X-Microsoft-Exchange-Diagnostics: 1;SN6PR07MB4400;6:4wFW8BTKd5pcco9kTQ18+MM0SG+p9JRXgg9IfP3wdxDrn+5qXxm98ZZ2sJdLLW69TznrZ7d0MF3M7LpmHGwNn/o+WLKbJZBE1cNb1U01XzGMkyYCLG4vISPEKLEQuF4KlDKfYOahuk3ozf0YjecevdNHPK+868jWwnIfdhP4FMwvNdxJ55oE8jyTp/UpsEaL/6V4cgdToaQfcQT5V37Bkbdrzqm+0lM+sTds/EzBlSJhNgGHi8+R2Nv0b+d+Dz2n0l/8ZHpOInNz19lh1CumQOUGkJaSmfpBNOLyKBxF92hZcw2m3moDYqky8kHVc566CgAgsOcijGlWbRI0IFpYboIUlsXgA1CtWnyDl/pEbD19r9lFe2x9HKvNC+XZxdg8//xzgOEltJcfV7RrP+8zBlz1UIVft+2nvbld0blA687f+dOvMbJJj/YIYSAu63TymGgje0SAa3Cbw7zb1GeKBA==;5:gGKoxeuFi3qfba1pyYt84kPfyUz2ZFezZbeMHhripAcGxxBaF/XIqlN2emeIK7TniIM5joku7JsksLPPMpixNpMEg4wthiwTdeCanwnSXaQQKy0dgJjXS+e//khyPeh+jv3zjteaQPMBq6zesri6SuEw70nfLxYH6MgGYy0m6Hg=;7:ElMB1u6BcZBJgcnGDFneahvS310RwXeLoYEQZjL6WRCnRWmAPTEW/ZlRirzbskC/FRhbEvaUQtzoULOZM8VB6jM/8NW7ba5N/D8fSjWZi4LJ+qfxoMzkUog4Lkjr2DA3D2BmbULKYjfhyD7YxFHr8ITSO+DdfknYODr8XRenb9SHmRvku05TIvzTawP7JHq5+0uOOJlEM82oHCY0yVvCFal6byj1ARNaQ2kxzL5YnhUQdYovUmU0VMVf2YdYMIf4 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Sep 2018 05:05:27.6317 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 969d0f42-f934-499b-368c-08d62436d759 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 This patch fixes issue when remoteport registers itself as both FCP and FC-NVMe with the switch, driver will pick FC-NVMe personality as default when scanning for targets. Driver was using comaprative operator instead of bitwise operator to check for fc4_type for both FCP and FC-NVME. Fixes: 2b5b96473efc ("scsi: qla2xxx: Fix FC-NVMe LUN discovery") Cc: Signed-off-by: Quinn Tran Signed-off-by: Himanshu Madhani --- drivers/scsi/qla2xxx/qla_os.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c index 42b8f0d3e580..ae9fd2d01004 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c @@ -4808,10 +4808,10 @@ void qla24xx_create_new_sess(struct scsi_qla_host *vha, struct qla_work_evt *e) fcport->d_id = e->u.new_sess.id; fcport->flags |= FCF_FABRIC_DEVICE; fcport->fw_login_state = DSC_LS_PLOGI_PEND; - if (e->u.new_sess.fc4_type == FS_FC4TYPE_FCP) + if (e->u.new_sess.fc4_type & FS_FC4TYPE_FCP) fcport->fc4_type = FC4_TYPE_FCP_SCSI; - if (e->u.new_sess.fc4_type == FS_FC4TYPE_NVME) { + if (e->u.new_sess.fc4_type & FS_FC4TYPE_NVME) { fcport->fc4_type = FC4_TYPE_OTHER; fcport->fc4f_nvme = FC4_TYPE_NVME; }