From patchwork Wed Feb 15 23:37:19 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Madhani, Himanshu" X-Patchwork-Id: 9575721 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 1319C60209 for ; Wed, 15 Feb 2017 23:38:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 051CA28592 for ; Wed, 15 Feb 2017 23:38:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EE19128598; Wed, 15 Feb 2017 23:38:18 +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 4C9F128592 for ; Wed, 15 Feb 2017 23:38:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755514AbdBOXiR (ORCPT ); Wed, 15 Feb 2017 18:38:17 -0500 Received: from mail-dm3nam03on0053.outbound.protection.outlook.com ([104.47.41.53]:53222 "EHLO NAM03-DM3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1755406AbdBOXiN (ORCPT ); Wed, 15 Feb 2017 18:38:13 -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=61b1IB5neGkZdlvF8t0gtWYkzHg6TXhB6jBUpXN9arw=; b=Ljp4a0mcBpool2TAcWzLJ2ubDy3RH/0di+b3ArsCsO0oaI8tqb2ENsJNZ8vRLp3pLiJYcgEoWxQuTwCCfMuJdNa53igg0cjZm7I/hP+1xaiKIvnu9ScQgMJn0LOmNvfbXSbNXI30PcugcRaSuB6TIw7mTj3qbap8nRRs+HVcGmE= Received: from DM2PR07CA0022.namprd07.prod.outlook.com (10.141.52.150) by BLUPR07MB625.namprd07.prod.outlook.com (10.141.207.139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.919.13; Wed, 15 Feb 2017 23:38:10 +0000 Received: from BY2FFO11FD032.protection.gbl (2a01:111:f400:7c0c::166) by DM2PR07CA0022.outlook.office365.com (2a01:111:e400:2414::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.919.13 via Frontend Transport; Wed, 15 Feb 2017 23:38:10 +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 BY2FFO11FD032.mail.protection.outlook.com (10.1.14.210) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.1.904.16 via Frontend Transport; Wed, 15 Feb 2017 23:38:09 +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.309.2; Wed, 15 Feb 2017 15:37:50 -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 v1FNba4p028879; Wed, 15 Feb 2017 15:37:36 -0800 Received: (from root@localhost) by dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id v1FNbahe028878; Wed, 15 Feb 2017 15:37:36 -0800 From: Himanshu Madhani To: , CC: , Subject: [PATCH 1/3] qla2xxx: Cleaned up queue configuration code. Date: Wed, 15 Feb 2017 15:37:19 -0800 Message-ID: <1487201841-28846-2-git-send-email-himanshu.madhani@cavium.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1487201841-28846-1-git-send-email-himanshu.madhani@cavium.com> References: <1487201841-28846-1-git-send-email-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)(7916002)(39450400003)(2980300002)(428002)(189002)(199003)(47776003)(81156014)(81166006)(8676002)(48376002)(50466002)(189998001)(86362001)(69596002)(36756003)(33646002)(101416001)(50986999)(76176999)(5003940100001)(2906002)(4326007)(80596001)(2950100002)(6666003)(4720700003)(106466001)(389900002)(42186005)(38730400002)(54906002)(105586002)(50226002)(626004)(92566002)(305945005)(356003)(5660300001)(8936002)(87636001); DIR:OUT; SFP:1101; SCL:1; SRVR:BLUPR07MB625; H:CAEXCH02.caveonetworks.com; FPR:; SPF:None; PTR:50-232-66-26-static.hfc.comcastbusiness.net; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11FD032; 1:OxGMmRL2TEfaoIUIaGJcSSBxlyFudNlViHc1p5Yzvc0e/Tyo6M2q3jQIgw6SbdWtlObcnYbykDu592mysqUHzuLI+WMjL2RDhrjMDtuE04ZffZGCd7ricvY38sSLrojZEuph7jE6WJSofUlREzaI59P3+PzXZHzdbPwQAMb4BHxSk3ub78Wi+d6s9U4TeqR6PwBBhebWhzO4e+jagKfZjEvggdtDmKPndR3CXn5md6L2HbKIeECralrNVqfz6ypTmOhjWMYHf2qrn/ELgwvH36r6i/ToxexNd3gdEoRZ+5I27jj9HOGAbITB/GC8x5Wsww/kqGO18Y5Ndm182C2sK7KNWL8ubGhFOOn1LwexPi8KL4xtTqXAOZNvPeIzwygdCiU34M0LmXpsC4l2tU6Wfw2OVBVQfPb8iIorghOmmGmpSDWgwmFDh1sPvaHrvSpxF03NENM4q9yyuVUHlF5Yax6MKZdctDv660ZrTLQF6G8pzQ3/whMsWwxRCBb+Q9gdZSUYiJf0zFscnza8ci2yJg== X-MS-Office365-Filtering-Correlation-Id: 0855f335-68c8-4ed6-9b54-08d455fbb367 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:BLUPR07MB625; X-Microsoft-Exchange-Diagnostics: 1; BLUPR07MB625; 3:3Vz3yu82ls4r7aZcMIREN0rU/fLn9j0rWIygQD0jiabtkvaClYlEme2skBO1NKPBcvvEUTlL+wrvvOCrTR2HxVZjQxXwH9iPUyeQsW1bnWcR1k0byQwOlzS1CosxSuzqgl7QCvquDmZtzNM2HVdo3EODN6f1m9FT7+VFS7zKcZQy3jjEWDtXZqMUO1JfXfj3oPFuGQ0lnVUzQTC7yRoIUs5GHbq5bGejn++T+3VpCXAtP+mKuCb65thCL6n6eVxNV7CZTknXKpUgX3F7MqTK7wI6ID62nVRgVgHTD+EztSjFJqs5bFURAFBrOpliJ5JEerBwBC+2fl9T1KlVdtnwsrtJaprxEupzsTEelVMrnGNpbFwTgzLWyWfufF64rpUc; 25:9zpziCPFQXAV0lCEL7CTAYmEAGjtfXSJQM08WDQYnirhZ/0RDVa/FHfQtdrRKXZNFrzeCz1KqljrbrhXBL807SfL4jN0uhWC7UnU2G0ZXj04uuVLtgdq3JdTq2gBOh2yoX7jna/YgNOdbUqMX9+dMyL8b7Xjw1PH5DK0e3YiPwiWPMNCWU4zKJyqvB7CXb4eSp/jOe+Lgk5uIb1msjupL6oqZH09XzjJFyypfgzUUs9S4qsHmKpNKJC6NzVn6dMMNPhgpGwVysAhLN2vTrCrTFTWtOm74IZWf5qOjKNXd/VWABXIbul/HCuYBSkKNctZzsKHrLTrchhDHa9FuwvAXKFXln/KxmK78Dj6zvc3iE/oNLRSVtx1Kk2zUJBpcYu8mxgCrSmyU5VPAqXmBnDRNz0KL4xaZ124RLiIraLiORzEpxHET6vwRufwgIphVZtkOyMss5FkSl12A2w7ic4JHg== X-Microsoft-Exchange-Diagnostics: 1; BLUPR07MB625; 31:8gowvkDl3tp7pzuIHZPRXWhEz1GlZ/drCDpiKFcfpYM69A72sofDd5Ag4vEhMGPjUcB2eC/gRMIOKK40dqEHhOHl39P6IxT6/2e98B4sSSpq+mssMXgafedKIjjfD/jMygaEl8aQEVFZT9oOV/srVP0VRxE5RNM5pw1ROJN0lFcTUbL4hSuzm+xkmqcJYYypzii9TuKH4OWdyebv54oBLAm799xDo5I7bMna+oaKFsAcZ+BHnrX6eIgFrP8XBlTqxagKxAAoEgLokNZWAXrCog==; 20:VSwIcnE+W11oCcV1C4hbCAmDamAY6+ZJ9DlSu8+Hu5thtXVjKjHNRd0g0zmIPvZd07py8akMGwiZCQzV3cJUxhURwqMlKjlPXfC0YJrBO1wFfiDlKZme+v0FkAKbtbxbNee8Y8XrAgkeRWNFq1eR0LQWDJ7VjWl5qhQkWGRMi10eVTvcZ7zyuq6sUgIi+p5EpsUqkAab/CzCebFirxNq12DqUCnda27iwz0a577cGbexEj/kcdZMvYlgqSh5hiSjqkjbOwo5M/xOAd0IANjtULY1squhsidx+t/YZeUd5Ra/8lQ9GKZ15k1xhVHJy/57Ri/FjxrALyu0+ibEhk5zKnBpWXezcPthRi1bRJ/Kxw6aqpa/DBBJTFKcQzJG8uFPdaYaKWAs7h37koG7LpF0DHY3BXMWEv2inl8y7wc5pdRZa1ztR0xoUPOMInyT0cfcQFvocYC/OX9qqh6zP7t3fa/ToGcRW5thhg5WGx9BLj2ZIHTK6+by44qDPajBPng5 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040375)(601004)(2401047)(13015025)(8121501046)(13024025)(5005006)(13017025)(13018025)(13023025)(10201501046)(3002001)(6041248)(20161123562025)(20161123555025)(20161123560025)(20161123564025)(20161123558025)(6072148); SRVR:BLUPR07MB625; BCL:0; PCL:0; RULEID:; SRVR:BLUPR07MB625; X-Microsoft-Exchange-Diagnostics: 1; BLUPR07MB625; 4:esSABOKPR2XHPYshXTsrS8OmGdzGlnXSHrj5vMA8acZwMTnQa7kVoL+/15AOb1xR8ZaxP+/1N+D9EFE3wdSUZD5YKytzOd4PEF1othM9KbPOfonwaJDre7+N7y3OvSQuDfbRhLNE7YdN51MTkRIiXt9RV6izVNXWhir3dEN8xhGvj2PKEiRvG54yDrsgWrwEfMlFyK/ftQj6m3MdEf6XoHONksi/1DVOOy/zseNDFaRRpURSBbDlOPo1JFH5C0rAY5HDfvrMImqWKaITBeigVnsgyPLooTxyY9IkNPRjdN8uH4m15tRKjcmLh6PQt2W+3HOzs+pGB9X2wM7APjHvTDJJ60dSHPwjGGkq5okZAb5yXTEzTAImJ9VXf2rpDNlo0h+QcA41T/Y87mtJJMPJBKJgyUFsyAGghhexGVXVCO0a0Gv5PXmFarQ93nJ+PRE7+GB1MVgtOUWC73YnzYYuwdDJWlqjSFY77R07AZjV6/v1cNuqLwICAlLXXFpnb1Whfk6M/hOgGMBy18l8YM4QxP+dvziz9ryI08CJB5DkNHb+LzKzPyLIB7NLls6x4eCQckMRh7/hYYRN9ygv5kqjuJcpLnfFeW7YxcLJiDv4ozMkV/2RxetIoLN6JOd45dL+Kd5aQR9oxbqTImgurcJljNuk0RSkwsrc2YMNcqGFMitJ0uuSq+cipewOuEcQNsWI X-Forefront-PRVS: 021975AE46 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BLUPR07MB625; 23:3zW2Q7KJcBFzqJY6z5Kq7ohwKAr2UD8GjoqRdMJvQm?= =?us-ascii?Q?yILdXqGtZedlzF82/0yfbshc7MIO1eLa2ybogd5EIN7VSrrtALPNgfMo1Lt1?= =?us-ascii?Q?qn7DIqzscd8wE1m3Zsjuav9mvhQ9Vh1RFLwQqCAfntxKnZDYzK0Rk2x5nqQK?= =?us-ascii?Q?hHqsOcvVDfel/yVjrTE71m3PdbDBrs4cJxVTwbmnDxxYM/i1XuH7qz3CizQw?= =?us-ascii?Q?KBNGRVY+152lmniGW+dd4MkWG3DvnvDcs7K/8Rvww4RQB/A7iSwkFu9FQCBt?= =?us-ascii?Q?Y7R4o/1C0/Ak2QlJjG+me3SLtG1emx5psjbC6QDwi4DZ5zMAHUPbTGo0mWOx?= =?us-ascii?Q?UDgs3Q9BbApQSaI+GfZE7f7zxEli7teGEmIPoqRBgotw7CqdsRVzOYlPbb29?= =?us-ascii?Q?i/QqVu+XzRcxZPgrw0ymsRzey34zcrvCM+M9otIsqb6+8dITz2p764ZNFuSF?= =?us-ascii?Q?nSw8qUEqa/a+AZXpN8iv7kKYlECTwrzWN0bc5us20jSqo2+eg0tdzNS9dWST?= =?us-ascii?Q?u3/VGGwQCSBO+uXIU5BdJ7q2qkSwbSpzKGG65TPdKL9PVNZxuS7GG34jImpn?= =?us-ascii?Q?OjPs/ISroxvQkJCx332s7ypuNCzYVfZRP31cRB5kjun8TYi9JuxnDgYCw8XI?= =?us-ascii?Q?J3JTa6ebfgTYgz2pPfDI+o3wftaPO0cRTSc2SeOS6Vxd9Woj9+lGTrLcn4zM?= =?us-ascii?Q?QICPi6sBbKaAjcIA7PH3/CynT5RyWHzUOo5Hn7ezQVRG6MJ3OUXpP1FxW8lW?= =?us-ascii?Q?ZzdHB5lrM+m5G/q0SivjT7b5/4wNQ2SaeWMuFEgdokwkRll6ngJBXRLGZMgx?= =?us-ascii?Q?JNRnoEd8Hx5WB2MkywlhWenGnzydfcyqClFZx0PhtPuh93OlUf7gDRIlPpdX?= =?us-ascii?Q?5azqX+feAh+I0sV3MaAJMHLKq7ShKKbf642hN/59e4KreERjnNKxIpxmV2n0?= =?us-ascii?Q?V4ZK3owZhKXxTydBzho+qdLbYqBEyYbkVSBScHxq877+ssJFeUNA0HI3mh6h?= =?us-ascii?Q?WFdE6cYOXDoKCNMckJGCQD9A7MgRwKN0eOMlRmhVXKxQ=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; BLUPR07MB625; 6:5G6thD8NRPMynPHdFEoJiZiBXns4FNcTkQ17yUr4F35RHwuz5ny/YfnQGUcgo41708f3x37UZpvIgVArFk+9lCrNpmPzl4wxBAHUk/CcLmce4Qbr6rJNKq9ZjCfVxvQhwspby0WKPkQo1XMX2aZHz1JQ2vrBq3j2mfph+HCKzHtbj/SHMmhNLWnXPzAGGIpW2pvDAqIRrrAJaEKRQJN8zvH2PYC7Hge3TMKr7g3m09Nw/Ll7NlJRwUFbbEiQ1/okmENt2SH2py1cboOJkHi0CGOmlEQ7UZfDHyTGBQisgX15LepP+UJwqQ1+aHpM+e/xhffl2xaqkdvrWqBJBOKFQtQG0hfOUSC9UMrAQz1EjcssSzPhhBVB31MuXtP4MaR1XH3RM+srKyPXDq1qvggNtA==; 5:MQ9UEyZjcsUIiVPQzXLRqYmS9jhqbr4fvSwH7fTImt/4Am1VysLwdzpXaPi1mgXzrFyDfWvFFc3uEc9lj7ThBl55VbP6JKG04iDm7VcYNMqSXdxlCfq7/yRRmuzEA02fWQORtKr61Ok5z874synyaw==; 24:2FkLZw2WSyGFVAZeziKNTIvWBgLIWma/u27QCkeftVDoDEOz3slTu2wqe5zinfMaqw2+0ViSWr0Pl3sitlw7epH8S9QaZuNejkabVwY7hlM= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BLUPR07MB625; 7:VL/UYHU1MDPKfmA9p6eSX1LfM430/xtiR7eV6JoshhJQuMX2wI0dUpVKYThtzrN0cCW8vQg3XFHwesd+djxL2utEIMuCRMzc8CqJ36QBGWFnpsSKznttTtgpeJsUmGX3azAdVrDy6cjeCBlBStVXxdU5pYMuTlpA42NH4f4SeFfmjXFb6jkSlDGrlm1A18h345KoD4C8CUOujntrhIPTgH6ZC8HAIZwN9VKDvnSw3LC7iM2Q23jVwz5A0PfX6nXcxWd/duftxH1NCnp1k+CqW5xJ8elAzseoOMHnhk0DQJg2+0VHhTZlaVgpxHDla2lpwiHGf/09yPLwattqHcAjig== X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Feb 2017 23:38:09.9118 (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: BLUPR07MB625 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 This patch cleaned up queue configuration code, such that once initialized, we should not touch msix_count value. This will prevent incorrect numbers of MSI-X vectors requested while performing target mode configuration. Fixes: d745952 ("scsi: qla2xxx: Add multiple queue pair functionality.") Signed-off-by: Michael Hernandez Signed-off-by: Himanshu Madhani --- drivers/scsi/qla2xxx/qla_os.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c index d01c90c..8174cee 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c @@ -1815,6 +1815,7 @@ uint32_t qla2x00_isp_reg_stat(struct qla_hw_data *ha) /* Determine queue resources */ ha->max_req_queues = ha->max_rsp_queues = 1; + ha->msix_count = QLA_BASE_VECTORS; if (!ql2xmqsupport || (!IS_QLA25XX(ha) && !IS_QLA81XX(ha))) goto mqiobase_exit; @@ -1842,9 +1843,8 @@ uint32_t qla2x00_isp_reg_stat(struct qla_hw_data *ha) "BAR 3 not enabled.\n"); mqiobase_exit: - ha->msix_count = ha->max_rsp_queues + 1; ql_dbg_pci(ql_dbg_init, ha->pdev, 0x001c, - "MSIX Count:%d.\n", ha->msix_count); + "MSIX Count: %d.\n", ha->msix_count); return (0); iospace_error_exit: @@ -1892,6 +1892,7 @@ uint32_t qla2x00_isp_reg_stat(struct qla_hw_data *ha) /* 83XX 26XX always use MQ type access for queues * - mbar 2, a.k.a region 4 */ ha->max_req_queues = ha->max_rsp_queues = 1; + ha->msix_count = QLA_BASE_VECTORS; ha->mqiobase = ioremap(pci_resource_start(ha->pdev, 4), pci_resource_len(ha->pdev, 4)); @@ -1934,14 +1935,8 @@ uint32_t qla2x00_isp_reg_stat(struct qla_hw_data *ha) "BAR 1 not enabled.\n"); mqiobase_exit: - ha->msix_count = ha->max_rsp_queues + 1; - if (QLA_TGT_MODE_ENABLED()) - ha->msix_count++; - - qlt_83xx_iospace_config(ha); - ql_dbg_pci(ql_dbg_init, ha->pdev, 0x011f, - "MSIX Count:%d.\n", ha->msix_count); + "MSIX Count: %d.\n", ha->msix_count); return 0; iospace_error_exit: