From patchwork Wed Aug 23 22:04:56 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Madhani, Himanshu" X-Patchwork-Id: 9918479 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 5D807600C5 for ; Wed, 23 Aug 2017 22:05:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5075828A39 for ; Wed, 23 Aug 2017 22:05:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4508D28A74; Wed, 23 Aug 2017 22:05:36 +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 C4F5A28A39 for ; Wed, 23 Aug 2017 22:05:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751105AbdHWWFf (ORCPT ); Wed, 23 Aug 2017 18:05:35 -0400 Received: from mail-by2nam01on0061.outbound.protection.outlook.com ([104.47.34.61]:44352 "EHLO NAM01-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751085AbdHWWFd (ORCPT ); Wed, 23 Aug 2017 18:05:33 -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=UJ4GCpsAizrl/KDnCMNkVF39w+X5IRN2jXFFPFlFjC4=; b=TmRjsft3TFsp5hEspCQT84iB3sCUZIWBpJ8UQD6vqbKqL3LHdQOcVMICWkNVU2e8PkREyY/sXPJ9E3qy6laKdjZB7UtubaWgQx6DNy9tlYODNv4vtwcD1GSyS6KsKXb7tsA5Bp+zQdxVammefJAoJ+DGGGppyNeayqGW2EbmvqY= Received: from DM5PR07CA0031.namprd07.prod.outlook.com (10.168.109.17) by CY1PR07MB2524.namprd07.prod.outlook.com (10.167.16.15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.1.1385.9; Wed, 23 Aug 2017 22:05:31 +0000 Received: from BL2FFO11FD037.protection.gbl (2a01:111:f400:7c09::155) by DM5PR07CA0031.outlook.office365.com (2603:10b6:3:16::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.1.1385.9 via Frontend Transport; Wed, 23 Aug 2017 22:05:31 +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 BL2FFO11FD037.mail.protection.outlook.com (10.173.161.133) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.1.1341.15 via Frontend Transport; Wed, 23 Aug 2017 22:05:30 +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, 23 Aug 2017 15:05:25 -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 v7NM5Pix003158; Wed, 23 Aug 2017 15:05:25 -0700 Received: (from root@localhost) by dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id v7NM5Phi003157; Wed, 23 Aug 2017 15:05:25 -0700 From: Himanshu Madhani To: , CC: , Subject: [PATCH 02/31] qla2xxx: Fix target multiqueue configuration Date: Wed, 23 Aug 2017 15:04:56 -0700 Message-ID: <20170823220525.3115-3-himanshu.madhani@cavium.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170823220525.3115-1-himanshu.madhani@cavium.com> References: <20170823220525.3115-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)(2980300002)(428002)(199003)(189002)(356003)(101416001)(305945005)(81166006)(478600001)(626005)(87636003)(5660300001)(50986999)(76176999)(6666003)(33646002)(8676002)(80596001)(81156014)(8936002)(575784001)(86362001)(50226002)(2950100002)(189998001)(69596002)(5003940100001)(36756003)(105586002)(2906002)(47776003)(106466001)(4326008)(42186005)(50466002)(72206003)(1076002)(54906002)(48376002); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR07MB2524; 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; BL2FFO11FD037; 1:5oojxiFHYUaEqpfUfKZXmrkQEwG8zApV2B4otaMsKXn1vqMsSRVllMKByXptkjDkryBK3NhrKRseLbyC4juoTlXmNU7GKkE8NWUa43WqrrEzrVaOx2MN8SiV7qCaTBMM X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7fd739d8-849d-4bd3-0aa1-08d4ea7311fb X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(2017030254152)(300000503095)(300135400095)(2017052603190)(201703131423075)(201703031133081)(201702281549075)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:CY1PR07MB2524; X-Microsoft-Exchange-Diagnostics: 1; CY1PR07MB2524; 3:4zX2jjLyBTJIJh1zBNGHFFwyTaA/bG7Dr80HUL4eoKDREhG3H4S9uwmLFFrzFqL+x8IXYCuuCvNO49nnNT5uRZWuuguudNIrcpEr9yV209MfOYZr+cU5ad1m0U/A0SnHqMZ63QsDmtIdOd5k52dcnZGaNkhR8oXNDK85fdWbWMHOzKl9PeMo9PmYWw0Fxm4PBXYNg6GBMpOAWWY+RD5zmtojih+VUbOhXEe7+mi8HWyZfok1VV0Nnj1AFKYmoyOEWdDHQw77mCM4BAzvj901Xi+aA5vtOLax1/0WnxtlpHVnAWJXeRdufIBZ9KuipcHmK/7MaaPEAwg8DsXY/F/Psg==; 25:3MI8NUKiosE6YdmZCpaXeDEhLrI1qQNgpowir595KeVkdTGKV4rEJTki446UBXTKADdX3KKPyTMjvgQpXr42/iM3IjzcG/Kefr/sKoceizG4cE98xEbzqeZxZL838qf4KRMpdx/kTIzg/EQeSmgzOKVxb9BMG4x3RLwXJeFl1zY8pku8nfECQBoGhMPZEUlLelCb67ACF2Hyaojf3e4nHvOFDsaCOPWE+6FGr7joWPyMKaUahratfYNSTJdLZHXERu6UTo9R9vL9NQxsQcIQEsCXS9peD02gTzBfYj3uMRbOlzqseQLAVkFNF9i20D0xaiaVIE3U5ylFX7cxXnOgIg==; 31:s95HR45uE6oFsKGvNqbjVLTRzajc03Xc/YiTpwvZ9YesSLMxgrXgKM1NFWVChiLYfQKWQuj0DsW6j5L4jZwCfn+JaPXf0VQRQClZHiD4l6vTCGUY2tsloBagZuRpEDlcmGlhcbUTAW/XqQmRUs3AfweDS7tnioBawj8+bIPkbQ6k0Fk6UhGrpxhaPksWnGYQ4mrPGEfIqIpmhHrPDcrMSI1xW068aOUdO94AU20WGxQ= X-MS-TrafficTypeDiagnostic: CY1PR07MB2524: X-Microsoft-Exchange-Diagnostics: 1; CY1PR07MB2524; 20:z8n01rvZ+VVcyWEPUd8BD+dbi7N0ED9K7vZd2/ZuAiqT3VUcP5Wz2OV9AxAyQbKjfotXS2pHkd1yY7Pi6C9krcpDqnpzyz/Ze8ZA5oSp71JQzpYDk8/8hvYqjjstQq4yCn3u0g/pB+0wsfIu9iSiTRtf/r6+tZpSqYJcBlyOLk7Gi00FO7Rq0mydz519+LLEE6oeqr/DstasP7MQval5uDermVWyKRA4vre1BgRk/Y2mdXQtDFGIzW5Wv87j6Rx63RWQhLnetjyF3xfSYOedhxLZvZUeEYzaHwljLeOGcB9iJZCyZPMTFsE9FKHLq3Rx9IPHzX+dOONQHIrK4JFCB4iucMnLKw0zg9UQeVIHWubKBzps2//lCkgSu6Ww7uj9Ia1aklAcy/b+En+cW9ljOZssrOewkgQyYMtRgv4zr9CAYQUdb83d2Y6FM8fOYa6bdPK0mpXCcmstliA/7fNWT1sRFQVXAPu11lk2KRrbev+4cY9pg6VaJvOAuxybWVe9; 4:+a1y7LKtKtr6fDXmthKS5fyJfEPS526zu+gz5Kn1SPfpz1XhzRGM5IiQ56PBPDGZm6ORPRLh1XMzILu2vH8WMjE0Ud7jhfdXdXht8kef1CyUrPOO+Sqf2ZlRzVjnN/wTpoBjyu08BrDdFUletUO6fdoxFF2df/m93sDqRaGCY2PiQUELIueQNW72kuOxPIeSqsn/3sN6Zw+8ZQsX1zGcdMSMHMz1kXd3+pce9yiNkbnjtQSkb8b2UETF97gkU5iQ7WgB+awvSHkMrz4SwLhtkacPzPEZM5Po/vqNXxZu5mo= X-Exchange-Antispam-Report-Test: UriScan:(9452136761055); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(601004)(2401047)(8121501046)(5005006)(13016025)(13018025)(3002001)(10201501046)(100000703101)(100105400095)(93006095)(93001095)(6041248)(20161123558100)(20161123564025)(20161123555025)(20161123560025)(20161123562025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:CY1PR07MB2524; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:CY1PR07MB2524; X-Forefront-PRVS: 040866B734 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR07MB2524; 23:v/c2CBpUNzv2AG2oXxlfQ3yym1aN3AtdwGkoQyXyY?= =?us-ascii?Q?EF8du7yu3MaPlk3ymrLOGPavK22Ra0U+dPSJczj6qfiU2NYn2VsThWDWMMpN?= =?us-ascii?Q?MqAe2wznTbNNWayp+GY5Zg7SM+bRXwJkXO/nhS0wzF55bxM4ElJI1NgiT1DP?= =?us-ascii?Q?PSqxQj+NTOTelvd9i7awctNAFH5ylscEXnf5lK2xwOfqntkKiVwnzetXs32o?= =?us-ascii?Q?L1ZAbZhTaR81U/SG8wLs5PwtQyRj3t+tLapEpdifEexXwZi/I2I0x0uud74X?= =?us-ascii?Q?izVK8QPAd/VHr3UTHlCTbV/9piF5evlcvIiq2qIwDtDcXB6fkgJrgjBb5ZBI?= =?us-ascii?Q?mFkIgDNZ5r3Vj3lmyj5mpTVGLOAyzgCoZrNlhVrWpf6/3pPFs1O+Trwy5xeS?= =?us-ascii?Q?ABa3Qyt/bKPEcj6OxePPu4M9s2RHxwNaZb4r//56yovjRKeLU3XDIFD+T0Qb?= =?us-ascii?Q?nHr+Rkm16x1KN5s9WvENJWAly3/2n+UZoqHYg5SUQbR+9tSKZunjgNXH8GGh?= =?us-ascii?Q?CNc9CZcEQHuiPqPH01IbaU0r3OWduFejI4JCjwgK4mfehFCp3PxdkGg/EVgY?= =?us-ascii?Q?YUFsij9GZJlL+RJ1L8RWEILlsVeDQNMBt6rrJRaK7q3mIFYNPm3L3eca4jvD?= =?us-ascii?Q?XXJs0Q2YsYz7THTeIy/Jcedxsx8bH2+iTurKRYVQoMSWkjUpDHNxKaOtmeu6?= =?us-ascii?Q?klMxsbV4PRc4H7F2wzhNcnXxgiIakWXyl9MyYuOBJG99NdqtykGJmiVb2Tec?= =?us-ascii?Q?RahDv5r5n7AI0+w8Sjk4lkr06Z3tyjKI5/JPIh0Cly8T/dsSVDp7FnN9OC0h?= =?us-ascii?Q?F4Yfhjpg9j8Uo6/XL3ddEyeOtfS+ixr6Ip6aZPsoHf3qskZA2saQILBYtXL2?= =?us-ascii?Q?f68lCVwGfI609fRFTZaYvOYi9p0cpRAAbnnA5s4nQWZqQv0xf7pFnhWh7cCI?= =?us-ascii?Q?9co4dAR9o2wjdnNkJB/68OR6KUUWO4PlOc+LFcuzXF6E6U5Ph3X5K1jjupSV?= =?us-ascii?Q?nU=3D?= X-Microsoft-Exchange-Diagnostics: 1; CY1PR07MB2524; 6:dcQuEvyRlTZuVFAP/uEEZAWFqt4pFhFBlAk2kL1Cw6oLbpgbgziCqzKKU/c/zppCFcYlMBc7SWMjfsLGyOCaA12qRQkaJ7miqWlR+B2+PZ+8xPyOlKmzAItZWXAdtKktmTkOZ2BKxNThlW0RLILEzvpqlbpU+ZQMCipNObPa0m/uiNvOXFi0OGg+Z9KYD1vvVpqXNZp8Bl2sqBdgdjIwh+IU/QLa9X4r73/bRZAeW27MqBsVTutzRZB4qU4kbVBBpntnvemK7zxyPyvdlC3bqm8Hx9rma4mOf34Pds7xntmtn2SKHM+yyHFbepfnSQYma2z2cRvgKL4EDq/yuxMnPA==; 5:XBDRzocMGlQh5k4n2PuzDP8m46JWZ7L4JH4YObKA26PRdByRwF/FbFd0d0jPdpzVj0d/xKf/jVu9LGGN/46WMVNmKS4PaeJtgxz3AUxC7V6omrNoWjJMEhwRMHOMQN2OxKhgNqjjE8IYtQYqXabjVQ==; 24:nfV9qAwJeItGrzNM/MxFca5l1gFNgKqKuZbVFNzsITobsa9chrY4d8ZyQm0z5EvLk94KHQ6EZqE4v00LZ+97BWljuNC8IbdKnc2/F4+/GyE=; 7:UQyIqEzvVUmUSOZBaf5mUYmYsCA/IwZAxz5tFWrhIhB+t/NZx9x6ilsptx7sS5fUDNt1SFVWAi+D+6APs+AO0Gmxc5b3ajdUF4RgPxw6oWX9gFfSgXstB7rf3tbFksfky9mTfXm8mmb8Ler3LtA8bkMaf25QEvLR4xw3K6A0Qqh5fxEqBQY9gfWspd0fdG0aumsnZk6sujBkUyUDEiVMrN5G3Ahqt+amhWx5vAWmtTA= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Aug 2017 22:05:30.6454 (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: CY1PR07MB2524 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: Michael Hernandez Following error will be logged in to message file while trying to configure target with multiqueue. "Cmd 0x1f aborted with timeout since ISP Abort is pending" "qla25xx_init_queues Rsp que: 1 init failed." Fixes: 82de802ad46e ("scsi: qla2xxx: Preparation for Target MQ.") Cc: Signed-off-by: Quinn Tran Signed-off-by: Michael Hernandez Signed-off-by: Himanshu Madhani --- drivers/scsi/qla2xxx/qla_isr.c | 2 +- drivers/scsi/qla2xxx/qla_mbx.c | 1 + drivers/scsi/qla2xxx/qla_target.c | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c index 916f685872aa..d3a51df27b0d 100644 --- a/drivers/scsi/qla2xxx/qla_isr.c +++ b/drivers/scsi/qla2xxx/qla_isr.c @@ -3454,7 +3454,7 @@ qla24xx_enable_msix(struct qla_hw_data *ha, struct rsp_que *rsp) } /* Enable MSI-X vector for response queue update for queue 0 */ - if (IS_QLA25XX(ha) || IS_QLA83XX(ha) || IS_QLA27XX(ha)) { + if (IS_QLA83XX(ha) || IS_QLA27XX(ha)) { if (ha->msixbase && ha->mqiobase && (ha->max_rsp_queues > 1 || ha->max_req_queues > 1 || ql2xmqsupport)) diff --git a/drivers/scsi/qla2xxx/qla_mbx.c b/drivers/scsi/qla2xxx/qla_mbx.c index 1f91b87b6416..234ef442ef5d 100644 --- a/drivers/scsi/qla2xxx/qla_mbx.c +++ b/drivers/scsi/qla2xxx/qla_mbx.c @@ -54,6 +54,7 @@ static struct rom_cmd { { MBC_GET_MEM_OFFLOAD_CNTRL_STAT }, { MBC_GET_RETRY_COUNT }, { MBC_TRACE_CONTROL }, + { MBC_INITIALIZE_MULTIQ }, }; static int is_rom_cmd(uint16_t cmd) diff --git a/drivers/scsi/qla2xxx/qla_target.c b/drivers/scsi/qla2xxx/qla_target.c index e101cd3043b9..4e2a64773060 100644 --- a/drivers/scsi/qla2xxx/qla_target.c +++ b/drivers/scsi/qla2xxx/qla_target.c @@ -6796,7 +6796,7 @@ qlt_probe_one_stage1(struct scsi_qla_host *base_vha, struct qla_hw_data *ha) if (!QLA_TGT_MODE_ENABLED()) return; - if (ha->mqenable || IS_QLA83XX(ha) || IS_QLA27XX(ha)) { + if (IS_QLA83XX(ha) || IS_QLA27XX(ha)) { ISP_ATIO_Q_IN(base_vha) = &ha->mqiobase->isp25mq.atio_q_in; ISP_ATIO_Q_OUT(base_vha) = &ha->mqiobase->isp25mq.atio_q_out; } else {