From patchwork Tue Dec 6 20:30:33 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Madhani, Himanshu" X-Patchwork-Id: 9463225 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 1F60F60236 for ; Tue, 6 Dec 2016 20:31:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 131C1284C4 for ; Tue, 6 Dec 2016 20:31:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 080B6284DA; Tue, 6 Dec 2016 20:31:12 +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.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID 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 8714B284C4 for ; Tue, 6 Dec 2016 20:31:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752265AbcLFUbL (ORCPT ); Tue, 6 Dec 2016 15:31:11 -0500 Received: from mail-by2nam01on0043.outbound.protection.outlook.com ([104.47.34.43]:52352 "EHLO NAM01-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752185AbcLFUbI (ORCPT ); Tue, 6 Dec 2016 15:31:08 -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=YZrMGNZOiuTkEBmbYP88fnoI3oJlp+KFBt6+BgIad6k=; b=BpLc2zBR/mVmEcyz+DB95nRSQ4Djs3rv1vYz27gotpdCuQFfLoeFxGKPHXrHF1Q+SrQ4k0qtc9QN8MENFfQEEvS7wdRhvN9TT94leGawWDnb4hIar+Nw5COPIZAIZ88cgO3fl9TrE6uX88AWtf8RI0V9xGrzsdDbPH4+cyhMols= Received: from BLUPR07CA0029.namprd07.prod.outlook.com (10.255.223.142) by CO1PR07MB208.namprd07.prod.outlook.com (10.242.167.149) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.761.9; Tue, 6 Dec 2016 20:31:07 +0000 Received: from BN1BFFO11FD006.protection.gbl (2a01:111:f400:7c10::1:121) by BLUPR07CA0029.outlook.office365.com (2a01:111:e400:841::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.771.8 via Frontend Transport; Tue, 6 Dec 2016 20:31:04 +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 BN1BFFO11FD006.mail.protection.outlook.com (10.58.144.69) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.1.734.4 via Frontend Transport; Tue, 6 Dec 2016 20:31:04 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:; UpperCasedChecksum:; SizeAsReceived:1155; Count:15 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.309.2; Tue, 6 Dec 2016 12:30:52 -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 uB6KUqgB002355; Tue, 6 Dec 2016 12:30:52 -0800 Received: (from root@localhost) by dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id uB6KUq5R002354; Tue, 6 Dec 2016 12:30:52 -0800 From: Himanshu Madhani To: , CC: , , Subject: [PATCH 04/22] qla2xxx: Clear BIT 15 in NVRAM during initialization. Date: Tue, 6 Dec 2016 12:30:33 -0800 Message-ID: <1481056251-2310-5-git-send-email-himanshu.madhani@cavium.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1481056251-2310-1-git-send-email-himanshu.madhani@cavium.com> References: <1481056251-2310-1-git-send-email-himanshu.madhani@cavium.com> MIME-Version: 1.0 X-IncomingHeaderCount: 15 X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:50.232.66.26; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(7916002)(2980300002)(428002)(199003)(189002)(2906002)(5001770100001)(42186005)(33646002)(47776003)(81156014)(8676002)(106466001)(107886002)(105586002)(305945005)(39840400001)(86362001)(39450400002)(81166006)(36756003)(189998001)(50466002)(5660300001)(8936002)(39410400001)(48376002)(76176999)(92566002)(5003940100001)(356003)(50226002)(626004)(80596001)(6666003)(4720700003)(101416001)(2950100002)(4001430100002)(7846002)(50986999)(39850400001)(38730400001)(4326007)(69596002)(87636001); DIR:OUT; SFP:1101; SCL:1; SRVR:CO1PR07MB208; H:CAEXCH02.caveonetworks.com; FPR:; SPF:None; PTR:50-232-66-26-static.hfc.comcastbusiness.net; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11FD006; 1:86gnQ9jfED4Vs1HtBRy8hRE/oYXQzNUvp3xcQvmji88IUR8QKaBKsXBx/hvEBH1zE0FFH00r8lFric5JQWDVxALGjrwjsAI1kLwrIzxFYUsrl9lC38nBvci8PFtTh0KESlH6uBJhJ3pWF+ziVsbEcUR60dzdTB/Po0lVfM9UPx7rZ++i9BdVVN3T3GM0ptvdxKC9kc2pLcWfboA3wl1IWbm47D/oyAc3bHM/1M4eCDcIo5+cfMtTdoHuggGNY4PAl3fGxcxJ4o3/kmkziaw1giYy6CS5G72k+jVRh+iw3+jMhSzv1AJ5IK11fYlFUWhQbrVwPbQU+jeOvB0pimIoKkc65csxk6mUuUe+UxQ9XvOnfJibCXp8B1W9Mt4TVISRQEOLTOZMFJUKUAco7tswDX3gkiSA4rzHDB2ZXn3hsCOqXpHJ/m9DZSV0uvXA/T88ghC06Dhl+m/QACWZL+Z6dkBK9sHOPJaPcw0/jSFepkrYTrbIP/1IcEVIOSbZ872PuwtsIFXE+0pgBjeg2zCzPg== X-MS-Office365-Filtering-Correlation-Id: f83e71bc-c2a0-4842-a743-08d41e16cd45 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:CO1PR07MB208; X-Microsoft-Exchange-Diagnostics: 1; CO1PR07MB208; 3:0cQHDBXLrR4e6DeBwZ2V8vt2HH4o0/SJ48XSEnMQrfvv1d9g6h6Z9VgRD17mDn7sIvpHUHiwByZ566yqaDVF/VvsyN/f00Wdz5QKWgojxs2EqkqJlPbQo0LghLkhEJ7yeZeNE3F5efCJKY80xiOiU+RCpFws85PKYusuqDgi7QV5mdJbV7vf3xeCNmKtdgCDJaM0YNksJTF07VJUQcn5EZbgAZ/2UmvfGaXM02h+aRIdPtg84JuhmOTs9etb55y/dgP/FdaWB3HZPDP5uJCVMdEQBXXA37nG8QW1BuEpQoSIMhYIRecuCyOHI+OiJAIVQ2vi02UX5hcTTPTMoQpIqwq+upvbvqklVZCUpT8k6wY= X-Microsoft-Exchange-Diagnostics: 1; CO1PR07MB208; 25:smUxwsCRM13n/CtPUhkeT5TCS+lkX1jLHimFxMNENC8JJj7QNaljggHhRdlRN0JUVHtgq1ecHOK1DnW49zDo93b+DXe2C5vdy8ZOicEYjAPqgmPlkrCvEXRoOsA5uw4YftwnMiNmOp/aVt14WCyn6NU8cdGt6CiDFebJDYUNz/ccun8308jlOPDIstoN3TQ7ponqdslaBrHXjcl2vQOGnT6vREghQ766PXPNXm2p5sd3NlheyHrJjV2Z280//mN3dSmO4vIcPuNAqIeNwRnvols+p9CFrTeDLPEDZMxzMLK0Po5xhC08hbdhbEdJDtzLvGYwOZHprxfPOYJTM24ztMVIi5KS7JGyu16Y4u9M1w8RKE4py4dVh8ha39yU5GG+xBUh7vXH672SOofs7OnkXCjEcDDbQEOsdhMLgUQed4wGOgugjrAEJhYk9igH5mLh27ZAgyWXgHKoKN54WXh0NwJalsI0TdMMHMCFIVA3IJBgx7yFa1zNHaVRVbFB/G25Dv4tLUGKaCzaZ05KRRJ+wU2WAz8567L9OaB7PUGqzZhYvcrOzmMO4F79UQTc5jfV/EWCcU67HkNCPRc4+ryM0iBGrU4/X7giMZCjAgFewBIQ5BXgMqCWB8N8gCV+GeZf8bMMxtES6Rk5mXYzgogP6upT+04AHe6oETqLOTJlKu5XvVMKYEoU+FDHbomoOSXC9TKkRndpGbrx1F1S6hsfhnCEqUj2XtMGtyen4iaYF8aD/i5Xo2eGX/GZg0RHc9ybPK3mpsiss/58TcUMfh8Hqw0X2u/Sc5SYRL5uJqYdv/2ypQXO61cRyJgEj5dZvELUdv7Kfyf0mqE05H5dMKa5mFNt9mh3tEcPqp/buPolWIfMfZU31S0hqTkIJK+fA3NI X-Microsoft-Exchange-Diagnostics: 1; CO1PR07MB208; 31:JCyvhoiUS/uWj4SB5gTj9oPB20xTu0HcnGJ+fyUe8Cvgp2n6cpUhf9zCMGQmrBzuEzLraPKuY8XS7KpokQTzlu4/JR0gcHm4z25pGZ+lu6boUuGYV331nekKcPGUi9efeyxTbq37yw7G+Dn/zwnAEvCbDe+fhFqQtuasJeZwRFV31rbfvqLZ+f7StgCThc7h1ef7fabQcHHhQmNRmObPK+ss8j3o3Jtrcju3Z7UBTRQV+rGsoyzybo+Rsr9Z1bHRZxZnYxFQwPP6NrIXF4ULyIFacL0FIXVnSLdoNV1cuxE=; 20:iMB3Ak1YhqGZv5qnW9rdzv/6r5/SNinoJEvYo0Bq9qGUxfCsfkdAdd1Gr/kWaFCgMmycB5QQ10jkPiQOIUvTUKZSWmGf6Mx8eKP+71w6O1hcqAsKzh0u3pBpW6e2s8d6lpFxQd1JGaQtOStlsHa7zm7UaEBhRBRuRah6nHNizIr5NNXhIwsoD3Z+FRh+O90Z0QHWA/UUQ3Xl6WkWcDmhUJrlQbdADUqwNyvYEGaMoHhI38ZAWDxXTy2iT1hou1d16+GeXHcVY1jnCFkCkcQAUe0O3NJJbt/1A7fgzxPppHFOy7KGMVBdJih271uepOHTCw14CdfnxkZbUTXq5gf9EnafQgHbSW2i0B0levT2RHvAK4ysyXo0A8mtf9ixE6Jt0Ml4gpIgJtCM+tGzam+X+CIBxK+eOzxZ3SHVYIwoIFyUdvtHwIn/z5zj3yVJwATeArV/4bSkLPGT3Ciwp47l+MmC3v+c3Ifsh9iExBt3ekrVAz2nODaPhJHr5XBUpypb X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040375)(601004)(2401047)(5005006)(8121501046)(13015025)(13023025)(13017025)(13024025)(13018025)(10201501046)(3002001)(6041248)(20161123555025)(20161123562025)(20161123564025)(20161123560025)(6072148); SRVR:CO1PR07MB208; BCL:0; PCL:0; RULEID:; SRVR:CO1PR07MB208; X-Microsoft-Exchange-Diagnostics: 1; CO1PR07MB208; 4:1et6yrIxDBW90W/3HN9UJBCG/apppI9xRr9Ap/dEryv600ZtDkh9TBRkmXhW/ofIzm0sfsb6SE7sNZOVSZfu6z6i4cMnpgDwdqW9PfYYkrZbgvz0WtilHgQM3egvB5HJivzQMUumtvbQik1u7bYJRu/HXMA3AMkLszRgQcmhHSJJEY6UBHmigtnzT/CiCiILy7MdNskEJxEX/wvkXRycm31Fv8XjAqSl2nWb1dTBx4D2OjVyERl48FyoU+gOYGc9fz9u0o6oexGJsWzB3ZG3K829iJexrd84qnWg9hcgKMY40fUxzKE5aWhLdyyAV1GLaGm0KR3GXFmwAvjNOzU10ygpBM2GrAxycOayWFz1gVTipn9W4iL+YwIKvJSwG+jjoUZqJiya0Cd/GcMnNK1yC1NQlWn61gPhofLMRrSJtGyFczCjqGYhMWq9yGwOySd15JXuwy9+YD6Nxms2pJcEHQNvSK43rIRO2vF3Eenx8idahXmRz22EBW8MPWqcIo7IEuvpe71zmT2eWK/ybwZvDCu3d841451pDZQEp9/b6Vm11f6/jdUEGu4GbLFC27ExINXqGElRYlo7yHrX6N5Y5Nxxk58s3nnf7DJyKhdh8QBWOAI19VnQ2veSEEX9XQ4Ux+yexCkbw2Lzvm8wIdtqnEtr+FwFRNkYjiD5v2UFE1g= X-Forefront-PRVS: 01480965DA X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CO1PR07MB208; 23:d+Sjt3gVf1qh0vukKnwHbvEPSSSZy2Yc+PMcr2M6Hl?= =?us-ascii?Q?fF33/aTBlLwoZv/iSzSKZccWpgToRy6lsBanG94GUvt+TEDy2dJms+F9h1b6?= =?us-ascii?Q?N4/e7yRnHj+ZoiaMhv+QCR0jxQtwNV7D2p4dxfXPaLo5AnjGBOBtQZKdrszV?= =?us-ascii?Q?XwP0807q9qoKchTafzF7BbT5+QudFl8iDPaz1TmYS917LO6M2JM95pTpOtDY?= =?us-ascii?Q?YcbpsAKd3En1P7A7d8GiKcJRUTLyi85RzA0/G7KSTb4Z1SYsEX25D0vm8lGl?= =?us-ascii?Q?bvxzgJOfI8napRIpqAeo+NQzv3kpASee556DimaI1YmRd5JSxFXAFNZfrfRz?= =?us-ascii?Q?o4vWO+S5fTyJRYbfOaoKOCBHtOudYInAy7OoG98VRX6/zp9QQyXIxVr6exeB?= =?us-ascii?Q?e9zbZObskOpuFy+tlXhDXlsx0ANfSuu4thvTAfVeZFtn5jkPrVtWjNO35XnE?= =?us-ascii?Q?DIBU6bqGE+bWNzTGb5XisxiEg5Mt3s7iPLnxJ0fGFg2zOjMsRL2XAJ6rMBoc?= =?us-ascii?Q?0MDhQs2SnKF6grpnWD4TNInlAMlL70xjMJjeU/7ipQ2uyp9C2O1pVgoyjRkN?= =?us-ascii?Q?xRqJLJL2s5E5Z2zLW+13CFyFPDkeaqvOd6VWe04u56cg1FOGMgUFWXZN1hvu?= =?us-ascii?Q?8dDyBujBIm6ewtRFAY6L7VTUv0u8wo9wOrcH2v1aSvMtYipVjCZsUmocls98?= =?us-ascii?Q?Jyygfive/h9h7Ll058GEn3y/VBBgIOidKo5FaFhXDQKsi013Ir3XXeSra6XW?= =?us-ascii?Q?jrxOYWgOU2wxl/Cx7HyfKKuW/pnaXb6gM/vGKGt3OeaxrzR/iq03eX644ANl?= =?us-ascii?Q?zIgZNObBAbauGTSsZSPLpfph3XWXdZ88U9JqJy+wppW2gLI2n/iBAE3g2qF4?= =?us-ascii?Q?4Q+7sF7CUwXzXUHwb4U+QL+ljrtYhcshtuGLHCna46YhaOAqFBtfXg+xcUlk?= =?us-ascii?Q?qHlCOIjttMEDKKxA4qT/Awoz/S2q8Djt80Tl8xDR22QkfBjtEEXxf4iqKh3P?= =?us-ascii?Q?y1xvouW/ybySNyDaQW6q5zqunp4j9kDIWSQ11SXktwAFUM2GJkWeT7IIB5Xt?= =?us-ascii?Q?ummVBOv49ndm9ZFmpLUNPe3nri1Hcb8CoRYKWU1LBQk00UV0IUkuOf3Ftakp?= =?us-ascii?Q?WrDn7JCsNkV/kOsF5jUPuE2MNB67DkzeCmeBdMZ05hE65wew0GMbAJvNGQvQ?= =?us-ascii?Q?Bc9JV2xHZUcKQ=3D?= X-Microsoft-Exchange-Diagnostics: 1; CO1PR07MB208; 6:PxEbzc83ljR7a6+iVD7oCXr8u5ssBHGig0CXvisJkg6VbSMBZmbDTE6uORxLw8ZI5YeEJ6Vx8bnbe6b/E9NhZ6LGBA0BMHzyI6B4IF+gYC8yYHWydFQ5CI7grxywoTxNbabm6LYFogoTLqkTT/WGnT6YgNdwV8M94LDJVG84jU15IsuYPL6h5GDcajUVDgsNguiriywQ2EtN5T4buqfuoAM/ajNmcid+7MTioZYPW1VaVr7F+x7IUjNbEZEkZHfR3gpxWXinVMv0kpck/5tU02ypJ9e95lsuatFRG7V0yH+YdtMIKV82wftj+EWL5ok1sw4GWjxicMRAoAeD9gVYPgIhnybNIw1u0Ulk2dPC76thKr89zBVrJifLiM86wBPhDTqp13k7GZ14m/X0feQ/JXos+M/xc0frLRq63CdMOAnOdtWn3snNginysZreYsGjzdJY7c/e7gkNBHaKuLl00A==; 5:C+p1N60IRjYQyznhM9ssIpGdoZ1lU1C2RI3S8nPsMu66dguWbL9Fh59w4NcgxLFUS6Wu51cPqMrOvu2d7kQjkbYWyW6ICsLXO3M9pJ4tRpOi1F4L5ovrPhu5MzWKsoNtQEez4cfmEPACqrpOHK9l3A==; 24:qLxtTHlPLyQ3QkVtMSrXKuApBkYWcwc0WgAvysX3kpdcrKF9JEo4sJvVD44oU0GpDUsVkklFQqHOJfY7pjgtZtpZ8VliAfidynq9+6kb/98= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CO1PR07MB208; 7:QC/0FSxId7VEFqt+nRwo9e7fsaabbG82a5ES8NIvtEt12Ze8kdvMFkUvTKRHBXDmoSDzv9vB1OBc/qNkyL5HgxVAd0oko+G07mwVzgXDm1+8DmgP4XZDWYMqjDTzmNn6DcFYuf1f4BhZDhUsh3JiTX+uyELn5mh7hy551GY24VgNL1q3oHW/yniipp8+KM2G0MJF0RtQfNrvp9PkP/2N0KTUL8MZprHciblR+7No9u5lTLpzdE0DyaNxW7nweBpczjPnn5uzfKSnaCjeorWaVCfItTqLXkYBWpfkz3vek9x+l8XS1q5VhjuhpBhKzTnjblcX7gv/4esARbsd9+RKekWAgohrBq9VVgxTGh8GSSC1oUlMmKhkDVumILgTNNK8uv6u7yaTARI+ERyLh4QlRIESGkdo+sIPWU9wQAJ3p+i6/0wjIr9AhMF79WjQq0ZRjL5SKrLPIzdr6EG0a0r5mQ== X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Dec 2016 20:31:04.4658 (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: CO1PR07MB208 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 Some of the ports have BIT_15 of firmware_options1 set. This is a reserved bit and should not be set for Target Mode. Clear BIT 15 during stage1 initialization. Signed-off-by: Himanshu Madhani Signed-off-by: Giridhar Malavali --- drivers/scsi/qla2xxx/qla_target.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/drivers/scsi/qla2xxx/qla_target.c b/drivers/scsi/qla2xxx/qla_target.c index 8a762a6..adb3b93 100644 --- a/drivers/scsi/qla2xxx/qla_target.c +++ b/drivers/scsi/qla2xxx/qla_target.c @@ -6527,7 +6527,6 @@ static void qlt_disable_vha(struct scsi_qla_host *vha) /* Disable ini mode, if requested */ if (!qla_ini_mode_enabled(vha)) nv->firmware_options_1 |= cpu_to_le32(BIT_5); - /* Disable Full Login after LIP */ nv->firmware_options_1 &= cpu_to_le32(~BIT_13); /* Enable initial LIP */ @@ -6541,6 +6540,13 @@ static void qlt_disable_vha(struct scsi_qla_host *vha) /* Disable Full Login after LIP */ nv->host_p &= cpu_to_le32(~BIT_10); + + /* + * clear BIT 15 explicitly as we have seen at least + * a couple of instances where this was set and this + * was causing the firmware to not be initialized. + */ + nv->firmware_options_1 &= __constant_cpu_to_le32(~BIT_15); /* Enable target PRLI control */ nv->firmware_options_2 |= cpu_to_le32(BIT_14); } else { @@ -6630,6 +6636,13 @@ static void qlt_disable_vha(struct scsi_qla_host *vha) nv->firmware_options_1 &= cpu_to_le32(~BIT_13); /* Enable initial LIP */ nv->firmware_options_1 &= cpu_to_le32(~BIT_9); + /* + * clear BIT 15 explicitly as we have seen at + * least a couple of instances where this was set + * and this was causing the firmware to not be + * initialized. + */ + nv->firmware_options_1 &= __constant_cpu_to_le32(~BIT_15); if (ql2xtgt_tape_enable) /* Enable FC tape support */ nv->firmware_options_2 |= cpu_to_le32(BIT_12);