From patchwork Fri May 19 21:53:27 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Madhani, Himanshu" X-Patchwork-Id: 9738247 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 E66476020B for ; Fri, 19 May 2017 21:54:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D3EA528562 for ; Fri, 19 May 2017 21:54:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C89D228573; Fri, 19 May 2017 21:54:08 +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 287E628562 for ; Fri, 19 May 2017 21:54:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756808AbdESVyG (ORCPT ); Fri, 19 May 2017 17:54:06 -0400 Received: from mail-sn1nam02on0041.outbound.protection.outlook.com ([104.47.36.41]:5734 "EHLO NAM02-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1756731AbdESVyC (ORCPT ); Fri, 19 May 2017 17:54:02 -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=sucjFB97rX/XDblHd/4ws6fKqPI2f4k/pbpMVw4euTg=; b=BEXQW9tMObexJvQF6mKn3u9FOEsMP8BJtGo1tlqWrGbWiZuQvzlzx7R6cPOXnMJAWWDLmX5JA5OBTIrO333+0bT6N95PKecozbXUhYZSS2Eey7FoOEzttIBs1MC2xUH6pMoC5N6qAt9Xw4DIRWyp1fke9mLI0gKlBJsMUgNaC+Y= Received: from MWHPR07CA0020.namprd07.prod.outlook.com (10.172.94.30) by BLUPR0701MB1009.namprd07.prod.outlook.com (10.160.34.19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1101.14; Fri, 19 May 2017 21:54:01 +0000 Received: from BY2FFO11OLC009.protection.gbl (2a01:111:f400:7c0c::112) by MWHPR07CA0020.outlook.office365.com (2603:10b6:300:dc::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1101.14 via Frontend Transport; Fri, 19 May 2017 21:54:01 +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 BY2FFO11OLC009.mail.protection.outlook.com (10.1.15.0) 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; Fri, 19 May 2017 21:54:00 +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; Fri, 19 May 2017 14:53:45 -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 v4JLrkZN002235; Fri, 19 May 2017 14:53:46 -0700 Received: (from root@localhost) by dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id v4JLrkxw002234; Fri, 19 May 2017 14:53:46 -0700 From: Himanshu Madhani To: , CC: , Subject: [PATCH 08/25] qla2xxx: Set bit 15 for DIAG_ECHO_TEST MBC. Date: Fri, 19 May 2017 14:53:27 -0700 Message-ID: <20170519215344.2168-9-himanshu.madhani@cavium.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170519215344.2168-1-himanshu.madhani@cavium.com> References: <20170519215344.2168-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)(39410400002)(39400400002)(39450400003)(39850400002)(39840400002)(2980300002)(428002)(199003)(189002)(9170700003)(76176999)(2906002)(50986999)(38730400002)(1076002)(5660300001)(101416001)(106466001)(305945005)(5003940100001)(105586002)(33646002)(86362001)(50466002)(80596001)(48376002)(42186005)(478600001)(189998001)(36756003)(47776003)(6666003)(2950100002)(4326008)(50226002)(81166006)(8936002)(54906002)(8676002)(356003)(72206003)(87636003); DIR:OUT; SFP:1101; SCL:1; SRVR:BLUPR0701MB1009; H:CAEXCH02.caveonetworks.com; FPR:; SPF:None; MLV:sfv; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11OLC009; 1:HvfeMxJqffwWj0B+tdSHfsSm2nHOMBI8eZ27Vst3A+K++EPo+lU9MajlXVteB1NRZeN57IyuO9Uyz4sTtc9xgKWXhy/YcutFvXzuKBC69bdVHPAfUnjlORdrWV4hBZFRAAKNn4WChG3r92J5qmB486s9P4ItkyBvEHJv2BWU7yb2MPNt20k9vqwbtBD9TGvkWUXMZLfx5Ps77SUL76NyWiBXkDz95TbfUguxBtWk0R2UDrORDSDdXJjt7M2knXwnSFq/05pRCtQXqmacdoB1vEpV2w5hJ7JIOTfj9JNCEhwsiAN2KFIDNH444CKr3gC8Fb/1BBabZce5f6rHZ65Cz6QfJu7IZ+3W648uJziE/wAzwILO11CKl5q/kpLRHhOQy9vblJjCOe6rTfzTtwJXRqkdljquOP2EE9NAjxLnfRKWzzG2C+omA3SpaKnrFJYHilICr1LvbOYcAsxTaQ70E6T6Pd2Pf4L7at1D0gY13phgKpXRcfUO1HOWe+TSRYx+uI3c2dt/d99sR/p4xqjJ2uAnakT8TKC9uOM/oPSRovgL611xW2IJicehJWfEMntQk5Mtrs6mFOJF3q8okHO1EQ== X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BLUPR0701MB1009: X-MS-Office365-Filtering-Correlation-Id: fa2c4585-772c-4b61-961d-08d49f018f00 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(2017030254075)(201703131423075)(201703031133081)(201702281549075); SRVR:BLUPR0701MB1009; X-Microsoft-Exchange-Diagnostics: 1; BLUPR0701MB1009; 3:JAiGPkYF1Sg1DLYUba6tch6D7JQJTXXjxgGXdrpiCIPhrrO+U7DNvZcwdHUEk7Q7DE0ie9DyG5lO9mQgtvsSDDVPIsrm+QpJi8XWjd2vDVsd9yba5chBI7atF5omzueoO9jM0tXi5s3znV89D0qX2vrlonhI2HrkLBOyLhy52Vbmius/6Da1MrVnFsoKvZk5kBW5gsUIWBf29+RueK1vqlxM2IdtZsxpIleDNqhjuuIhHFjslbFfb0ECbGxo0nB2JuZ3P6nrlVxQ9FyA29UTvZbTXd/lcSsfoDbMDZAZ6zyOIhNYZ/lg4+aFFWfsC7wEoWQi5UzNvW66wM+k867UTDtO0T+l0LjUc0AN+WomJ8Us/Tx6gncOj1vSWhNJ/UUi+R3pni9ehAvZpjIN7/k9x3pwdD+feVmfdK4RyQJoysjL3cknicwDeBr9ur/aLOGG/d1EenGDhWOyNiVxoA9bDsvwyRd3LzN/U8eIr4X9ZQTqKCakYtY3OvGON9I9E52p X-Microsoft-Exchange-Diagnostics: 1; BLUPR0701MB1009; 25:dNyyjJ6Sc4pEzqPKUAbmQwfGbPGvBydxKTCbQBx1FStnOaJY1tw7dEmF9k1izBZajkBcumvMQUUDaqCxXeGiGobia+MruOWP9HZps+X0o3UWBgxeWw9HhFgiU57Ixt+92fAiLsa74kpkjMgHTNc8mk6if+eUXyUjrjZMJWWw3R8FJuWqe+Vj/DzwGqbT3FLqgsW29Sgs95U2NSDR5YkIyN+jUWMTObe3Z6NKmg0GHciuORqw1F5NKQOKr5TVtYqVm6claTV4awqp9ccSiNLFxe2KILxKV3AZwm+V5tzIA0bJRwBO8adEhmTBFrGs+FCEpzHjHtPI/o+bu0p/HE8FEijjzl66SmzFzsY+/ITv0jhXCXLS7XJq5KuKB/zZi6/dwN9Rp8ozkcPyptkqv87f/ILJ8RGx4Dz91iTO+mzi1WQDNsIPm93eqj9pO9L3WHO1eBmYo1KjRCfxTAR51wuF65V7yVxnYPbRvbc2giAOy2U=; 31:M4MqY0gUHOVksZxEainRDfQcr27sII/acAQW4KoWDOFi4OnGAurpwoURTz3fRoaWEct6Kqrpo33oLmrksSS25dWgutOFzG2gymZZ6U66zSzAmCIDJme7JYgAV57N8ntE+wrhTijNOoUsoi/6T2VDfLrMCvSt44q1Z3x/a7s0tXj4dsTPu6BQWJX6dtxsJP24pwTzCL4U8jOngnow2MZXHJxAjZwoZQpCH/x7nMdnUMHngJ2V1dDGkz3NJQJAq4WX5Jw4ymrgje0W8fV8apqYIQ== X-Microsoft-Exchange-Diagnostics: 1; BLUPR0701MB1009; 20:jTyqO5g5ttm0kH9Yu2aTW/1w3xbNIVVZMpPa4kUA7MoXa+yQfIPr0kQkqhxdsnwRWa4Zt9pblpLK8JNdLJq0ykVnRPKvMA1TvxPPYA7bE560oXeV/DhOmVm5p6SPLC4T+lsTSABbsS6yOBxYYUC7kzJELDaRAW2uzsatOv4nLLTwetmf/1CvgJ4RSdIKrKYI3jNAc+1skRCBpGFrLgvBYr4rfmvNeFbWdrD9//UfznITjk4iBUdJz0a8/kXeX7j0IM6DVNJsYlxvOg70Xz2eRMakd8Z5QoUlDvhgEv4C58ho+khLVrx6fS5ADh5rG5sugj76qhZVs+D9DDIH5DwNleDwsar9bW94tSjjNp5eWXifGj+XztVY8yREbtGIWHUDrFJTt2IdrZd65sbamAOEzn83DBVNg1EOc9sbFeRhgTKlFlN8DY7cMyzueQFhEcM5VcT6Ml4qNeFNmvox7jGFHPAzupT24huA9WqNNoiXoU37bqgFo43hfc5pw/CTSEU6 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040450)(601004)(2401047)(13015025)(13023025)(5005006)(13024025)(13017025)(13018025)(8121501046)(10201501046)(3002001)(93006095)(93001095)(6041248)(20161123555025)(20161123562025)(20161123558100)(20161123560025)(20161123564025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(6072148); SRVR:BLUPR0701MB1009; BCL:0; PCL:0; RULEID:; SRVR:BLUPR0701MB1009; X-Microsoft-Exchange-Diagnostics: 1; BLUPR0701MB1009; 4:PMSueAJah39rp51xSKKdTWsZI0sCWywI4NwwzqPQot7qm6oyz/8wny7Yo5mi1kNs2YfB8OYxdJp2xAuuSirvm2O4UhRMC0JEIvUOqbRHvV6OCbCYU5Ukd/a2KHpV+ZXSR0H3VjKXVqpSHahySvUoNMuZWelDWrTEfS3W7P70oxX7oKBO8xQ77x10G5NSQvL+AJMRaKsJmwRHSEbUIkSdoM3t51PsHWGDKJrI5wzmH3miDC/pzr8XIb2JHbxskNyUD6dTLOs72OSWEV2KKVjF+imYh1ZN8q9c7Y1CrJPOorzJa2HFmHnjHebPVA+NEPMb5bsN8ReYhGKYoNMWHfN4yhZ5aiwtC7+POzpwmHNxY+WIUSWrBIal20FSRPn26FG53lwgNEOmOZvxSegSpM2a2w/2e83/x2kxXSKwLzGYkwBFBckakANB6aw8VUiyjF9Gat0jmWLZfw2pgyy6P9+sbaeSEiME6tc2AJHKzybmxV/vnr3COJdWs1OLh02MNCe0ZUBkcg8DToH8XI+e0TdwgKpOEVkp4NkxnwlLGYTgDMyxpRGgYXwoAfxYJpgJhxYBjRK19OHkoGffLnW9qvWsyrp0IYR2Dr7zctBbKI+lZc0gHIcgwU5xc9oHWMR8bT8mo/xH/k6MgIYQrGs2qOCOl4pjb3Rn89Wzqkrz/4jXpIFsQ0uT9+KbVDuXLK6SA7tzGHVE7kyvO3AKW+YN9KNJbTW0vZLJSY4QHL84h6xKngJbzeOLe8iJTWvPjgsAcTvH+drQEpMmQ+D2gxSn1Tq1RfaKcC8SXwBwcM1RXWs75WHdDtlfJUE8Yyb6WW9xlYEUkKH1izfITLLfsCw70vutfIelYm28sTwfc2HWatUaMqMHhOVwJPj9SOHzaElS0S6z X-Forefront-PRVS: 031257FE13 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BLUPR0701MB1009; 23:8gi1bvEdQgckqtdp3GJzTHoJzAhK9nnECWQbmQk?= =?us-ascii?Q?5vw6+6JxOE0/qz7nZOhTEvu7z0ClpL/Vvi+ARlwrjRP+aUiiYfnlHt5eK7Au?= =?us-ascii?Q?l7AMpSDWmmzKrDOh9KXoU6UW2E/5XuTmfxSvXJgv6y7xhMtbN4DQiFQba3Mt?= =?us-ascii?Q?zaSOQaZbrasjWDUaQcugwMlhlGM+Tedn4qVYQS4FV8/Qgi2h54RvAY3VtEkw?= =?us-ascii?Q?Wt/oRh9sxzinjaflgWPMuVlh0pz8isDQNMZxButcoa2xf+BFI3KkM1To+JsH?= =?us-ascii?Q?Pta+HLi6lGkcovtx3WQPzXp1xzhLBMcTWFUcCY7zwR2y2KfymILiMealbd42?= =?us-ascii?Q?hJSP8SLOTV74n4MN7AosqtCtr4BAPrUu6B45QB0jmz2yRkkNhVkCszYQwJJs?= =?us-ascii?Q?l2cm2cV1e+5YG233AKVtROerhhG8m1lFX6ovdKSpRo5cLtLdKGDE/pKCBP3O?= =?us-ascii?Q?mWEk7TL25YSlcxKI5B6Ccu7w7LtB6g/8q5Qlbxv9CKK91hA0azbUidYiHjjZ?= =?us-ascii?Q?+glI0n0YBDzxq0z34uQKV35ZwPxP+nF29mSrc+lgG+rRrGFkhxDTq63tHbom?= =?us-ascii?Q?1ciLDPEZy+so29KfjhMRNPDu5ObCcBq0Wdq2VX3bFul2fgc+dFbGLb6XXpNn?= =?us-ascii?Q?ddzmR8Y16ilzI5xI1cCP6/NdozWU1hCQWfAlk2VnHfGqyKS5GT6KUJ8IvsQ/?= =?us-ascii?Q?veKKmGWuYSwXR8R2nWxLfyTK74a/+lA+e94X6rWxJEGP2hiS2tLU6xDcIzys?= =?us-ascii?Q?qo/UBgl2nq+QMo6M5WVxTjwJ1lHIzSaJ7iZ6PVsXb/BsRRI4S7JAxWtVLaW0?= =?us-ascii?Q?PuphLohmfFkPIBnYQA6eXCIUzAtq9Vzh7GBzy0i8vvS1LJAuTsVR8uTUfV0z?= =?us-ascii?Q?t8z4CzA5LCEE5k98VoIxbsxmDzTednjrD1GG51vJwIIOSa6ySQJiAIJszV+K?= =?us-ascii?Q?U2zHrgYkAE9t31lx6agui8mhYUiArc8IXZ59PIEmVl5bpirLTqN+scYRurZq?= =?us-ascii?Q?XN8sewBDAiv2dRfwdDpnGODRYmbKYrQy8fchmKr5iHpTwfblkmg4JcKBgKGO?= =?us-ascii?Q?TLxPHe30goppa8TtZdOD7P53w0yak?= X-Microsoft-Exchange-Diagnostics: 1; BLUPR0701MB1009; 6:jMRHLoVPAv/AtNklyyw7t9DKQhc2MzbXwe4nz1Dks4B//9cLlChkGnI4CHJn5FDosORPUy/ccU6b1I4MPoV+qwuDrpsPsxO6387nABpToEXuIR0goS2+afQCtuXcrCmS1Q8DWsvGkGafq2f5BRgNVBNjCCnZTJ3+YP7JcL/6FcdFO1udPjtdHnuVVW4fpX4ZPG1ShPEIDL4qXKixRclJUlCP8hH5cWP0sQtis/thgRvfPcT2nCrxHCrJ/9+hb9zLHw41wiLWJiGugBRgntRAgl8+tizZ2SIxZEgdMePcW4/KMLTyLwDfxCGasOzwOmfL05ZeM2lCmSOTgiwnpYEmNtuX1cnpEnUg+5dgGFimXKeJ2QgcTwDo4bo6UeLzT8ROtnvH716eMHx0+cJpjYXhDemYWaSQyEhlR/QGX3Y8GpWh3NEXt9boom28FOSfUUZJpibEN/aIckw6ee3Fw3CI2AdmL7XER5uem7V4VqBQ5CmwvaXzkIyKGbmcid1w7misx/kHqT5Wb6Kl6QG3gLwt2Q==; 5:OvPyeSbySCgkO/kU8Nr75DGEY0DhD5tCiJA76RBvynZeyApGh1J84IPH9fHPzzARmPLT1HONIYEfnAlDv/nquvLPQHCqWWW48v88ciWRHiUtYDXGKfO8xffb30xCAaz/GkNn1Qc8yKIlviHqDFsqnA==; 24:0hpk6FmFNlR8RKgJRkAP20Msw0XPHxRsbJaBvZmGZp90s1MB49Ctl+ZWTbCKy58mOM0Ic8wzTX6VEFjUyNL+Jo7p64yyrs8/LQXOuX5gN+c= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BLUPR0701MB1009; 7:pxgT/VNG+VY26gb3fzcNJbwR+EPuKq//r3Dlj+4vU2tzWhkRnIEgQXzsvpMId2puYzEkW4in8Rx/7fPh/qa6yG7s5h6ykAGRan1H0JwcboUwp3gcvTbdMZiFywS2eXPK2Zrm3A9IGf0PCJZ/7yDXN8f1FpI7J4Op2wfJ/+y/VgERXSVKp/Dt/xnDDhPpqWgGdrjNEDAV62JB3lvHYPDhoVkFZ2OrGdz7UKsxYBYxIx8Nwe1pkxs7aZ3aMHXYtMFBj+w5S+VNCyjNp3NV221+XfYnM7vJfuoxS1uWwkLXlZYvZpz3q7A0Rnxqmy67XKCVLq3BzTnS6cHx1lvmq/sq/w== X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 May 2017 21:54:00.7018 (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: BLUPR0701MB1009 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: Joe Carnuccio Set bit (BIT_15) to send right ECHO payload information for Diagnostic Echo Test command. Signed-off-by: Joe Carnuccio Signed-off-by: Himanshu Madhani --- drivers/scsi/qla2xxx/qla_bsg.c | 9 +++++---- drivers/scsi/qla2xxx/qla_mbx.c | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/drivers/scsi/qla2xxx/qla_bsg.c b/drivers/scsi/qla2xxx/qla_bsg.c index 16d1cd50feed..ca3420de5a01 100644 --- a/drivers/scsi/qla2xxx/qla_bsg.c +++ b/drivers/scsi/qla2xxx/qla_bsg.c @@ -730,6 +730,8 @@ qla2x00_process_loopback(struct bsg_job *bsg_job) return -EIO; } + memset(&elreq, 0, sizeof(elreq)); + elreq.req_sg_cnt = dma_map_sg(&ha->pdev->dev, bsg_job->request_payload.sg_list, bsg_job->request_payload.sg_cnt, DMA_TO_DEVICE); @@ -795,10 +797,9 @@ qla2x00_process_loopback(struct bsg_job *bsg_job) if (atomic_read(&vha->loop_state) == LOOP_READY && (ha->current_topology == ISP_CFG_F || - ((IS_QLA81XX(ha) || IS_QLA8031(ha) || IS_QLA8044(ha)) && - le32_to_cpu(*(uint32_t *)req_data) == ELS_OPCODE_BYTE - && req_data_len == MAX_ELS_FRAME_PAYLOAD)) && - elreq.options == EXTERNAL_LOOPBACK) { + (le32_to_cpu(*(uint32_t *)req_data) == ELS_OPCODE_BYTE && + req_data_len == MAX_ELS_FRAME_PAYLOAD)) && + elreq.options == EXTERNAL_LOOPBACK) { type = "FC_BSG_HST_VENDOR_ECHO_DIAG"; ql_dbg(ql_dbg_user, vha, 0x701e, "BSG request type: %s.\n", type); diff --git a/drivers/scsi/qla2xxx/qla_mbx.c b/drivers/scsi/qla2xxx/qla_mbx.c index 12fea77e31c6..cba1fc5e8be9 100644 --- a/drivers/scsi/qla2xxx/qla_mbx.c +++ b/drivers/scsi/qla2xxx/qla_mbx.c @@ -4812,9 +4812,9 @@ qla2x00_echo_test(scsi_qla_host_t *vha, struct msg_echo_lb *mreq, memset(mcp->mb, 0 , sizeof(mcp->mb)); mcp->mb[0] = MBC_DIAGNOSTIC_ECHO; - mcp->mb[1] = mreq->options | BIT_6; /* BIT_6 specifies 64bit address */ + /* BIT_6 specifies 64bit address */ + mcp->mb[1] = mreq->options | BIT_15 | BIT_6; if (IS_CNA_CAPABLE(ha)) { - mcp->mb[1] |= BIT_15; mcp->mb[2] = vha->fcoe_fcf_idx; } mcp->mb[16] = LSW(mreq->rcv_dma);